diff options
| author |   Sam James <sam@gentoo.org> | 2023-01-02 01:03:04 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-01-02 01:03:04 +0000 |
| commit | c6e054b9a653edf7d5f6e94ded6c3887c2f1ec60 (patch) | |
| tree | 05efc64dbc96cdde5c484b2db6377ff561b5ee0c | |
| parent | 12.2.0: add patches for FORTIFY_SOURCE=3, default GLIBCXX_ASSERTIONS (diff) | |
| download | gcc-patches-c6e054b9.tar.gz gcc-patches-c6e054b9.tar.bz2 gcc-patches-c6e054b9.zip | |
11.4.0: update calloc/musl patch
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | 11.4.0/musl/50_all_calloc_libgccjit.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/11.4.0/musl/50_all_calloc_libgccjit.patch b/11.4.0/musl/50_all_calloc_libgccjit.patch index 5dec538..bbb6787 100644 --- a/11.4.0/musl/50_all_calloc_libgccjit.patch +++ b/11.4.0/musl/50_all_calloc_libgccjit.patch @@ -12,6 +12,36 @@ Subject: [PATCH] Fix attempt to use poisoned calloc error in libgccjit This moves usages of pthread.h to above any usage of system.h as it included #pragma GCC poison calloc +--- a/gcc/cp/mapper-client.cc ++++ b/gcc/cp/mapper-client.cc +@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see + #define INCLUDE_STRING + #define INCLUDE_VECTOR + #define INCLUDE_MAP ++#include <pthread.h> + #include "system.h" + + #include "line-map.h" +--- a/gcc/cp/mapper-resolver.cc ++++ b/gcc/cp/mapper-resolver.cc +@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see + #define INCLUDE_VECTOR + #define INCLUDE_ALGORITHM + #define INCLUDE_MAP ++#include <pthread.h> + #include "system.h" + + // We don't want or need to be aware of networking +--- a/gcc/cp/module.cc ++++ b/gcc/cp/module.cc +@@ -204,6 +204,7 @@ Classes used: + #include "config.h" + #define INCLUDE_STRING + #define INCLUDE_VECTOR ++#include <pthread.h> + #include "system.h" + #include "coretypes.h" + #include "cp-tree.h" --- a/gcc/jit/jit-playback.c +++ b/gcc/jit/jit-playback.c @@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License @@ -70,3 +100,23 @@ included #pragma GCC poison calloc #include "libgccjit.h" #include "jit-recording.h" +--- a/libcc1/libcc1plugin.cc ++++ b/libcc1/libcc1plugin.cc +@@ -17,6 +17,7 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + ++#include <pthread.h> + #include <cc1plugin-config.h> + + #undef PACKAGE_NAME +--- a/libcc1/libcp1plugin.cc ++++ b/libcc1/libcp1plugin.cc +@@ -18,6 +18,7 @@ + along with GCC; see the file COPYING3. If not see + <http://www.gnu.org/licenses/>. */ + ++#include <pthread.h> + #include <cc1plugin-config.h> + + #undef PACKAGE_NAME |