summaryrefslogtreecommitdiff
path: root/system/gcc/gcc-6.1-musl-libssp.patch
diff options
context:
space:
mode:
Diffstat (limited to 'system/gcc/gcc-6.1-musl-libssp.patch')
-rw-r--r--system/gcc/gcc-6.1-musl-libssp.patch11
1 files changed, 7 insertions, 4 deletions
diff --git a/system/gcc/gcc-6.1-musl-libssp.patch b/system/gcc/gcc-6.1-musl-libssp.patch
index fe5c61434..05a9cf8bf 100644
--- a/system/gcc/gcc-6.1-musl-libssp.patch
+++ b/system/gcc/gcc-6.1-musl-libssp.patch
@@ -1,4 +1,5 @@
-Author: Timo Teräs <timo.teras@iki.fi>
+Gentoo: https://bugs.gentoo.org/706210, https://bugs.gentoo.org/747346
+Alpine 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
@@ -6,9 +7,11 @@ 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 @@
+This is done by Gentoo and us (Adélie) as well.
+
+--- gcc-6.1.0/gcc/gcc.cc
++++ gcc-6.1.0/gcc/gcc.cc
+@@ -988,8 +988,7 @@
#ifndef LINK_SSP_SPEC
#ifdef TARGET_LIBC_PROVIDES_SSP