diff options
Diffstat (limited to 'main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch')
| -rw-r--r-- | main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch index db843a44925..d229bcfa0fb 100644 --- a/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch +++ b/main/gcc/0005-On-linux-targets-pass-as-needed-by-default-to-the-li.patch @@ -1,8 +1,8 @@ -From 3a2f4efa70110f6d11fd4c6a8e11559c6ef720f1 Mon Sep 17 00:00:00 2001 +From 67c0f5789630b27149f60ff831999ef7c1dba5d5 Mon Sep 17 00:00:00 2001 From: Ariadne Conill <ariadne@dereferenced.org> Date: Fri, 21 Aug 2020 06:46:56 +0000 -Subject: [PATCH] On linux targets pass --as-needed by default to the linker, - but always link the sanitizer libraries with --no-as-needed. +Subject: [PATCH 05/35] On linux targets pass --as-needed by default to the + linker, but always link the sanitizer libraries with --no-as-needed. --- gcc/config/aarch64/aarch64-linux.h | 1 + @@ -18,11 +18,11 @@ Subject: [PATCH] On linux targets pass --as-needed by default to the linker, gcc/config/rs6000/sysv4.h | 2 +- gcc/config/s390/linux.h | 2 +- gcc/config/sparc/linux.h | 2 +- - gcc/gcc.c | 28 ++++++++++++++++++++-------- + gcc/gcc.cc | 28 ++++++++++++++++++++-------- 14 files changed, 36 insertions(+), 19 deletions(-) diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h -index e587e2e9ad6..1d1017aa523 100644 +index 4277f03da2a..b131983a546 100644 --- a/gcc/config/aarch64/aarch64-linux.h +++ b/gcc/config/aarch64/aarch64-linux.h @@ -35,6 +35,7 @@ @@ -34,7 +34,7 @@ index e587e2e9ad6..1d1017aa523 100644 %{shared:-shared} \ %{symbolic:-Bsymbolic} \ diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h -index e25fcac3c59..22b2f7b0d14 100644 +index 03f783f2ad1..d946e700dda 100644 --- 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. If not see @@ -47,7 +47,7 @@ index e25fcac3c59..22b2f7b0d14 100644 %{shared:-shared} \ %{!shared: \ diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h -index 0ec3aa53189..f8bda84de2a 100644 +index 7b7b7cbbe14..49c050c6f2c 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -70,6 +70,7 @@ @@ -59,16 +59,19 @@ index 0ec3aa53189..f8bda84de2a 100644 SUBTARGET_EXTRA_LINK_SPEC diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h -index ff2e880b1fa..7f30c363e4a 100644 +index eda8010b133..b26b17f2f2a 100644 --- a/gcc/config/gnu-user.h +++ b/gcc/config/gnu-user.h -@@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +@@ -136,7 +136,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #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 + #undef LIBHWASAN_EARLY_SPEC + #define LIBHWASAN_EARLY_SPEC "%{!shared:libhwasan_preinit%O%s} " \ + "%{static-libhwasan:%{!shared:" \ +@@ -146,12 +146,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \ "%{static-libtsan:%{!shared:" \ LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \ @@ -84,10 +87,10 @@ index ff2e880b1fa..7f30c363e4a 100644 #undef TARGET_F951_OPTIONS diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h -index ae4aa844f02..54b91c0492a 100644 +index a79b739089d..e0752673dff 100644 --- 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. If not see +@@ -68,7 +68,7 @@ along with GCC; see the file COPYING3. If not see { "link_emulation", GNU_USER_LINK_EMULATION },\ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } @@ -97,7 +100,7 @@ index ae4aa844f02..54b91c0492a 100644 %{!static: \ %{!static-pie: \ diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h -index 785c68220b8..21dd66b412a 100644 +index 3b63b99acf6..759bf0db86f 100644 --- a/gcc/config/i386/gnu-user64.h +++ b/gcc/config/i386/gnu-user64.h @@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see @@ -109,7 +112,7 @@ index 785c68220b8..21dd66b412a 100644 %{!shared: \ %{!static: \ diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h -index ee38e218aec..0325971d818 100644 +index 5dfd428aa17..02656dad7fc 100644 --- a/gcc/config/ia64/linux.h +++ b/gcc/config/ia64/linux.h @@ -58,7 +58,7 @@ do { \ @@ -122,7 +125,7 @@ index ee38e218aec..0325971d818 100644 %{!shared: \ %{!static: \ diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h -index 5d0782100bb..4be5fbb2191 100644 +index a4e5380b589..3cc61bce69f 100644 --- 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. If not see @@ -134,22 +137,22 @@ index 5d0782100bb..4be5fbb2191 100644 %{!static: \ %{rdynamic:-export-dynamic} \ diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h -index 4afef7c228c..ba1a6e60e05 100644 +index 3e625e0f867..f8c2c351e5a 100644 --- a/gcc/config/riscv/linux.h +++ b/gcc/config/riscv/linux.h -@@ -58,6 +58,7 @@ along with GCC; see the file COPYING3. If not see +@@ -48,6 +48,7 @@ along with GCC; see the file COPYING3. If not see "%{mabi=ilp32:_ilp32}" #define LINK_SPEC "\ +-as-needed \ - -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \ + -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \ %{mno-relax:--no-relax} \ - %{shared} \ + %{mbig-endian:-EB} \ diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h -index 2ded3301282..a1e44ddcc0d 100644 +index 9e457033d11..08016bf224d 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h -@@ -457,13 +457,13 @@ extern int dot_symbols; +@@ -377,13 +377,13 @@ extern int dot_symbols; " -m elf64ppc") #endif @@ -166,10 +169,10 @@ index 2ded3301282..a1e44ddcc0d 100644 %{rdynamic:-export-dynamic} \ -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \ diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h -index 9ade72114e9..9490b84a153 100644 +index ae932fc22f0..c8ff0c6dc8e 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h -@@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC +@@ -780,7 +780,7 @@ GNU_USER_TARGET_CC1_SPEC #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER #endif @@ -179,7 +182,7 @@ index 9ade72114e9..9490b84a153 100644 -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}" diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h -index 6919b468f06..56d52d41b31 100644 +index 02aa1edaff8..64df5801134 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h @@ -82,7 +82,7 @@ along with GCC; see the file COPYING3. If not see @@ -192,7 +195,7 @@ index 6919b468f06..56d52d41b31 100644 %{!shared: \ %{static:-static} \ diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h -index 63853e60c03..de6d8675456 100644 +index 0e33b3cac2c..c2f44546e62 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); @@ -204,11 +207,11 @@ index 63853e60c03..de6d8675456 100644 %{!mno-relax:%{!r:-relax}} \ %{!shared: \ %{!static: \ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 625c9ab7902..7aec9d3a016 100644 ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -695,8 +695,11 @@ proper position among the other output files. */ +diff --git a/gcc/gcc.cc b/gcc/gcc.cc +index f82fae23c22..da6417dd0d1 100644 +--- a/gcc/gcc.cc ++++ b/gcc/gcc.cc +@@ -754,8 +754,11 @@ proper position among the other output files. */ #ifdef LIBASAN_EARLY_SPEC #define LIBASAN_SPEC STATIC_LIBASAN_LIBS #elif defined(HAVE_LD_STATIC_DYNAMIC) @@ -222,7 +225,7 @@ index 625c9ab7902..7aec9d3a016 100644 STATIC_LIBASAN_LIBS #else #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS -@@ -713,8 +716,11 @@ proper position among the other output files. */ +@@ -790,8 +793,11 @@ proper position among the other output files. */ #ifdef LIBTSAN_EARLY_SPEC #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS #elif defined(HAVE_LD_STATIC_DYNAMIC) @@ -236,7 +239,7 @@ index 625c9ab7902..7aec9d3a016 100644 STATIC_LIBTSAN_LIBS #else #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS -@@ -731,8 +737,11 @@ proper position among the other output files. */ +@@ -808,8 +814,11 @@ proper position among the other output files. */ #ifdef LIBLSAN_EARLY_SPEC #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS #elif defined(HAVE_LD_STATIC_DYNAMIC) @@ -250,7 +253,7 @@ index 625c9ab7902..7aec9d3a016 100644 STATIC_LIBLSAN_LIBS #else #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS -@@ -747,8 +756,11 @@ proper position among the other output files. */ +@@ -824,8 +833,11 @@ proper position among the other output files. */ #define STATIC_LIBUBSAN_LIBS \ " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}" #ifdef HAVE_LD_STATIC_DYNAMIC @@ -265,5 +268,5 @@ index 625c9ab7902..7aec9d3a016 100644 #else #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS -- -2.31.1 +2.41.0 |