aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc/patches/6.1.0/230-musl_libssp.patch
diff options
context:
space:
mode:
authorSyrone Wong <wong.syrone@gmail.com>2016-07-13 21:57:05 +0800
committerFelix Fietkau <nbd@nbd.name>2016-07-15 14:17:58 +0200
commit445604a915e8ed4669b3ef3c622259c7ca0081c1 (patch)
tree43d7878a49fc1b6579081828f0b94d2affd6ffe4 /toolchain/gcc/patches/6.1.0/230-musl_libssp.patch
parenta4e90e2cac9d0afb41842b8a197b3acee903b9ad (diff)
downloadupstream-445604a915e8ed4669b3ef3c622259c7ca0081c1.tar.gz
upstream-445604a915e8ed4669b3ef3c622259c7ca0081c1.tar.bz2
upstream-445604a915e8ed4669b3ef3c622259c7ca0081c1.zip
toolchain/gcc: add 6.1.0
-fno-plt and musl-libc patches already get upstream, then dropped in GCC 6. Other patches are almost identical compared to GCC 5.4. Compile and run tested on ar71xx/Qihoo C301 and mvebu/Linksys WRT1900ac v1 Signed-off-by: Syrone Wong <wong.syrone@gmail.com> Signed-off-by: Felix Fietkau <nbd@nbd.name> [cleanups/fixes]
Diffstat (limited to 'toolchain/gcc/patches/6.1.0/230-musl_libssp.patch')
-rw-r--r--toolchain/gcc/patches/6.1.0/230-musl_libssp.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/6.1.0/230-musl_libssp.patch b/toolchain/gcc/patches/6.1.0/230-musl_libssp.patch
new file mode 100644
index 0000000000..8dfd1fc287
--- /dev/null
+++ b/toolchain/gcc/patches/6.1.0/230-musl_libssp.patch
@@ -0,0 +1,13 @@
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -858,7 +858,9 @@ proper position among the other output f
+ #endif
+
+ #ifndef LINK_SSP_SPEC
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if DEFAULT_LIBC == LIBC_MUSL
++#define LINK_SSP_SPEC "-lssp_nonshared"
++#elif defined(TARGET_LIBC_PROVIDES_SSP)
+ #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
+ "|fstack-protector-strong|fstack-protector-explicit:}"
+ #else