From 61770ab26f4b11bf1c3c185bb4fe24e82397baf3 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Fri, 2 Jan 2015 21:47:33 +0000 Subject: [PATCH] Driver: honour the clang-cl behaviour on ARM as well Unfortunately, MSVC does not indicate to the driver what target is being used. This means that we cannot correctly select the target architecture for the clang_rt component. This breaks down when targeting windows with the clang driver as opposed to the clang-cl driver. This should fix the native ARM buildbot tests. llvm-svn: 225089 --- clang/lib/Driver/Tools.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index ecca1a4..90d1acc 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -2103,11 +2103,12 @@ 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.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb) - return "arm"; // FIXME: handle 64-bit - if (TC.getTriple().isOSWindows()) + if (TC.getTriple().isOSWindows() && + !TC.getTriple().isWindowsItaniumEnvironment()) return "i386"; + if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb) + return "arm"; return TC.getArchName(); } -- 2.7.4