From: Peter Collingbourne <peter@pcc.me.uk>
Date: Thu, 2 Jul 2015 02:07:43 +0000 (+0000)
Subject: Make getArchNameForCompilerRTLib return the right thing on 32-bit Windows. Fixes... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b090ab87ceab2350ab98f81ad600f7bef6cb362;p=clang

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@241228 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 05b0e08c1d..7c2ceefdb4 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2231,6 +2231,10 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
 
 // 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();