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