diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2015-07-02 02:07:43 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2015-07-02 02:07:43 +0000 |
| commit | 2659fb370e0f3ace668aac2d5b15ea5ea2848b24 (patch) | |
| tree | db98d2523d7f194ba87019872562bd2f3b5ee06b /clang/lib/Driver/Tools.cpp | |
| parent | 23a410cc6479e76ecffcb2810fa0096775d769eb (diff) | |
| download | bcm5719-llvm-2659fb370e0f3ace668aac2d5b15ea5ea2848b24.tar.gz bcm5719-llvm-2659fb370e0f3ace668aac2d5b15ea5ea2848b24.zip | |
Make getArchNameForCompilerRTLib return the right thing on 32-bit Windows. Fixes the tests there.
llvm-svn: 241228
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 05b0e08c1d5..7c2ceefdb4e 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/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(); |
