245 lines
9.9 KiB
Diff
245 lines
9.9 KiB
Diff
|
# DP: On linux targets pass --as-needed by default to the linker, but always
|
||
|
|
# DP: link the sanitizer libraries with --no-as-needed.
|
||
|
|
|
||
|
|
Index: b/gcc/gcc.c
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/gcc.c
|
||
|
|
+++ b/gcc/gcc.c
|
||
|
|
@@ -692,8 +692,11 @@ proper position among the other output f
|
||
|
|
#ifdef LIBASAN_EARLY_SPEC
|
||
|
|
#define LIBASAN_SPEC STATIC_LIBASAN_LIBS
|
||
|
|
#elif defined(HAVE_LD_STATIC_DYNAMIC)
|
||
|
|
-#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
|
||
|
|
- "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
|
||
|
|
+ " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
|
||
|
|
+ " -lasan " \
|
||
|
|
+ " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+ " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
|
||
|
|
STATIC_LIBASAN_LIBS
|
||
|
|
#else
|
||
|
|
#define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
|
||
|
|
@@ -710,8 +713,11 @@ proper position among the other output f
|
||
|
|
#ifdef LIBTSAN_EARLY_SPEC
|
||
|
|
#define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
|
||
|
|
#elif defined(HAVE_LD_STATIC_DYNAMIC)
|
||
|
|
-#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
|
||
|
|
- "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
|
||
|
|
+ " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
|
||
|
|
+ " -ltsan " \
|
||
|
|
+ " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+ " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
|
||
|
|
STATIC_LIBTSAN_LIBS
|
||
|
|
#else
|
||
|
|
#define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
|
||
|
|
@@ -728,8 +734,11 @@ proper position among the other output f
|
||
|
|
#ifdef LIBLSAN_EARLY_SPEC
|
||
|
|
#define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
|
||
|
|
#elif defined(HAVE_LD_STATIC_DYNAMIC)
|
||
|
|
-#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
|
||
|
|
- "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
|
||
|
|
+ " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
|
||
|
|
+ " -llsan " \
|
||
|
|
+ " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+ " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
|
||
|
|
STATIC_LIBLSAN_LIBS
|
||
|
|
#else
|
||
|
|
#define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
|
||
|
|
@@ -744,8 +753,11 @@ proper position among the other output f
|
||
|
|
#define STATIC_LIBUBSAN_LIBS \
|
||
|
|
" %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
|
||
|
|
#ifdef HAVE_LD_STATIC_DYNAMIC
|
||
|
|
-#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
|
||
|
|
- "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
|
||
|
|
+ " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
|
||
|
|
+ " -lubsan " \
|
||
|
|
+ " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
|
||
|
|
+ " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
|
||
|
|
STATIC_LIBUBSAN_LIBS
|
||
|
|
#else
|
||
|
|
#define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
|
||
|
|
Index: b/gcc/config/gnu-user.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/gnu-user.h
|
||
|
|
+++ b/gcc/config/gnu-user.h
|
||
|
|
@@ -161,15 +161,15 @@ see the files COPYING3 and COPYING.RUNTI
|
||
|
|
#define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
|
||
|
|
"%{static-libasan:%{!shared:" \
|
||
|
|
LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
|
||
|
|
- LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
|
||
|
|
+ LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
|
||
|
|
#undef LIBTSAN_EARLY_SPEC
|
||
|
|
#define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
|
||
|
|
"%{static-libtsan:%{!shared:" \
|
||
|
|
LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
|
||
|
|
- LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
|
||
|
|
+ LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
|
||
|
|
#undef LIBLSAN_EARLY_SPEC
|
||
|
|
#define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
|
||
|
|
"%{static-liblsan:%{!shared:" \
|
||
|
|
LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
|
||
|
|
- LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
|
||
|
|
+ LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
|
||
|
|
#endif
|
||
|
|
Index: b/gcc/config/aarch64/aarch64-linux.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/aarch64/aarch64-linux.h
|
||
|
|
+++ b/gcc/config/aarch64/aarch64-linux.h
|
||
|
|
@@ -35,6 +35,7 @@
|
||
|
|
#define CPP_SPEC "%{pthread:-D_REENTRANT}"
|
||
|
|
|
||
|
|
#define LINUX_TARGET_LINK_SPEC "%{h*} \
|
||
|
|
+ --as-needed \
|
||
|
|
%{static:-Bstatic} \
|
||
|
|
%{shared:-shared} \
|
||
|
|
%{symbolic:-Bsymbolic} \
|
||
|
|
Index: b/gcc/config/ia64/linux.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/ia64/linux.h
|
||
|
|
+++ b/gcc/config/ia64/linux.h
|
||
|
|
@@ -58,7 +58,7 @@ do { \
|
||
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
|
||
|
|
|
||
|
|
#undef LINK_SPEC
|
||
|
|
-#define LINK_SPEC "\
|
||
|
|
+#define LINK_SPEC " --as-needed \
|
||
|
|
%{shared:-shared} \
|
||
|
|
%{!shared: \
|
||
|
|
%{!static: \
|
||
|
|
Index: b/gcc/config/sparc/linux.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/sparc/linux.h
|
||
|
|
+++ b/gcc/config/sparc/linux.h
|
||
|
|
@@ -86,7 +86,7 @@ extern const char *host_detect_local_cpu
|
||
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
||
|
|
|
||
|
|
#undef LINK_SPEC
|
||
|
|
-#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
|
||
|
|
+#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
|
||
|
|
%{!mno-relax:%{!r:-relax}} \
|
||
|
|
%{!shared: \
|
||
|
|
%{!static: \
|
||
|
|
Index: b/gcc/config/s390/linux.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/s390/linux.h
|
||
|
|
+++ b/gcc/config/s390/linux.h
|
||
|
|
@@ -78,7 +78,7 @@ along with GCC; see the file COPYING3.
|
||
|
|
|
||
|
|
#undef LINK_SPEC
|
||
|
|
#define LINK_SPEC \
|
||
|
|
- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
|
||
|
|
+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
|
||
|
|
%{shared:-shared} \
|
||
|
|
%{!shared: \
|
||
|
|
%{static:-static} \
|
||
|
|
Index: b/gcc/config/rs6000/linux64.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/rs6000/linux64.h
|
||
|
|
+++ b/gcc/config/rs6000/linux64.h
|
||
|
|
@@ -490,13 +490,13 @@ extern int dot_symbols;
|
||
|
|
" -m elf64ppc")
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
|
||
|
|
+#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
|
||
|
|
%{!static-pie: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
-dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
|
||
|
|
%(link_os_extra_spec32)"
|
||
|
|
|
||
|
|
-#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
|
||
|
|
+#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
|
||
|
|
%{!static-pie: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
-dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
|
||
|
|
Index: b/gcc/config/rs6000/sysv4.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/rs6000/sysv4.h
|
||
|
|
+++ b/gcc/config/rs6000/sysv4.h
|
||
|
|
@@ -811,7 +811,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
|
||
|
|
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
|
||
|
|
MUSL_DYNAMIC_LINKER)
|
||
|
|
|
||
|
|
-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
|
||
|
|
+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
|
||
|
|
|
||
|
|
Index: b/gcc/config/i386/gnu-user64.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/i386/gnu-user64.h
|
||
|
|
+++ b/gcc/config/i386/gnu-user64.h
|
||
|
|
@@ -56,6 +56,7 @@
|
||
|
|
"%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
|
||
|
|
%{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
|
||
|
|
%{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
|
||
|
|
+ --as-needed \
|
||
|
|
%{shared:-shared} \
|
||
|
|
%{!shared: \
|
||
|
|
%{!static: \
|
||
|
|
Index: b/gcc/config/i386/gnu-user.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/i386/gnu-user.h
|
||
|
|
+++ b/gcc/config/i386/gnu-user.h
|
||
|
|
@@ -74,7 +74,7 @@ along with GCC; see the file COPYING3.
|
||
|
|
{ "link_emulation", GNU_USER_LINK_EMULATION },\
|
||
|
|
{ "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
|
||
|
|
|
||
|
|
-#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
|
||
|
|
+#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
|
||
|
|
%{!shared: \
|
||
|
|
%{!static: \
|
||
|
|
%{!static-pie: \
|
||
|
|
Index: b/gcc/config/alpha/linux-elf.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/alpha/linux-elf.h
|
||
|
|
+++ b/gcc/config/alpha/linux-elf.h
|
||
|
|
@@ -37,7 +37,7 @@ along with GCC; see the file COPYING3.
|
||
|
|
|
||
|
|
#define ELF_DYNAMIC_LINKER GNU_USER_DYNAMIC_LINKER
|
||
|
|
|
||
|
|
-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
|
||
|
|
+#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax} \
|
||
|
|
%{O*:-O3} %{!O*:-O1} \
|
||
|
|
%{shared:-shared} \
|
||
|
|
%{!shared: \
|
||
|
|
Index: b/gcc/config/arm/linux-elf.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/arm/linux-elf.h
|
||
|
|
+++ b/gcc/config/arm/linux-elf.h
|
||
|
|
@@ -70,6 +70,7 @@
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
%{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
|
||
|
|
-X \
|
||
|
|
+ --as-needed \
|
||
|
|
%{mbig-endian:-EB} %{mlittle-endian:-EL}" \
|
||
|
|
SUBTARGET_EXTRA_LINK_SPEC
|
||
|
|
|
||
|
|
Index: b/gcc/config/mips/gnu-user.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/mips/gnu-user.h
|
||
|
|
+++ b/gcc/config/mips/gnu-user.h
|
||
|
|
@@ -55,6 +55,7 @@ along with GCC; see the file COPYING3.
|
||
|
|
#undef GNU_USER_TARGET_LINK_SPEC
|
||
|
|
#define GNU_USER_TARGET_LINK_SPEC "\
|
||
|
|
%{G*} %{EB} %{EL} %{mips*} %{shared} \
|
||
|
|
+ -as-needed \
|
||
|
|
%{!shared: \
|
||
|
|
%{!static: \
|
||
|
|
%{rdynamic:-export-dynamic} \
|
||
|
|
Index: b/gcc/config/riscv/linux.h
|
||
|
|
===================================================================
|
||
|
|
--- a/gcc/config/riscv/linux.h
|
||
|
|
+++ b/gcc/config/riscv/linux.h
|
||
|
|
@@ -50,6 +50,7 @@
|
||
|
|
#define CPP_SPEC "%{pthread:-D_REENTRANT}"
|
||
|
|
|
||
|
|
#define LINK_SPEC "\
|
||
|
|
+-as-needed \
|
||
|
|
-melf" XLEN_SPEC "lriscv \
|
||
|
|
%{mno-relax:--no-relax} \
|
||
|
|
%{shared} \
|