<div dir="ltr">Hi,<div>Would you please have a look at:</div><div><a href="http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-incremental/42380/" target="_blank">http://green.lab.llvm.org/<wbr>green/job/clang-stage1-cmake-<wbr>RA-incremental/42380/</a><br></div><div><br></div><div>it appears this commit is causing some tests to fail on our bots. Any assistance you may provide in getting the bots back green would be greatly appreciated.</div><div><br></div><div>Respectfully,</div><div>Mike Edwards</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 12, 2017 at 3:14 PM, Martell Malone via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: martell<br>
Date: Tue Sep 12 15:14:18 2017<br>
New Revision: 313082<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=313082&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=313082&view=rev</a><br>
Log:<br>
[Driver] MinGW: Remove custom linker detection<br>
<br>
In rL289668 the ability to specify the default linker at compile time<br>
was added but because the MinGW driver used custom detection we could<br>
not take advantage of this new CMAKE flag CLANG_DEFAULT_LINKER.<br>
<br>
Modified:<br>
cfe/trunk/lib/Driver/<wbr>ToolChains/MinGW.cpp<br>
cfe/trunk/test/Driver/mingw-<wbr>useld.c<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>ToolChains/MinGW.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/MinGW.cpp?rev=313082&r1=313081&r2=313082&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>ToolChains/MinGW.cpp?rev=<wbr>313082&r1=313081&r2=313082&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>ToolChains/MinGW.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>ToolChains/MinGW.cpp Tue Sep 12 15:14:18 2017<br>
@@ -104,14 +104,6 @@ void tools::MinGW::Linker::<wbr>ConstructJob(<br>
// handled somewhere else.<br>
Args.ClaimAllArgs(options::<wbr>OPT_w);<br>
<br>
- StringRef LinkerName = Args.getLastArgValue(options::<wbr>OPT_fuse_ld_EQ, "ld");<br>
- if (LinkerName.equals_lower("lld"<wbr>)) {<br>
- CmdArgs.push_back("-flavor");<br>
- CmdArgs.push_back("gnu");<br>
- } else if (!LinkerName.equals_lower("ld"<wbr>)) {<br>
- D.Diag(diag::err_drv_<wbr>unsupported_linker) << LinkerName;<br>
- }<br>
-<br>
if (!D.SysRoot.empty())<br>
CmdArgs.push_back(Args.<wbr>MakeArgString("--sysroot=" + D.SysRoot));<br>
<br>
@@ -241,7 +233,7 @@ void tools::MinGW::Linker::<wbr>ConstructJob(<br>
<br>
if (Args.hasArg(options::OPT_<wbr>static))<br>
CmdArgs.push_back("--end-<wbr>group");<br>
- else if (!LinkerName.equals_lower("<wbr>lld"))<br>
+ else<br>
AddLibGCC(Args, CmdArgs);<br>
}<br>
<br>
@@ -252,7 +244,7 @@ void tools::MinGW::Linker::<wbr>ConstructJob(<br>
CmdArgs.push_back(Args.<wbr>MakeArgString(TC.GetFilePath("<wbr>crtend.o")));<br>
}<br>
}<br>
- const char *Exec = Args.MakeArgString(TC.<wbr>GetProgramPath(LinkerName.<wbr>data()));<br>
+ const char *Exec = Args.MakeArgString(TC.<wbr>GetLinkerPath());<br>
C.addCommand(llvm::make_<wbr>unique<Command>(JA, *this, Exec, CmdArgs, Inputs));<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/Driver/mingw-<wbr>useld.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mingw-useld.c?rev=313082&r1=313081&r2=313082&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>mingw-useld.c?rev=313082&r1=<wbr>313081&r2=313082&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/mingw-<wbr>useld.c (original)<br>
+++ cfe/trunk/test/Driver/mingw-<wbr>useld.c Tue Sep 12 15:14:18 2017<br>
@@ -1,19 +1,19 @@<br>
-// RUN: %clang -### -target i686-pc-windows-gnu --sysroot=%S/Inputs/mingw_<wbr>clang_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_LD_32 %s<br>
-// CHECK_LD_32: ld{{(.exe)?}}"<br>
+// RUN: %clang -### -target i686-pc-windows-gnu --sysroot=%S/Inputs/mingw_<wbr>clang_tree/mingw32 %s -fuse-ld=platform 2>&1 | FileCheck -check-prefix=CHECK_LD_32 %s<br>
+// CHECK_LD_32: "{{[^"]*}}ld{{(.exe)?}}"<br>
// CHECK_LD_32: "i386pe"<br>
-// CHECK_LD_32-NOT: "-flavor" "gnu"<br>
+// CHECK_LD_32-NOT: "{{[^"]*}}ld.lld{{(.exe)?}}"<br>
<br>
// RUN: %clang -### -target i686-pc-windows-gnu --sysroot=%S/Inputs/mingw_<wbr>clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck -check-prefix=CHECK_LLD_32 %s<br>
// CHECK_LLD_32-NOT: invalid linker name in argument<br>
-// CHECK_LLD_32: lld{{(.exe)?}}" "-flavor" "gnu"<br>
+// CHECK_LLD_32: "{{[^"]*}}ld.lld{{(.exe)?}}"<br>
// CHECK_LLD_32: "i386pe"<br>
<br>
// RUN: %clang -### -target x86_64-pc-windows-gnu --sysroot=%S/Inputs/mingw_<wbr>clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck -check-prefix=CHECK_LLD_64 %s<br>
// CHECK_LLD_64-NOT: invalid linker name in argument<br>
-// CHECK_LLD_64: lld{{(.exe)?}}" "-flavor" "gnu"<br>
+// CHECK_LLD_64: "{{[^"]*}}ld.lld{{(.exe)?}}"<br>
// CHECK_LLD_64: "i386pep"<br>
<br>
// RUN: %clang -### -target arm-pc-windows-gnu --sysroot=%S/Inputs/mingw_<wbr>clang_tree/mingw32 %s -fuse-ld=lld 2>&1 | FileCheck -check-prefix=CHECK_LLD_ARM %s<br>
// CHECK_LLD_ARM-NOT: invalid linker name in argument<br>
-// CHECK_LLD_ARM: lld{{(.exe)?}}" "-flavor" "gnu"<br>
+// CHECK_LLD_ARM: "{{[^"]*}}ld.lld{{(.exe)?}}"<br>
// CHECK_LLD_ARM: "thumb2pe"<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>