<div dir="ltr">This broke the win asan build:<div><a href="http://lab.llvm.org:8011/builders/sanitizer-windows/builds/28203">http://lab.llvm.org:8011/builders/sanitizer-windows/builds/28203</a><br></div><div><br></div><div>More generally, though, this seems like it's a Boost convention and an MSVCRT convention, and not a general Windows convention:</div><div><a href="http://www.boost.org/doc/libs/1_42_0/more/getting_started/windows.html#library-naming">http://www.boost.org/doc/libs/1_42_0/more/getting_started/windows.html#library-naming</a><br></div><div><a href="https://msdn.microsoft.com/en-us/library/aa272081(v=vs.60).aspx">https://msdn.microsoft.com/en-us/library/aa272081(v=vs.60).aspx</a><br></div><div><a href="https://cmake.org/Bug/view.php?id=10190#c19315">https://cmake.org/Bug/view.php?id=10190#c19315</a><br></div><div><br></div><div>Our pre-existing convention was to name the dynamic library clang_rt.${lib}_${arch}_dynamic, because that works across platforms. I don't think we'll want to undo that convention across Windows, OS X, and Linux. There are probably enough projects out there already using those library names directly.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Aug 30, 2016 at 3:10 PM, Saleem Abdulrasool 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: compnerd<br>
Date: Tue Aug 30 17:10:27 2016<br>
New Revision: 280169<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=280169&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=280169&view=rev</a><br>
Log:<br>
Driver: use the canonical static library naming<br>
<br>
On Windows, static libraries are named lib<name>.lib while import libraries are<br>
named <name>.lib.  Use the appropriate naming on itanium and msvc environments.<br>
This is setup properly so that if a dynamic builtins is used on Windows, it<br>
would do the right thing, although this is not currently wired through the<br>
driver (i.e. there is no equivalent to -{shared,static}-gcc).<br>
<br>
Modified:<br>
    cfe/trunk/lib/Driver/<wbr>ToolChain.cpp<br>
    cfe/trunk/test/Driver/arm-<wbr>compiler-rt.c<br>
    cfe/trunk/test/Driver/windows-<wbr>cross.c<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>ToolChain.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChain.cpp?rev=280169&r1=280168&r2=280169&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>ToolChain.cpp?rev=280169&r1=<wbr>280168&r2=280169&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>ToolChain.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>ToolChain.cpp Tue Aug 30 17:10:27 2016<br>
