| blob | 54d10b6aecf37752a61745006d127f504b734f21 |
1 From 8de5d46c530ceca9f4add46d5cae3cd52c38eba3 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 7f2529a2a1d..b097e1688aa 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 c1dae8ca2cf..a87dc740171 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 0c1c4e70b6b..8b581afacdd 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 5ebbf42a13d..902378e1bad 100644
63 --- a/gcc/config/gnu-user.h
64 +++ b/gcc/config/gnu-user.h
65 @@ -136,7 +136,7 @@ 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 LIBHWASAN_EARLY_SPEC
72 #define LIBHWASAN_EARLY_SPEC "%{static-libhwasan:%{!shared:" \
73 LD_STATIC_OPTION " --whole-archive -lhwasan --no-whole-archive " \
74 @@ -145,12 +145,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
75 #define LIBTSAN_EARLY_SPEC "%{!shared:libtsan_preinit%O%s} " \
76 "%{static-libtsan:%{!shared:" \
77 LD_STATIC_OPTION " --whole-archive -ltsan --no-whole-archive " \
78 - LD_DYNAMIC_OPTION "}}%{!static-libtsan:-ltsan}"
79 + LD_DYNAMIC_OPTION "}}%{!static-libtsan:%{!fuse-ld=gold:--push-state} --no-as-needed -ltsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
80 #undef LIBLSAN_EARLY_SPEC
81 #define LIBLSAN_EARLY_SPEC "%{!shared:liblsan_preinit%O%s} " \
82 "%{static-liblsan:%{!shared:" \
83 LD_STATIC_OPTION " --whole-archive -llsan --no-whole-archive " \
84 - LD_DYNAMIC_OPTION "}}%{!static-liblsan:-llsan}"
85 + LD_DYNAMIC_OPTION "}}%{!static-liblsan:%{!fuse-ld=gold:--push-state} --no-as-needed -llsan %{fuse-ld=gold:--as-needed;:--pop-state}}"
86 #endif
88 #undef TARGET_F951_OPTIONS
89 diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h
90 index a23e7ab3eb7..12ac8cb93a9 100644
91 --- a/gcc/config/i386/gnu-user.h
92 +++ b/gcc/config/i386/gnu-user.h
93 @@ -68,7 +68,7 @@ along with GCC; see the file COPYING3. If not see
94 { "link_emulation", GNU_USER_LINK_EMULATION },\
95 { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
97 -#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
98 +#define GNU_USER_TARGET_LINK_SPEC "-m %(link_emulation) --as-needed %{shared:-shared} \
99 %{!shared: \
100 %{!static: \
101 %{!static-pie: \
102 diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
103 index f3e25b1412a..712b0f1c30e 100644
104 --- a/gcc/config/i386/gnu-user64.h
105 +++ b/gcc/config/i386/gnu-user64.h
106 @@ -56,6 +56,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
107 "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
108 %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
109 %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
110 + --as-needed \
111 %{shared:-shared} \
112 %{!shared: \
113 %{!static: \
114 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
115 index ac40c3dfd3f..6e19e25c35a 100644
116 --- a/gcc/config/ia64/linux.h
117 +++ b/gcc/config/ia64/linux.h
118 @@ -58,7 +58,7 @@ do { \
119 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
121 #undef LINK_SPEC
122 -#define LINK_SPEC "\
123 +#define LINK_SPEC " --as-needed \
124 %{shared:-shared} \
125 %{!shared: \
126 %{!static: \
127 diff --git a/gcc/config/mips/gnu-user.h b/gcc/config/mips/gnu-user.h
128 index a390bcece83..be0ee289367 100644
129 --- a/gcc/config/mips/gnu-user.h
130 +++ b/gcc/config/mips/gnu-user.h
131 @@ -55,6 +55,7 @@ along with GCC; see the file COPYING3. If not see
132 #undef GNU_USER_TARGET_LINK_SPEC
133 #define GNU_USER_TARGET_LINK_SPEC "\
134 %{G*} %{EB} %{EL} %{mips*} %{shared} \
135 + -as-needed \
136 %{!shared: \
137 %{!static: \
138 %{rdynamic:-export-dynamic} \
139 diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h
140 index fce5b896e6e..ee29979dd34 100644
141 --- a/gcc/config/riscv/linux.h
142 +++ b/gcc/config/riscv/linux.h
143 @@ -58,6 +58,7 @@ along with GCC; see the file COPYING3. If not see
144 "%{mabi=ilp32:_ilp32}"
146 #define LINK_SPEC "\
147 +-as-needed \
148 -melf" XLEN_SPEC DEFAULT_ENDIAN_SPEC "riscv" LD_EMUL_SUFFIX " \
149 %{mno-relax:--no-relax} \
150 %{mbig-endian:-EB} \
151 diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
152 index e3f2cd254f6..43499ed29cf 100644
153 --- a/gcc/config/rs6000/linux64.h
154 +++ b/gcc/config/rs6000/linux64.h
155 @@ -374,13 +374,13 @@ extern int dot_symbols;
156 " -m elf64ppc")
157 #endif
159 -#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " %{!shared: %{!static: \
160 +#define LINK_OS_LINUX_SPEC32 LINK_OS_LINUX_EMUL32 " --as-needed %{!shared: %{!static: \
161 %{!static-pie: \
162 %{rdynamic:-export-dynamic} \
163 -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}} \
164 %(link_os_extra_spec32)"
166 -#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " %{!shared: %{!static: \
167 +#define LINK_OS_LINUX_SPEC64 LINK_OS_LINUX_EMUL64 " --as-needed %{!shared: %{!static: \
168 %{!static-pie: \
169 %{rdynamic:-export-dynamic} \
170 -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}} \
171 diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
172 index 510abe169c5..3c1f3a8ec5d 100644
173 --- a/gcc/config/rs6000/sysv4.h
174 +++ b/gcc/config/rs6000/sysv4.h
175 @@ -789,7 +789,7 @@ GNU_USER_TARGET_CC1_SPEC
176 #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
177 #endif
179 -#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
180 +#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --as-needed %{!shared: %{!static: \
181 %{rdynamic:-export-dynamic} \
182 -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
184 diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
185 index daa48fdfc2b..2fcfc5d770f 100644
186 --- a/gcc/config/s390/linux.h
187 +++ b/gcc/config/s390/linux.h
188 @@ -82,7 +82,7 @@ along with GCC; see the file COPYING3. If not see
190 #undef LINK_SPEC
191 #define LINK_SPEC \
192 - "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
193 + "%{m31:-m elf_s390}%{m64:-m elf64_s390} --as-needed \
194 %{shared:-shared} \
195 %{!shared: \
196 %{static:-static} \
197 diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
198 index 2550d7ee8f0..7596d0b2757 100644
199 --- a/gcc/config/sparc/linux.h
200 +++ b/gcc/config/sparc/linux.h
201 @@ -81,7 +81,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv);
202 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
204 #undef LINK_SPEC
205 -#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \
206 +#define LINK_SPEC "-m elf32_sparc --as-needed %{shared:-shared} \
207 %{!mno-relax:%{!r:-relax}} \
208 %{!shared: \
209 %{!static: \
210 diff --git a/gcc/gcc.c b/gcc/gcc.c
211 index faf9ce76b3d..1ad5da6d769 100644
212 --- a/gcc/gcc.c
213 +++ b/gcc/gcc.c
214 @@ -737,8 +737,11 @@ proper position among the other output files. */
215 #ifdef LIBASAN_EARLY_SPEC
216 #define LIBASAN_SPEC STATIC_LIBASAN_LIBS
217 #elif defined(HAVE_LD_STATIC_DYNAMIC)
218 -#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION \
219 - "} -lasan %{static-libasan:" LD_DYNAMIC_OPTION "}" \
220 +#define LIBASAN_SPEC "%{static-libasan:" LD_STATIC_OPTION "}" \
221 + " %{!static-libasan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
222 + " -lasan " \
223 + " %{static-libasan:" LD_DYNAMIC_OPTION "}" \
224 + " %{!static-libasan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
225 STATIC_LIBASAN_LIBS
226 #else
227 #define LIBASAN_SPEC "-lasan" STATIC_LIBASAN_LIBS
228 @@ -773,8 +776,11 @@ proper position among the other output files. */
229 #ifdef LIBTSAN_EARLY_SPEC
230 #define LIBTSAN_SPEC STATIC_LIBTSAN_LIBS
231 #elif defined(HAVE_LD_STATIC_DYNAMIC)
232 -#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION \
233 - "} -ltsan %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
234 +#define LIBTSAN_SPEC "%{static-libtsan:" LD_STATIC_OPTION "}" \
235 + " %{!static-libtsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
236 + " -ltsan " \
237 + " %{static-libtsan:" LD_DYNAMIC_OPTION "}" \
238 + " %{!static-libtsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
239 STATIC_LIBTSAN_LIBS
240 #else
241 #define LIBTSAN_SPEC "-ltsan" STATIC_LIBTSAN_LIBS
242 @@ -791,8 +797,11 @@ proper position among the other output files. */
243 #ifdef LIBLSAN_EARLY_SPEC
244 #define LIBLSAN_SPEC STATIC_LIBLSAN_LIBS
245 #elif defined(HAVE_LD_STATIC_DYNAMIC)
246 -#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION \
247 - "} -llsan %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
248 +#define LIBLSAN_SPEC "%{static-liblsan:" LD_STATIC_OPTION "}" \
249 + " %{!static-liblsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
250 + " -llsan " \
251 + " %{static-liblsan:" LD_DYNAMIC_OPTION "}" \
252 + " %{!static-liblsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
253 STATIC_LIBLSAN_LIBS
254 #else
255 #define LIBLSAN_SPEC "-llsan" STATIC_LIBLSAN_LIBS
256 @@ -807,8 +816,11 @@ proper position among the other output files. */
257 #define STATIC_LIBUBSAN_LIBS \
258 " %{static-libubsan|static:%:include(libsanitizer.spec)%(link_libubsan)}"
259 #ifdef HAVE_LD_STATIC_DYNAMIC
260 -#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION \
261 - "} -lubsan %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
262 +#define LIBUBSAN_SPEC "%{static-libubsan:" LD_STATIC_OPTION "}" \
263 + " %{!static-libubsan:%{!fuse-ld=gold:--push-state }--no-as-needed}" \
264 + " -lubsan " \
265 + " %{static-libubsan:" LD_DYNAMIC_OPTION "}" \
266 + " %{!static-libubsan:%{fuse-ld=gold:--as-needed;:--pop-state}}" \
267 STATIC_LIBUBSAN_LIBS
268 #else
269 #define LIBUBSAN_SPEC "-lubsan" STATIC_LIBUBSAN_LIBS
270 --
271 2.35.1