From 617e898dca861d61c18a4fa9b14f26846578ab4c Mon Sep 17 00:00:00 2001 From: Michal Gorny Date: Sun, 27 Aug 2017 20:38:43 +0000 Subject: Revert r311836 - [Driver] Use arch type to find compiler-rt libraries (on Linux) This causes a breakage on the Android build bot. Let's revert it until we figure out the correct solution there. llvm-svn: 311861 --- clang/lib/Driver/ToolChain.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'clang/lib/Driver/ToolChain.cpp') diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 2660c5a2c02..0476d156f56 100644 --- a/clang/lib/Driver/ToolChain.cpp +++ b/clang/lib/Driver/ToolChain.cpp @@ -297,12 +297,15 @@ static StringRef getArchNameForCompilerRTLib(const ToolChain &TC, const llvm::Triple &Triple = TC.getTriple(); bool IsWindows = Triple.isOSWindows(); + if (Triple.isWindowsMSVCEnvironment() && TC.getArch() == llvm::Triple::x86) + return "i386"; + if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb) return (arm::getARMFloatABI(TC, Args) == arm::FloatABI::Hard && !IsWindows) ? "armhf" : "arm"; - return llvm::Triple::getArchTypeName(TC.getArch()); + return TC.getArchName(); } std::string ToolChain::getCompilerRTPath() const { -- cgit v1.2.3