@@ -288,13 +288,13 @@ std::string ToolChain::getCompilerRT(con<br>
                                      bool Shared) const {<br>
   const llvm::Triple &TT = getTriple();<br>
   const char *Env = TT.isAndroid() ? "-android" : "";<br>
-  bool IsITANMSVCWindows =<br>
+  bool IsWindowsIAMSVC =<br>
       TT.isWindowsMSVCEnvironment() || TT.<wbr>isWindowsItaniumEnvironment();<br>
<br>
   StringRef Arch = getArchNameForCompilerRTLib(*<wbr>this, Args);<br>
-  const char *Prefix = IsITANMSVCWindows ? "" : "lib";<br>
+  const char *Prefix = (IsWindowsIAMSVC && Shared) ? "" : "lib";<br>
   const char *Suffix = Shared ? (Triple.isOSWindows() ? ".dll" : ".so")<br>
-                              : (IsITANMSVCWindows ? ".lib" : ".a");<br>
+                              : (IsWindowsIAMSVC ? ".lib" : ".a");<br>
<br>
   SmallString<128> Path(getDriver().ResourceDir);<br>
   StringRef OSLibName = Triple.isOSFreeBSD() ? "freebsd" : getOS();<br>
<br>
Modified: cfe/trunk/test/Driver/arm-<wbr>compiler-rt.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-compiler-rt.c?rev=280169&r1=280168&r2=280169&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>arm-compiler-rt.c?rev=280169&<wbr>r1=280168&r2=280169&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/arm-<wbr>compiler-rt.c (original)<br>
+++ cfe/trunk/test/Driver/arm-<wbr>compiler-rt.c Tue Aug 30 17:10:27 2016<br>
@@ -11,7 +11,7 @@<br>
 // ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.<wbr>builtins-arm.a"<br>
<br>
 // RUN: %clang -target arm-windows-itanium -rtlib=compiler-rt -### %s 2>&1 | FileCheck %s -check-prefix ARM-WINDOWS<br>
-// ARM-WINDOWS: "{{.*[/\\]}}clang_rt.builtins-<wbr>arm.lib"<br>
+// ARM-WINDOWS: "{{.*[/\\]}}libclang_rt.<wbr>builtins-arm.lib"<br>
<br>
 // RUN: %clang -target arm-linux-androideabi -rtlib=compiler-rt -### %s 2>&1 | FileCheck %s -check-prefix ARM-ANDROID<br>
 // ARM-ANDROID: "{{.*[/\\]}}libclang_rt.<wbr>builtins-arm-android.a"<br>
<br>
Modified: cfe/trunk/test/Driver/windows-<wbr>cross.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/windows-cross.c?rev=280169&r1=280168&r2=280169&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>windows-cross.c?rev=280169&r1=<wbr>280168&r2=280169&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/windows-<wbr>cross.c (original)<br>
+++ cfe/trunk/test/Driver/windows-<wbr>cross.c Tue Aug 30 17:10:27 2016<br>
@@ -6,27 +6,27 @@<br>
 // RUN: %clang -### -target armv7-windows-itanium --sysroot %s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/<wbr>bin -rtlib=compiler-rt -stdlib=libstdc++ -o /dev/null %s 2>&1 \<br>
 // RUN:   | FileCheck %s --check-prefix CHECK-RTLIB<br>
<br>
-// CHECK-RTLIB: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbegin.obj" "-L{{.*}}/Inputs/Windows/ARM/<wbr>8.1/usr/lib" "-L{{.*}}/Inputs/Windows/ARM/<wbr>8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-<wbr>arm.lib"<br>
+// CHECK-RTLIB: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbegin.obj" "-L{{.*}}/Inputs/Windows/ARM/<wbr>8.1/usr/lib" "-L{{.*}}/Inputs/Windows/ARM/<wbr>8.1/usr/lib/gcc" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.<wbr>builtins-arm.lib"<br>
<br>
 // RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/<wbr>bin -rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1 \<br>
 // RUN:   | FileCheck %s --check-prefix CHECK-C-LIBCXX<br>
<br>
-// CHECK-C-LIBCXX: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-<wbr>arm.lib"<br>
+// CHECK-C-LIBCXX: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.<wbr>builtins-arm.lib"<br>
<br>
 // RUN: %clangxx -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/<wbr>bin -rtlib=compiler-rt -stdlib=libc++ -o /dev/null %s 2>&1 \<br>
 // RUN:   | FileCheck %s --check-prefix CHECK-LIBCXX<br>
<br>
-// CHECK-LIBCXX: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lc++" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-<wbr>arm.lib"<br>
+// CHECK-LIBCXX: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-Bdynamic" "--entry" "mainCRTStartup" "--allow-multiple-definition" "-o" "{{[^"]*}}" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbegin.obj" "{{.*}}.o" "-lc++" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.<wbr>builtins-arm.lib"<br>
<br>
 // RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/<wbr>bin -shared -rtlib=compiler-rt -stdlib=libc++ -o shared.dll %s 2>&1 \<br>
 // RUN:   | FileCheck %s --check-prefix CHECK-SHARED<br>
<br>
-// CHECK-SHARED: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry" "_DllMainCRTStartup" "--allow-multiple-definition" "-o" "shared.dll" "--out-implib" "shared.lib" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbeginS.obj" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-<wbr>arm.lib"<br>
+// CHECK-SHARED: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry" "_DllMainCRTStartup" "--allow-multiple-definition" "-o" "shared.dll" "--out-implib" "shared.lib" "{{.*}}/Inputs/Windows/ARM/8.<wbr>1/usr/lib/crtbeginS.obj" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.<wbr>builtins-arm.lib"<br>
<br>
 // RUN: %clang -### -target armv7-windows-itanium --sysroot %s/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/<wbr>bin -shared -rtlib=compiler-rt -stdlib=libc++ -nostartfiles -o shared.dll %s 2>&1 \<br>
 // RUN:   | FileCheck %s --check-prefix CHECK-NOSTARTFILES<br>
<br>
-// CHECK-NOSTARTFILES: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry" "_DllMainCRTStartup" "--allow-multiple-definition" "-o" "shared.dll" "--out-implib" "shared.lib" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}clang_rt.builtins-<wbr>arm.lib"<br>
+// CHECK-NOSTARTFILES: armv7-windows-itanium-ld" "--sysroot={{.*}}/Inputs/<wbr>Windows/ARM/8.1" "-m" "thumb2pe" "-shared" "-Bdynamic" "--enable-auto-image-base" "--entry" "_DllMainCRTStartup" "--allow-multiple-definition" "-o" "shared.dll" "--out-implib" "shared.lib" "{{.*}}.o" "-lmsvcrt" "{{.*[\\/]}}libclang_rt.<wbr>builtins-arm.lib"<br>
<br>
 // RUN: %clang -### -target armv7-windows-itanium --sysroot %S/Inputs/Windows/ARM/8.1 -B %S/Inputs/Windows/ARM/8.1/usr/<wbr>bin -shared -rtlib=compiler-rt -stdlib=libc++ -nostartfiles -nodefaultlibs -o shared.dll %s 2>&1 \<br>
 // RUN:   | FileCheck %s --check-prefix CHECK-STANDALONE<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>