diff options
| author |   Sam James <sam@gentoo.org> | 2023-01-29 08:22:41 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-01-29 08:50:26 +0000 |
| commit | 6cbc18ad615fd39e765d114db4ed13d801e79f14 (patch) | |
| tree | f15166766be6647b425364869af93aef1a6fb09f | |
| parent | 12.2.0: drop upstreamed 76_all_driver_environ_putenv_PR106624.patch (diff) | |
| download | gcc-patches-6cbc18ad.tar.gz gcc-patches-6cbc18ad.tar.bz2 gcc-patches-6cbc18ad.zip | |
12.2.0: shift libssp patch out of nocross
Bug: https://bugs.gentoo.org/862831
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | 12.2.0/musl/50_all_libssp_unconditionally.patch | 24 | ||||
| -rw-r--r-- | 12.2.0/musl/README.history | 3 |
2 files changed, 27 insertions, 0 deletions
diff --git a/12.2.0/musl/50_all_libssp_unconditionally.patch b/12.2.0/musl/50_all_libssp_unconditionally.patch new file mode 100644 index 0000000..a3b5984 --- /dev/null +++ b/12.2.0/musl/50_all_libssp_unconditionally.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/706210 +https://bugs.gentoo.org/747346 + +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." + +(We do the same in Gentoo.) +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -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/12.2.0/musl/README.history b/12.2.0/musl/README.history index 0999249..56093c5 100644 --- a/12.2.0/musl/README.history +++ b/12.2.0/musl/README.history @@ -1,3 +1,6 @@ +7 29 Jan 2022 + U 50_all_libssp_unconditionally.patch + 6 03 Jul 2022 - 50_all_calloc_libgccjit.patch |