| blob | b207acce6eabafb8ca3fd510ffd30dc0a7749acb |
1 From 5b8de466aa959a6c929cee2c78e4159a0209b4f8 Mon Sep 17 00:00:00 2001
2 From: Ariadne Conill <ariadne@dereferenced.org>
3 Date: Fri, 21 Aug 2020 06:46:56 +0000
4 Subject: [PATCH] On linux targets pass --as-needed by default to the linker,
5 but always link the sanitizer libraries with --no-as-needed.
7 ---
8 gcc/config/aarch64/aarch64-linux.h | 1 +
9 gcc/config/alpha/linux-elf.h | 2 +-
10 gcc/config/arm/linux-elf.h | 1 +
11 gcc/config/gnu-user.h | 6 +++---
12 gcc/config/i386/gnu-user.h | 2 +-
13 gcc/config/i386/gnu-user64.h | 1 +
14 gcc/config/ia64/linux.h | 2 +-
15 gcc/config/mips/gnu-user.h | 1 +
16 gcc/config/riscv/linux.h | 1 +
17 gcc/config/rs6000/linux64.h | 4 ++--
18 gcc/config/rs6000/sysv4.h | 2 +-
19 gcc/config/s390/linux.h | 2 +-
20 gcc/config/sparc/linux.h | 2 +-
21 gcc/gcc.c | 28 ++++++++++++++++++++--------
22 14 files changed, 36 insertions(+), 19 deletions(-)
24 diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
25 index e587e2e9ad6..1d1017aa523 100644
26 --- a/gcc/config/aarch64/aarch64-linux.h
27 +++ b/gcc/config/aarch64/aarch64-linux.h
28 @@ -35,6 +35,7 @@
29 #define CPP_SPEC "%{pthread:-D_REENTRANT}"
31 #define LINUX_TARGET_LINK_SPEC "%{h*} \
32 + --as-needed \
33 %{static:-Bstatic} \
34 %{shared:-shared} \
35 %{symbolic:-Bsymbolic} \
36 diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h
37 index e25fcac3c59..22b2f7b0d14 100644
38 --- a/gcc/config/alpha/linux-elf.h
39 +++ b/gcc/config/alpha/linux-elf.h
40 @@ -37,7 +37,7 @@ along with GCC; see the file COPYING3. If not see
42 #define ELF_DYNAMIC_LINKER GNU_USER_DYNAMIC_LINKER
44 -#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
45 +#define LINK_SPEC "-m elf64alpha --as-needed %{G*} %{relax:-relax} \
46 %{O*:-O3} %{!O*:-O1} \
47 %{shared:-shared} \
48 %{!shared: \
49 diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
50 index 0ec3aa53189..f8bda84de2a 100644
51 --- a/gcc/config/arm/linux-elf.h
52 +++ b/gcc/config/arm/linux-elf.h
53 @@ -70,6 +70,7 @@
54 %{rdynamic:-export-dynamic} \
55 %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
56 -X \
57 + --as-needed \
58 %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
59 SUBTARGET_EXTRA_LINK_SPEC
61 diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
62 index ff2e880b1fa..7f30c363e4a 100644
63 --- a/gcc/config/gnu-user.h
64 +++ b/gcc/config/gnu-user.h
65 @@ -136,17 +136,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
66 #define LIBASAN_EARLY_SPEC "%{!shared:libasan_preinit%O%s} " \
67 "%{static-libasan:%{!shared:" \
68 LD_STATIC_OPTION " --whole-archive -lasan --no-whole-archive " \
69 - LD_DYNAMIC_OPTION "}}%{!static-libasan:-lasan}"
70 + LD_DYNAMIC_OPTION "}}%{!static-libasan:%{!fuse-ld=gold:--push-state} --no-as-needed -lasan %{fuse-ld=gold:--as-needed;:--pop-state}}"
71 #undef LIBTSAN_EARLY_SPEC
72 #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
73 "%{static-libtsan:%{!shared:" \
74 LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
75 - LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
76 + LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
77 #undef LIBLSAN_EARLY_SPEC
78 #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
79 "%{static-liblsan:%{!shared:" \
80 LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
81 - LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
82 + LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
83 #endif
85 #undef TARGET_F951_OPTIONS
86 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
87 index ae4aa844f02..54b91c0492a 100644
88 --- a/gcc/config/i386/gnu-user.h
89 +++ b/gcc/config/i386/gnu-user.h
90 @@ -74,7 +74,7 @@ along with GCC; see the file COPYING3. If not see
91 { "link_emulation", GNU_USER_LINK_EMULATION },\
92 { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
94 -#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
95 +#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
96 %{!shared: \
97 %{!static: \
98 %{!static-pie: \
99 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
100 index 785c68220b8..21dd66b412a 100644
101 --- a/gcc/config/i386/gnu-user64.h
102 +++ b/gcc/config/i386/gnu-user64.h
103 @@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
104 "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
105 %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
106 %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
107 + --as-needed \
108 %{shared:-shared} \
109 %{!shared: \
110 %{!static: \
111 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
112 index ee38e218aec..0325971d818 100644
113 --- a/gcc/config/ia64/linux.h
114 +++ b/gcc/config/ia64/linux.h
115 @@ -58,7 +58,7 @@ do { \
116 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
118 #undef LINK_SPEC
119 -#define LINK_SPEC "\
120 +#define LINK_SPEC " --as-needed \
121 %{shared:-shared} \
122 %{!shared: \
123 %{!static: \
124 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
125 index 5d0782100bb..4be5fbb2191 100644
126 --- a/gcc/config/mips/gnu-user.h
127 +++ b/gcc/config/mips/gnu-user.h
128 @@ -55,6 +55,7 @@ along with GCC; see the file COPYING3. If not see
129 #undef GNU_USER_TARGET_LINK_SPEC
130 #define GNU_USER_TARGET_LINK_SPEC "\
131 %{G*} %{EB} %{EL} %{mips*} %{shared} \
132 + -as-needed \
133 %{!shared: \
134 %{!static: \
135 %{rdynamic:-export-dynamic} \
136 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
137 index 4afef7c228c..ba1a6e60e05 100644
138 --- a/gcc/config/riscv/linux.h
139 +++ b/gcc/config/riscv/linux.h
140 @@ -58,6 +58,7 @@ along with GCC; see the file COPYING3. If not see
141 "%{mabi=ilp32:_ilp32}"
143 #define LINK_SPEC "\
144 +-as-needed \
145 -melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
146 %{mno-relax:--no-relax} \
147 %{shared} \
148 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
149 index 2ded3301282..a1e44ddcc0d 100644
150 --- a/gcc/config/rs6000/linux64.h
151 +++ b/gcc/config/rs6000/linux64.h
152 @@ -457,13 +457,13 @@ extern int dot_symbols;
153 " -m elf64ppc")
154 #endif
156 -#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
157 +#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
158 %{!static-pie: \
159 %{rdynamic:-export-dynamic} \
160 -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
161 %(link_os_extra_spec32)"
163 -#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
164 +#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
165 %{!static-pie: \
166 %{rdynamic:-export-dynamic} \
167 -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
168 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
169 index 9ade72114e9..9490b84a153 100644
170 --- a/gcc/config/rs6000/sysv4.h
171 +++ b/gcc/config/rs6000/sysv4.h
172 @@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
173 #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
174 #endif
176 -#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
177 +#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
178 %{rdynamic:-export-dynamic} \
179 -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
181 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
182 index 6919b468f06..56d52d41b31 100644
183 --- a/gcc/config/s390/linux.h
184 +++ b/gcc/config/s390/linux.h
185 @@ -82,7 +82,7 @@ along with GCC; see the file COPYING3. If not see
187 #undef LINK_SPEC
188 #define LINK_SPEC \
189 - "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
190 + "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
191 %{shared:-shared} \
192 %{!shared: \
193 %{static:-static} \
194 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
195 index 63853e60c03..de6d8675456 100644
196 --- a/gcc/config/sparc/linux.h
197 +++ b/gcc/config/sparc/linux.h
198 @@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
199 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
201 #undef LINK_SPEC
202 -#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
203 +#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
204 %{!mno-relax:%{!r:-relax}} \
205 %{!shared: \
206 %{!static: \
207 diff --git a/gcc/gcc.c b/gcc/gcc.c
208 index 625c9ab7902..7aec9d3a016 100644
209 --- a/gcc/gcc.c
210 +++ b/gcc/gcc.c
211 @@ -695,8 +695,11 @@ proper position among the other output files. */
212 #ifdef LIBASAN_EARLY_SPEC
213 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
214 #elif defined(HAVE_LD_STATIC_DYNAMIC)
215 -#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
216 - "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
217 +#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
218 + " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
219 + " -lasan " \
220 + " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
221 + " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
222 STATIC_LIBASAN_LIBS
223 #else
224 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
225 @@ -713,8 +716,11 @@ proper position among the other output files. */
226 #ifdef LIBTSAN_EARLY_SPEC
227 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
228 #elif defined(HAVE_LD_STATIC_DYNAMIC)
229 -#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
230 - "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
231 +#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
232 + " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
233 + " -ltsan " \
234 + " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
235 + " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
236 STATIC_LIBTSAN_LIBS
237 #else
238 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
239 @@ -731,8 +737,11 @@ proper position among the other output files. */
240 #ifdef LIBLSAN_EARLY_SPEC
241 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
242 #elif defined(HAVE_LD_STATIC_DYNAMIC)
243 -#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
244 - "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
245 +#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
246 + " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
247 + " -llsan " \
248 + " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
249 + " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
250 STATIC_LIBLSAN_LIBS
251 #else
252 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
253 @@ -747,8 +756,11 @@ proper position among the other output files. */
254 #define STATIC_LIBUBSAN_LIBS \
255 " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
256 #ifdef HAVE_LD_STATIC_DYNAMIC
257 -#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
258 - "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
259 +#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
260 + " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
261 + " -lubsan " \
262 + " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
263 + " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
264 STATIC_LIBUBSAN_LIBS
265 #else
266 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
267 --
268 2.29.2