diff options
| author | Sergei Trofimovich <siarheit@google.com> | 2022-06-27 23:42:44 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <siarheit@google.com> | 2022-06-29 19:15:59 +0100 |
| commit | 49d508065bdd36fb1a9b6aad9666b1edb5e06474 (patch) | |
| tree | 5053755b20c0931e66abeed4fd92e9dc4320e691 /gcc | |
| parent | b8f284d3673004dffae714b56ed663467c2a52a7 (diff) | |
| download | gcc-49d508065bdd36fb1a9b6aad9666b1edb5e06474.zip gcc-49d508065bdd36fb1a9b6aad9666b1edb5e06474.tar.gz gcc-49d508065bdd36fb1a9b6aad9666b1edb5e06474.tar.bz2 | |
jit: avoid calloc() poisoning on musl [PR106102]
On musl <pthread.h> uses calloc() (via <sched.h>). jit/ includes
it directly and exposes use of poisoned calloc():
/build/build/./prev-gcc/xg++ ... ../../gcc-13-20220626/gcc/jit/jit-playback.cc
make[3]: *** [Makefile:1143: jit/libgccjit.o] Error 1
make[3]: *** Waiting for unfinished jobs....
In file included from /<<NIX>>/musl-1.2.3-dev/include/pthread.h:30,
from ../../gcc-13-20220626/gcc/jit/jit-playback.cc:44:
/<<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 moves <pthread.h> inclusion to "system.h" under new
INCLUDE_PTHREAD_H guard and uses this mechanism in libgccjit.
gcc/
PR c++/106102
* system.h: Introduce INCLUDE_PTHREAD_H macros to include <pthread.h>.
gcc/jit/
PR c++/106102
* jit-playback.cc: Include <pthread.h> via "system.h" to avoid calloc()
poisoning.
* jit-recording.cc: Ditto.
* libgccjit.cc: Ditto.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/jit/jit-playback.cc | 3 | ||||
| -rw-r--r-- | gcc/jit/jit-recording.cc | 2 | ||||
| -rw-r--r-- | gcc/jit/libgccjit.cc | 2 | ||||
| -rw-r--r-- | gcc/system.h | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/gcc/jit/jit-playback.cc b/gcc/jit/jit-playback.cc index 6be6bdf..7971413 100644 --- a/gcc/jit/jit-playback.cc +++ b/gcc/jit/jit-playback.cc @@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ #include "config.h" +#define INCLUDE_PTHREAD_H #include "system.h" #include "coretypes.h" #include "target.h" @@ -41,8 +42,6 @@ along with GCC; see the file COPYING3. If not see #include "diagnostic.h" #include "stmt.h" -#include <pthread.h> - #include "jit-playback.h" #include "jit-result.h" #include "jit-builtins.h" diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc index 697dee6..f78daed 100644 --- a/gcc/jit/jit-recording.cc +++ b/gcc/jit/jit-recording.cc @@ -19,13 +19,13 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ #include "config.h" +#define INCLUDE_PTHREAD_H #include "system.h" #include "coretypes.h" #include "tm.h" #include "pretty-print.h" #include "toplev.h" -#include <pthread.h> #include "jit-builtins.h" #include "jit-recording.h" diff --git a/gcc/jit/libgccjit.cc b/gcc/jit/libgccjit.cc index 0e76097..ca86266 100644 --- a/gcc/jit/libgccjit.cc +++ b/gcc/jit/libgccjit.cc @@ -19,12 +19,12 @@ along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ #include "config.h" +#define INCLUDE_PTHREAD_H #include "system.h" #include "coretypes.h" #include "timevar.h" #include "typed-splay-tree.h" #include "cppbuiltin.h" -#include <pthread.h> #include "libgccjit.h" #include "jit-recording.h" diff --git a/gcc/system.h b/gcc/system.h index 67158b7..f8d42ff 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -753,6 +753,10 @@ extern int vsnprintf (char *, size_t, const char *, va_list); #endif #endif +#ifdef INCLUDE_PTHREAD_H +#include <pthread.h> +#endif + #ifdef INCLUDE_ISL #ifdef HAVE_isl #include <isl/options.h> |