| From 7422adfb471f4b4f2ec870124064632d55f72e50 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Mon, 11 Apr 2022 15:46:18 -0700 |
| Subject: [PATCH] Move sched.h include ahead of user headers |
| |
| Fix attempt to use poisoned calloc error, this moves the sched.h before |
| using system.h from gcc headers which includes #pragma GCC poison calloc |
| |
| Fixes |
| In file included from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/pthread.h:30, |
| from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/c++/12.0.1/aarch64-yoe-linux-musl/bits/gthr-default.h:35, |
| from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/c++/12.0.1/aarch64-yoe-linux-musl/bits/gthr.h:148, |
| from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/c++/12.0.1/ext/atomicity.h:35, |
| from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/c++/12.0.1/bits/shared_ptr_base.h:61, |
| from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/c++/12.0.1/bits/shared_ptr.h:53, |
| from /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/c++/12.0.1/memory:77, |
| from ../../../../../../../work-shared/gcc-12.0.1-r0/gcc-12-20220410/libcc1/deleter.hh:23, |
| from ../../../../../../../work-shared/gcc-12.0.1-r0/gcc-12-20220410/libcc1/rpc.hh:25, |
| from ../../../../../../../work-shared/gcc-12.0.1-r0/gcc-12-20220410/libcc1/libcc1plugin.cc:67: |
| /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/include/sched.h:84:7: error: attempt to use poisoned "calloc" |
| 84 | void *calloc(size_t, size_t); |
| | ^ |
| /mnt/b/yoe/master/build/tmp/work/cortexa72-yoe-linux-musl/gcc/12.0.1-r0/recipe-sysroot/usr/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))) |
| |
| Upstream-Status: Pending |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| --- |
| libcc1/libcc1plugin.cc | 1 + |
| libcc1/libcp1plugin.cc | 1 + |
| 2 files changed, 2 insertions(+) |
| |
| diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc |
| index 12ab5a57c8d..fff9bfab18b 100644 |
| --- 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 <sched.h> |
| #include <cc1plugin-config.h> |
| |
| #undef PACKAGE_NAME |
| diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc |
| index 83dab7f58b1..0b83ce7a09d 100644 |
| --- 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 <sched.h> |
| #include <cc1plugin-config.h> |
| |
| #undef PACKAGE_NAME |