diff options
| author | Cem Keylan <cem@ckyln.com> | 2022-05-07 20:52:09 +0200 |
|---|---|---|
| committer | Cem Keylan <cem@ckyln.com> | 2022-05-07 20:52:24 +0200 |
| commit | 601d5f275212eb60b4265a7693f47b4446ee55f4 (patch) | |
| tree | c18982e3d844a7f2acf29280ef71fd4b65b11de0 /testing/gcc/patches | |
| parent | fac2efe4739bfb5201b53e0f1a1be4f043afea16 (diff) | |
| download | repository-601d5f275212eb60b4265a7693f47b4446ee55f4.tar.gz | |
gcc: add new package at 12.1.0 [TESTING]
Diffstat (limited to 'testing/gcc/patches')
| -rw-r--r-- | testing/gcc/patches/musl-libssp.patch | 20 | ||||
| -rw-r--r-- | testing/gcc/patches/musl-sched_h-calloc-poison.patch | 26 |
2 files changed, 46 insertions, 0 deletions
diff --git a/testing/gcc/patches/musl-libssp.patch b/testing/gcc/patches/musl-libssp.patch new file mode 100644 index 00000000..fe5c6143 --- /dev/null +++ b/testing/gcc/patches/musl-libssp.patch @@ -0,0 +1,20 @@ +Author: Timo Teräs <timo.teras@iki.fi> + +Alpine musl package provides libssp_nonshared.a. We link to it unconditionally, +as otherwise we get link failures if some objects are -fstack-protector built +and final link happens with -fno-stack-protector. This seems to be the common +case when bootstrapping gcc, the piepatches do not seem to fully fix the +crosstoolchain and bootstrap sequence wrt. stack-protector flag usage. + +--- gcc-6.1.0/gcc/gcc.c.orig ++++ gcc-6.1.0/gcc/gcc.c +@@ -870,8 +870,7 @@ + + #ifndef LINK_SSP_SPEC + #ifdef TARGET_LIBC_PROVIDES_SSP +-#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ +- "|fstack-protector-strong|fstack-protector-explicit:}" ++#define LINK_SSP_SPEC "-lssp_nonshared" + #else + #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ + "|fstack-protector-strong|fstack-protector-explicit" \ diff --git a/testing/gcc/patches/musl-sched_h-calloc-poison.patch b/testing/gcc/patches/musl-sched_h-calloc-poison.patch new file mode 100644 index 00000000..e5621106 --- /dev/null +++ b/testing/gcc/patches/musl-sched_h-calloc-poison.patch @@ -0,0 +1,26 @@ +diff --git a/libcc1/libcc1plugin.cc b/libcc1/libcc1plugin.cc +index 12ab5a5..a2762e7 100644 +--- a/libcc1/libcc1plugin.cc ++++ b/libcc1/libcc1plugin.cc +@@ -31,6 +31,8 @@ + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + ++#include <pthread.h> ++ + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +diff --git a/libcc1/libcp1plugin.cc b/libcc1/libcp1plugin.cc +index 83dab7f..d84fa64 100644 +--- a/libcc1/libcp1plugin.cc ++++ b/libcc1/libcp1plugin.cc +@@ -32,6 +32,8 @@ + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + ++#include <pthread.h> ++ + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" |