<div dir="ltr">r311488 was submitted moments later and should fix this (one of the other buildbots caught this really quickly).</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Aug 22, 2017 at 3:09 PM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class=""><br>
> On Aug 22, 2017, at 2:05 PM, Dan Albert via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br>
><br>
> Author: danalbert<br>
> Date: Tue Aug 22 14:05:01 2017<br>
> New Revision: 311487<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=311487&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=311487&view=rev</a><br>
> Log:<br>
> Revert "Revert "Revert "Revert "Fix LLVMgold plugin name/path for non-Linux.""""<br>
><br>
> With tests fixed for Windows style paths now that they are going<br>
> through path canonicalization.<br>
><br>
> Added:<br>
> cfe/trunk/test/Driver/lto-<wbr>plugin-darwin.c<br>
<br>
</span>This test fails on green dragon. Could you please take a look?<br>
<br>
<a href="http://green.lab.llvm.org/green/job/clang-stage1-configure-RA_check/34792/consoleFull#11650695138254eaf0-7326-4999-85b0-388101f2d404" rel="noreferrer" target="_blank">http://green.lab.llvm.org/<wbr>green/job/clang-stage1-<wbr>configure-RA_check/34792/<wbr>consoleFull#<wbr>11650695138254eaf0-7326-4999-<wbr>85b0-388101f2d404</a><br>
<span class="HOEnZb"><font color="#888888"><br>
-- adrian<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
> cfe/trunk/test/Driver/lto-<wbr>plugin-linux.c<br>
> cfe/trunk/test/Driver/lto-<wbr>plugin-windows.c<br>
> Modified:<br>
> cfe/trunk/lib/Driver/<wbr>ToolChains/CommonArgs.cpp<br>
> cfe/trunk/test/Driver/freebsd.<wbr>c<br>
> cfe/trunk/test/Driver/gold-<wbr>lto.c<br>
> cfe/trunk/test/Driver/lto.c<br>
> cfe/trunk/test/Driver/thinlto.<wbr>c<br>
><br>
> Modified: cfe/trunk/lib/Driver/<wbr>ToolChains/CommonArgs.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/CommonArgs.cpp?rev=311487&r1=311486&r2=311487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>ToolChains/CommonArgs.cpp?rev=<wbr>311487&r1=311486&r2=311487&<wbr>view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/lib/Driver/<wbr>ToolChains/CommonArgs.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/<wbr>ToolChains/CommonArgs.cpp Tue Aug 22 14:05:01 2017<br>
> @@ -376,8 +376,20 @@ void tools::AddGoldPlugin(const ToolChai<br>
> // as gold requires -plugin to come before any -plugin-opt that -Wl might<br>
> // forward.<br>
> CmdArgs.push_back("-plugin");<br>
> - std::string Plugin =<br>
> - ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so";<br>
> +<br>
> +#if defined(LLVM_ON_WIN32)<br>
> + const char *Suffix = ".dll";<br>
> +#elif defined(__APPLE__)<br>
> + const char *Suffix = ".dylib";<br>
> +#else<br>
> + const char *Suffix = ".so";<br>
> +#endif<br>
> +<br>
> + SmallString<1024> Plugin;<br>
> + llvm::sys::path::native(Twine(<wbr>ToolChain.getDriver().Dir) +<br>
> + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold" +<br>
> + Suffix,<br>
> + Plugin);<br>
> CmdArgs.push_back(Args.<wbr>MakeArgString(Plugin));<br>
><br>
> // Try to pass driver level flags relevant to LTO code generation down to<br>
><br>
> Modified: cfe/trunk/test/Driver/freebsd.<wbr>c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/freebsd.c?rev=311487&r1=311486&r2=311487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>freebsd.c?rev=311487&r1=<wbr>311486&r2=311487&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/freebsd.<wbr>c (original)<br>
> +++ cfe/trunk/test/Driver/freebsd.<wbr>c Tue Aug 22 14:05:01 2017<br>
> @@ -127,7 +127,7 @@<br>
><br>
> // RUN: %clang -target x86_64-pc-freebsd8 %s -### -flto 2>&1 \<br>
> // RUN: | FileCheck --check-prefix=CHECK-LTO %s<br>
> -// CHECK-LTO: ld{{.*}}" "-plugin{{.*}}LLVMgold.so<br>
> +// CHECK-LTO: ld{{.*}}" "-plugin{{.*}}{{[/\\]}}<wbr>LLVMgold.{{dll|dylib|so}}<br>
><br>
> // RUN: %clang -target sparc-unknown-freebsd8 %s -### -fpic -no-integrated-as 2>&1 \<br>
> // RUN: | FileCheck --check-prefix=CHECK-SPARC-PIE %s<br>
><br>
> Modified: cfe/trunk/test/Driver/gold-<wbr>lto.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/gold-lto.c?rev=311487&r1=311486&r2=311487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>gold-lto.c?rev=311487&r1=<wbr>311486&r2=311487&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/gold-<wbr>lto.c (original)<br>
> +++ cfe/trunk/test/Driver/gold-<wbr>lto.c Tue Aug 22 14:05:01 2017<br>
> @@ -3,14 +3,14 @@<br>
> // RUN: %clang -target x86_64-unknown-linux -### %t.o -flto 2>&1 \<br>
> // RUN: -Wl,-plugin-opt=foo -O3 \<br>
> // RUN: | FileCheck %s --check-prefix=CHECK-X86-64-<wbr>BASIC<br>
> -// CHECK-X86-64-BASIC: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-X86-64-BASIC: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
> // CHECK-X86-64-BASIC: "-plugin-opt=O3"<br>
> // CHECK-X86-64-BASIC: "-plugin-opt=foo"<br>
> //<br>
> // RUN: %clang -target x86_64-unknown-linux -### %t.o -flto 2>&1 \<br>
> // RUN: -march=corei7 -Wl,-plugin-opt=foo -Ofast \<br>
> // RUN: | FileCheck %s --check-prefix=CHECK-X86-64-<wbr>COREI7<br>
> -// CHECK-X86-64-COREI7: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-X86-64-COREI7: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
> // CHECK-X86-64-COREI7: "-plugin-opt=mcpu=corei7"<br>
> // CHECK-X86-64-COREI7: "-plugin-opt=O3"<br>
> // CHECK-X86-64-COREI7: "-plugin-opt=foo"<br>
> @@ -18,11 +18,11 @@<br>
> // RUN: %clang -target arm-unknown-linux -### %t.o -flto 2>&1 \<br>
> // RUN: -march=armv7a -Wl,-plugin-opt=foo -O0 \<br>
> // RUN: | FileCheck %s --check-prefix=CHECK-ARM-V7A<br>
> -// CHECK-ARM-V7A: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-ARM-V7A: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
> // CHECK-ARM-V7A: "-plugin-opt=mcpu=generic"<br>
> // CHECK-ARM-V7A: "-plugin-opt=O0"<br>
> // CHECK-ARM-V7A: "-plugin-opt=foo"<br>
> //<br>
> // RUN: %clang -target i686-linux-android -### %t.o -flto 2>&1 \<br>
> // RUN: | FileCheck %s --check-prefix=CHECK-X86-<wbr>ANDROID<br>
> -// CHECK-X86-ANDROID: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-X86-ANDROID: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
><br>
> Added: cfe/trunk/test/Driver/lto-<wbr>plugin-darwin.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/lto-plugin-darwin.c?rev=311487&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>lto-plugin-darwin.c?rev=<wbr>311487&view=auto</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/lto-<wbr>plugin-darwin.c (added)<br>
> +++ cfe/trunk/test/Driver/lto-<wbr>plugin-darwin.c Tue Aug 22 14:05:01 2017<br>
> @@ -0,0 +1,6 @@<br>
> +// Check that Darwin uses LLVMgold.dylib.<br>
> +// REQUIRES: system-darwin<br>
> +// RUN: %clang -### %s -flto 2>&1 \<br>
> +// RUN: | FileCheck -check-prefix=CHECK-LTO-PLUGIN %s<br>
> +//<br>
> +// CHECK-LTO-PLUGIN: "-plugin" "{{.*}}/LLVMgold.dylib"<br>
><br>
> Added: cfe/trunk/test/Driver/lto-<wbr>plugin-linux.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/lto-plugin-linux.c?rev=311487&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>lto-plugin-linux.c?rev=311487&<wbr>view=auto</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/lto-<wbr>plugin-linux.c (added)<br>
> +++ cfe/trunk/test/Driver/lto-<wbr>plugin-linux.c Tue Aug 22 14:05:01 2017<br>
> @@ -0,0 +1,6 @@<br>
> +// Check that non-Windows, non-Darwin OSs use LLVMgold.so.<br>
> +// REQUIRES: !system-darwin && !system-windows<br>
> +// RUN: %clang -### %s -flto 2>&1 \<br>
> +// RUN: | FileCheck -check-prefix=CHECK-LTO-PLUGIN %s<br>
> +//<br>
> +// CHECK-LTO-PLUGIN: "-plugin" "{{.*}}/LLVMgold.so"<br>
><br>
> Added: cfe/trunk/test/Driver/lto-<wbr>plugin-windows.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/lto-plugin-windows.c?rev=311487&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>lto-plugin-windows.c?rev=<wbr>311487&view=auto</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/lto-<wbr>plugin-windows.c (added)<br>
> +++ cfe/trunk/test/Driver/lto-<wbr>plugin-windows.c Tue Aug 22 14:05:01 2017<br>
> @@ -0,0 +1,6 @@<br>
> +// Check that Windows uses LLVMgold.dll.<br>
> +// REQUIRES: system-windows<br>
> +// RUN: %clang -### %s -flto 2>&1 \<br>
> +// RUN: | FileCheck -check-prefix=CHECK-LTO-PLUGIN %s<br>
> +//<br>
> +// CHECK-LTO-PLUGIN: "-plugin" "{{.*}}\\LLVMgold.dll"<br>
><br>
> Modified: cfe/trunk/test/Driver/lto.c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/lto.c?rev=311487&r1=311486&r2=311487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>lto.c?rev=311487&r1=311486&r2=<wbr>311487&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/lto.c (original)<br>
> +++ cfe/trunk/test/Driver/lto.c Tue Aug 22 14:05:01 2017<br>
> @@ -36,19 +36,19 @@<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto 2> %t<br>
> // RUN: FileCheck -check-prefix=CHECK-LINK-LTO-<wbr>ACTION < %t %s<br>
> //<br>
> -// CHECK-LINK-LTO-ACTION: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-LINK-LTO-ACTION: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
><br>
> // -flto=full should cause link using gold plugin<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto=full 2> %t<br>
> // RUN: FileCheck -check-prefix=CHECK-LINK-FULL-<wbr>ACTION < %t %s<br>
> //<br>
> -// CHECK-LINK-FULL-ACTION: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-LINK-FULL-ACTION: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
><br>
> // Check that subsequent -fno-lto takes precedence<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto=full -fno-lto 2> %t<br>
> // RUN: FileCheck -check-prefix=CHECK-LINK-<wbr>NOLTO-ACTION < %t %s<br>
> //<br>
> -// CHECK-LINK-NOLTO-ACTION-NOT: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-LINK-NOLTO-ACTION-NOT: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
><br>
> // -flto passes along an explicit debugger tuning argument.<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto -glldb 2> %t<br>
><br>
> Modified: cfe/trunk/test/Driver/thinlto.<wbr>c<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/thinlto.c?rev=311487&r1=311486&r2=311487&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>thinlto.c?rev=311487&r1=<wbr>311486&r2=311487&view=diff</a><br>
> ==============================<wbr>==============================<wbr>==================<br>
> --- cfe/trunk/test/Driver/thinlto.<wbr>c (original)<br>
> +++ cfe/trunk/test/Driver/thinlto.<wbr>c Tue Aug 22 14:05:01 2017<br>
> @@ -19,19 +19,19 @@<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto=full -fno-lto -flto=thin 2> %t<br>
> // RUN: FileCheck -check-prefix=CHECK-LINK-THIN-<wbr>ACTION < %t %s<br>
> //<br>
> -// CHECK-LINK-THIN-ACTION: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-LINK-THIN-ACTION: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
> // CHECK-LINK-THIN-ACTION: "-plugin-opt=thinlto"<br>
><br>
> // Check that subsequent -flto=full takes precedence<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto=thin -flto=full 2> %t<br>
> // RUN: FileCheck -check-prefix=CHECK-LINK-FULL-<wbr>ACTION < %t %s<br>
> //<br>
> -// CHECK-LINK-FULL-ACTION: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-LINK-FULL-ACTION: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
> // CHECK-LINK-FULL-ACTION-NOT: "-plugin-opt=thinlto"<br>
><br>
> // Check that subsequent -fno-lto takes precedence<br>
> // RUN: %clang -target x86_64-unknown-linux -### %s -flto=thin -fno-lto 2> %t<br>
> // RUN: FileCheck -check-prefix=CHECK-LINK-<wbr>NOLTO-ACTION < %t %s<br>
> //<br>
> -// CHECK-LINK-NOLTO-ACTION-NOT: "-plugin" "{{.*}}/LLVMgold.so"<br>
> +// CHECK-LINK-NOLTO-ACTION-NOT: "-plugin" "{{.*}}{{[/\\]}}LLVMgold.{{<wbr>dll|dylib|so}}"<br>
> // CHECK-LINK-NOLTO-ACTION-NOT: "-plugin-opt=thinlto"<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>
<br>
</div></div></blockquote></div><br></div>