88 lines
2.9 KiB
Diff
88 lines
2.9 KiB
Diff
|
From 210f6b3b82084cc756e02b8bc12f909a43b14ee8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Tue, 27 Jun 2017 18:10:54 -0700
|
||
|
|
Subject: [PATCH 40/49] Add ssp_nonshared to link commandline for musl targets
|
||
|
|
|
||
|
|
when -fstack-protector options are enabled we need to
|
||
|
|
link with ssp_shared on musl since it does not provide
|
||
|
|
the __stack_chk_fail_local() so essentially it provides
|
||
|
|
libssp but not libssp_nonshared something like
|
||
|
|
TARGET_LIBC_PROVIDES_SSP_BUT_NOT_SSP_NONSHARED
|
||
|
|
where-as for glibc the needed symbols
|
||
|
|
are already present in libc_nonshared library therefore
|
||
|
|
we do not need any library helper on glibc based systems
|
||
|
|
but musl needs the libssp_noshared from gcc
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
---
|
||
|
|
gcc/config/linux.h | 7 +++++++
|
||
|
|
gcc/config/rs6000/linux.h | 10 ++++++++++
|
||
|
|
gcc/config/rs6000/linux64.h | 10 ++++++++++
|
||
|
|
3 files changed, 27 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/gcc/config/linux.h b/gcc/config/linux.h
|
||
|
|
index 2e683d0c430..1b4df798671 100644
|
||
|
|
--- a/gcc/config/linux.h
|
||
|
|
+++ b/gcc/config/linux.h
|
||
|
|
@@ -182,6 +182,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||
|
|
{ GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \
|
||
|
|
{ 0, 0, 0, 0, 0, 0 } \
|
||
|
|
}
|
||
|
|
+#ifdef TARGET_LIBC_PROVIDES_SSP
|
||
|
|
+#undef LINK_SSP_SPEC
|
||
|
|
+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
||
|
|
+ "|fstack-protector-strong|fstack-protector-explicit" \
|
||
|
|
+ ":-lssp_nonshared}"
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */
|
||
|
|
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
|
||
|
|
index 684afd6c190..22cfa391b89 100644
|
||
|
|
--- a/gcc/config/rs6000/linux.h
|
||
|
|
+++ b/gcc/config/rs6000/linux.h
|
||
|
|
@@ -91,6 +91,16 @@
|
||
|
|
" -m elf32ppclinux")
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+/* link libssp_nonshared.a with musl */
|
||
|
|
+#if DEFAULT_LIBC == LIBC_MUSL
|
||
|
|
+#ifdef TARGET_LIBC_PROVIDES_SSP
|
||
|
|
+#undef LINK_SSP_SPEC
|
||
|
|
+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
||
|
|
+ "|fstack-protector-strong|fstack-protector-explicit" \
|
||
|
|
+ ":-lssp_nonshared}"
|
||
|
|
+#endif
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#undef LINK_OS_LINUX_SPEC
|
||
|
|
#define LINK_OS_LINUX_SPEC LINK_OS_LINUX_EMUL " %{!shared: %{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
|
||
|
|
index 3b00ec0fcf0..8371f8d7b6b 100644
|
||
|
|
--- a/gcc/config/rs6000/linux64.h
|
||
|
|
+++ b/gcc/config/rs6000/linux64.h
|
||
|
|
@@ -465,6 +465,16 @@ extern int dot_symbols;
|
||
|
|
" -m elf64ppc")
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+/* link libssp_nonshared.a with musl */
|
||
|
|
+#if DEFAULT_LIBC == LIBC_MUSL
|
||
|
|
+#ifdef TARGET_LIBC_PROVIDES_SSP
|
||
|
|
+#undef LINK_SSP_SPEC
|
||
|
|
+#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
||
|
|
+ "|fstack-protector-strong|fstack-protector-explicit" \
|
||
|
|
+ ":-lssp_nonshared}"
|
||
|
|
+#endif
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
-dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \
|
||
|
|
--
|
||
|
|
2.13.2
|
||
|
|
|