mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-29 16:24:10 +00:00
8f00857bf9
Without the change gcc-12 on musl fails to build due to system headers
poisoning:
/build/build/./prev-gcc/xg++ ... ../../gcc-13-20220626/gcc/cp/mapper-resolver.cc
In file included from /<<NIX>>/musl-1.2.3-dev/include/pthread.h:30,
from /build/build/prev-x86_64-unknown-linux-musl/libstdc++-v3/include/x86_64-unknown-linux-musl/bits/gthr-default.h:35,
....
from /build/build/prev-x86_64-unknown-linux-musl/libstdc++-v3/include/memory:77,
from ../../gcc-13-20220626/gcc/../libcody/cody.hh:24,
from ../../gcc-13-20220626/gcc/cp/../../c++tools/resolver.h:25,
from ../../gcc-13-20220626/gcc/cp/../../c++tools/resolver.cc:23,
from ../../gcc-13-20220626/gcc/cp/mapper-resolver.cc:32:
/<<NIX>>/musl-1.2.3-dev/include/sched.h:84:7: error: attempt to use poisoned "calloc"
84 | void *calloc(size_t, size_t);
| ^
/<<NIX>>/musl-1.2.3-dev/include/sched.h:124:36: error: attempt to use poisoned "calloc"
124 | #define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n)))
| ^
The change pulls upstream fix as is.
53 lines
1.4 KiB
Diff
53 lines
1.4 KiB
Diff
https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3b21c21f3f5726823e19728fdd1571a14aae0fb3
|
|
https://gcc.gnu.org/PR106102
|
|
--- 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
|
|
+#define INCLUDE_MEMORY
|
|
#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
|
|
+#define INCLUDE_MEMORY
|
|
#include "system.h"
|
|
|
|
// We don't want or need to be aware of networking
|
|
--- a/gcc/cp/module.cc
|
|
+++ b/gcc/cp/module.cc
|
|
@@ -206,6 +206,7 @@ Classes used:
|
|
|
|
#define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available. */
|
|
#include "config.h"
|
|
+#define INCLUDE_MEMORY
|
|
#define INCLUDE_STRING
|
|
#define INCLUDE_VECTOR
|
|
#include "system.h"
|
|
--- a/libcc1/libcc1plugin.cc
|
|
+++ b/libcc1/libcc1plugin.cc
|
|
@@ -31,6 +31,7 @@
|
|
#undef PACKAGE_TARNAME
|
|
#undef PACKAGE_VERSION
|
|
|
|
+#define INCLUDE_MEMORY
|
|
#include "gcc-plugin.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|
|
--- a/libcc1/libcp1plugin.cc
|
|
+++ b/libcc1/libcp1plugin.cc
|
|
@@ -32,6 +32,7 @@
|
|
#undef PACKAGE_TARNAME
|
|
#undef PACKAGE_VERSION
|
|
|
|
+#define INCLUDE_MEMORY
|
|
#include "gcc-plugin.h"
|
|
#include "system.h"
|
|
#include "coretypes.h"
|