1 Pull in r211785 from upstream clang trunk (by Logan Chien):
3 Implement the -fuse-ld= option.
5 This commit implements the -fuse-ld= option, so that the user
6 can specify -fuse-ld=bfd to use ld.bfd.
8 This commit re-applies r194328 with some test case changes.
9 It seems that r194328 was breaking macosx or mingw build
10 because clang can't find ld.bfd or ld.gold in the given sysroot.
11 We should use -B to specify the executable search path instead.
13 Patch originally by David Chisnall.
15 Pull in r211786 from upstream clang trunk (by Logan Chien):
17 Propset the executables for GetProgramPath().
19 Introduced here: http://svnweb.freebsd.org/changeset/base/279302
21 Index: tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
22 ===================================================================
23 --- tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
24 +++ tools/clang/include/clang/Basic/DiagnosticDriverKinds.td
25 @@ -20,6 +20,8 @@ def err_drv_unknown_stdin_type : Error<
26 def err_drv_unknown_language : Error<"language not recognized: '%0'">;
27 def err_drv_invalid_arch_name : Error<
28 "invalid arch name '%0'">;
29 +def err_drv_invalid_linker_name : Error<
30 + "invalid linker name in argument '%0'">;
31 def err_drv_invalid_rtlib_name : Error<
32 "invalid runtime library name in argument '%0'">;
33 def err_drv_unsupported_rtlib_for_platform : Error<
34 Index: tools/clang/include/clang/Driver/Options.td
35 ===================================================================
36 --- tools/clang/include/clang/Driver/Options.td
37 +++ tools/clang/include/clang/Driver/Options.td
38 @@ -1453,7 +1453,7 @@ def fprofile_dir : Joined<["-"], "fprofile-dir=">,
40 defm profile_use : BooleanFFlag<"profile-use">, Group<clang_ignored_f_Group>;
41 def fprofile_use_EQ : Joined<["-"], "fprofile-use=">, Group<clang_ignored_f_Group>;
42 -def fuse_ld_EQ : Joined<["-"], "fuse-ld=">, Group<clang_ignored_f_Group>;
43 +def fuse_ld_EQ : Joined<["-"], "fuse-ld=">, Group<f_Group>;
45 defm align_functions : BooleanFFlag<"align-functions">, Group<clang_ignored_f_Group>;
46 def falign_functions_EQ : Joined<["-"], "falign-functions=">, Group<clang_ignored_f_Group>;
47 Index: tools/clang/include/clang/Driver/ToolChain.h
48 ===================================================================
49 --- tools/clang/include/clang/Driver/ToolChain.h
50 +++ tools/clang/include/clang/Driver/ToolChain.h
51 @@ -150,6 +150,10 @@ class ToolChain {
52 std::string GetFilePath(const char *Name) const;
53 std::string GetProgramPath(const char *Name) const;
55 + /// Returns the linker path, respecting the -fuse-ld= argument to determine
56 + /// the linker suffix or name.
57 + std::string GetLinkerPath() const;
59 /// \brief Dispatch to the specific toolchain for verbose printing.
61 /// This is used when handling the verbose option to print detailed,
62 Index: tools/clang/lib/Driver/ToolChain.cpp
63 ===================================================================
64 --- tools/clang/lib/Driver/ToolChain.cpp
65 +++ tools/clang/lib/Driver/ToolChain.cpp
67 #include "clang/Driver/Options.h"
68 #include "clang/Driver/SanitizerArgs.h"
69 #include "clang/Driver/ToolChain.h"
70 +#include "llvm/ADT/SmallString.h"
71 #include "llvm/ADT/StringSwitch.h"
72 #include "llvm/Option/Arg.h"
73 #include "llvm/Option/ArgList.h"
74 @@ -146,6 +147,30 @@ std::string ToolChain::GetProgramPath(const char *
75 return D.GetProgramPath(Name, *this);
78 +std::string ToolChain::GetLinkerPath() const {
79 + if (Arg *A = Args.getLastArg(options::OPT_fuse_ld_EQ)) {
80 + StringRef Suffix = A->getValue();
82 + // If we're passed -fuse-ld= with no argument, or with the argument ld,
83 + // then use whatever the default system linker is.
84 + if (Suffix.empty() || Suffix == "ld")
85 + return GetProgramPath("ld");
87 + llvm::SmallString<8> LinkerName("ld.");
88 + LinkerName.append(Suffix);
90 + std::string LinkerPath(GetProgramPath(LinkerName.c_str()));
91 + if (llvm::sys::fs::exists(LinkerPath))
94 + getDriver().Diag(diag::err_drv_invalid_linker_name) << A->getAsString(Args);
98 + return GetProgramPath("ld");
102 types::ID ToolChain::LookupTypeForExtension(const char *Ext) const {
103 return types::lookupTypeForExtension(Ext);
105 Index: tools/clang/lib/Driver/ToolChains.cpp
106 ===================================================================
107 --- tools/clang/lib/Driver/ToolChains.cpp
108 +++ tools/clang/lib/Driver/ToolChains.cpp
109 @@ -2420,7 +2420,7 @@ Linux::Linux(const Driver &D, const llvm::Triple &
110 PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
111 GCCInstallation.getTriple().str() + "/bin").str());
113 - Linker = GetProgramPath("ld");
114 + Linker = GetLinkerPath();
116 Distro Distro = DetectDistro(Arch);
118 Index: tools/clang/lib/Driver/Tools.cpp
119 ===================================================================
120 --- tools/clang/lib/Driver/Tools.cpp
121 +++ tools/clang/lib/Driver/Tools.cpp
122 @@ -5088,7 +5088,7 @@ void darwin::Link::ConstructJob(Compilation &C, co
123 Args.AddAllArgs(CmdArgs, options::OPT_F);
126 - Args.MakeArgString(getToolChain().GetProgramPath("ld"));
127 + Args.MakeArgString(getToolChain().GetLinkerPath());
128 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
131 @@ -5285,7 +5285,7 @@ void solaris::Link::ConstructJob(Compilation &C, c
132 addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
135 - Args.MakeArgString(getToolChain().GetProgramPath("ld"));
136 + Args.MakeArgString(getToolChain().GetLinkerPath());
137 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
140 @@ -5397,7 +5397,7 @@ void auroraux::Link::ConstructJob(Compilation &C,
141 addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
144 - Args.MakeArgString(getToolChain().GetProgramPath("ld"));
145 + Args.MakeArgString(getToolChain().GetLinkerPath());
146 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
149 @@ -5587,7 +5587,7 @@ void openbsd::Link::ConstructJob(Compilation &C, c
153 - Args.MakeArgString(getToolChain().GetProgramPath("ld"));
154 + Args.MakeArgString(getToolChain().GetLinkerPath());
155 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
158 @@ -5727,7 +5727,7 @@ void bitrig::Link::ConstructJob(Compilation &C, co
162 - Args.MakeArgString(getToolChain().GetProgramPath("ld"));
163 + Args.MakeArgString(getToolChain().GetLinkerPath());
164 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
167 @@ -6016,7 +6016,7 @@ void freebsd::Link::ConstructJob(Compilation &C, c
168 addProfileRT(ToolChain, Args, CmdArgs, ToolChain.getTriple());
171 - Args.MakeArgString(ToolChain.GetProgramPath("ld"));
172 + Args.MakeArgString(ToolChain.GetLinkerPath());
173 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
176 @@ -6204,7 +6204,7 @@ void netbsd::Link::ConstructJob(Compilation &C, co
178 addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
180 - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("ld"));
181 + const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath());
182 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
185 @@ -6749,7 +6749,7 @@ void minix::Link::ConstructJob(Compilation &C, con
186 Args.MakeArgString(getToolChain().GetFilePath("crtend.o")));
189 - const char *Exec = Args.MakeArgString(getToolChain().GetProgramPath("ld"));
190 + const char *Exec = Args.MakeArgString(getToolChain().GetLinkerPath());
191 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
194 @@ -6933,7 +6933,7 @@ void dragonfly::Link::ConstructJob(Compilation &C,
195 addProfileRT(getToolChain(), Args, CmdArgs, getToolChain().getTriple());
198 - Args.MakeArgString(getToolChain().GetProgramPath("ld"));
199 + Args.MakeArgString(getToolChain().GetLinkerPath());
200 C.addCommand(new Command(JA, *this, Exec, CmdArgs));
203 Index: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
204 ===================================================================
206 Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
207 ___________________________________________________________________
208 Added: svn:executable
211 \ No newline at end of property
212 Index: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.bfd
213 ===================================================================
215 Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.bfd
216 ___________________________________________________________________
217 Added: svn:executable
220 \ No newline at end of property
221 Index: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.gold
222 ===================================================================
224 Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld.gold
225 ___________________________________________________________________
226 Added: svn:executable
229 \ No newline at end of property
230 Index: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld
231 ===================================================================
233 Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld
234 ___________________________________________________________________
235 Added: svn:executable
238 \ No newline at end of property
239 Index: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.bfd
240 ===================================================================
242 Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.bfd
243 ___________________________________________________________________
244 Added: svn:executable
247 \ No newline at end of property
248 Index: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.gold
249 ===================================================================
251 Property changes on: tools/clang/test/Driver/Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.gold
252 ___________________________________________________________________
253 Added: svn:executable
256 \ No newline at end of property
257 Index: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.bfd
258 ===================================================================
260 Property changes on: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.bfd
261 ___________________________________________________________________
262 Added: svn:executable
265 \ No newline at end of property
266 Index: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.gold
267 ===================================================================
269 Property changes on: tools/clang/test/Driver/Inputs/basic_freebsd_tree/usr/bin/ld.gold
270 ___________________________________________________________________
271 Added: svn:executable
274 \ No newline at end of property
275 Index: tools/clang/test/Driver/fuse-ld.c
276 ===================================================================
277 --- tools/clang/test/Driver/fuse-ld.c
278 +++ tools/clang/test/Driver/fuse-ld.c
280 +// RUN: %clang %s -### \
281 +// RUN: -target x86_64-unknown-freebsd 2>&1 \
282 +// RUN: | FileCheck %s --check-prefix=CHECK-FREEBSD-LD
283 +// CHECK-FREEBSD-LD: ld
285 +// RUN: %clang %s -### -fuse-ld=bfd \
286 +// RUN: --sysroot=%S/Inputs/basic_freebsd_tree \
287 +// RUN: -target x86_64-unknown-freebsd \
288 +// RUN: -B%S/Inputs/basic_freebsd_tree/usr/bin 2>&1 \
289 +// RUN: | FileCheck %s -check-prefix=CHECK-FREEBSD-BFD
290 +// CHECK-FREEBSD-BFD: Inputs/basic_freebsd_tree/usr/bin/ld.bfd
292 +// RUN: %clang %s -### -fuse-ld=gold \
293 +// RUN: --sysroot=%S/Inputs/basic_freebsd_tree \
294 +// RUN: -target x86_64-unknown-freebsd \
295 +// RUN: -B%S/Inputs/basic_freebsd_tree/usr/bin 2>&1 \
296 +// RUN: | FileCheck %s -check-prefix=CHECK-FREEBSD-GOLD
297 +// CHECK-FREEBSD-GOLD: Inputs/basic_freebsd_tree/usr/bin/ld.gold
299 +// RUN: %clang %s -### -fuse-ld=plib \
300 +// RUN: --sysroot=%S/Inputs/basic_freebsd_tree \
301 +// RUN: -target x86_64-unknown-freebsd \
302 +// RUN: -B%S/Inputs/basic_freebsd_tree/usr/bin 2>&1 \
303 +// RUN: | FileCheck %s -check-prefix=CHECK-FREEBSD-PLIB
304 +// CHECK-FREEBSD-PLIB: error: invalid linker name
308 +// RUN: %clang %s -### \
309 +// RUN: -target arm-linux-androideabi \
310 +// RUN: -B%S/Inputs/basic_android_tree/bin 2>&1 \
311 +// RUN: | FileCheck %s --check-prefix=CHECK-ANDROID-ARM-LD
312 +// CHECK-ANDROID-ARM-LD: Inputs/basic_android_tree/bin/arm-linux-androideabi-ld
314 +// RUN: %clang %s -### -fuse-ld=bfd \
315 +// RUN: -target arm-linux-androideabi \
316 +// RUN: -B%S/Inputs/basic_android_tree/bin 2>&1 \
317 +// RUN: | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-BFD
318 +// CHECK-ANDROID-ARM-BFD: Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.bfd
320 +// RUN: %clang %s -### -fuse-ld=gold \
321 +// RUN: -target arm-linux-androideabi \
322 +// RUN: -B%S/Inputs/basic_android_tree/bin 2>&1 \
323 +// RUN: | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-GOLD
324 +// CHECK-ANDROID-ARM-GOLD: Inputs/basic_android_tree/bin/arm-linux-androideabi-ld.gold
326 +// RUN: %clang %s -### \
327 +// RUN: -target arm-linux-androideabi \
328 +// RUN: -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
329 +// RUN: | FileCheck %s --check-prefix=CHECK-ANDROID-ARM-LD-TC
330 +// CHECK-ANDROID-ARM-LD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld
332 +// RUN: %clang %s -### -fuse-ld=bfd \
333 +// RUN: -target arm-linux-androideabi \
334 +// RUN: -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
335 +// RUN: | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-BFD-TC
336 +// CHECK-ANDROID-ARM-BFD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld.bfd
338 +// RUN: %clang %s -### -fuse-ld=gold \
339 +// RUN: -target arm-linux-androideabi \
340 +// RUN: -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
341 +// RUN: | FileCheck %s -check-prefix=CHECK-ANDROID-ARM-GOLD-TC
342 +// CHECK-ANDROID-ARM-GOLD-TC: Inputs/basic_android_tree/lib/gcc/arm-linux-androideabi/4.4.3/../../../../arm-linux-androideabi/bin/ld.gold