r241228 - Make getArchNameForCompilerRTLib return the right thing on 32-bit Windows. Fixes the tests there.

[Peter Collingbourne]

Author: pcc
Date: Wed Jul  1 21:07:43 2015
New Revision: 241228

URL: http://llvm.org/viewvc/llvm-project?rev=241228&view=rev
Log:
Make getArchNameForCompilerRTLib return the right thing on 32-bit Windows. Fixes the tests there.

Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=241228&r1=241227&r2=241228&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Jul  1 21:07:43 2015
@@ -2231,6 +2231,10 @@ static void CollectArgsForIntegratedAsse
 
 // Until ARM libraries are build separately, we have them all in one library
 static StringRef getArchNameForCompilerRTLib(const ToolChain &TC) {
+  if (TC.getTriple().isOSWindows() &&
+      !TC.getTriple().isWindowsItaniumEnvironment() &&
+      TC.getArch() == llvm::Triple::x86)
+    return "i386";
   if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb)
     return "arm";
   return TC.getArchName();