diff options
| author | Michal Gorny <mgorny@gentoo.org> | 2017-08-27 20:38:43 +0000 |
|---|---|---|
| committer | Michal Gorny <mgorny@gentoo.org> | 2017-08-27 20:38:43 +0000 |
| commit | 617e898dca861d61c18a4fa9b14f26846578ab4c (patch) | |
| tree | de54499290740705f6ab6072186c0e1a46e859da /clang/lib/Driver/ToolChain.cpp | |
| parent | b81fa9932a9a4fdfaaa74a1d240c0893a8496163 (diff) | |
| download | llvm-617e898dca861d61c18a4fa9b14f26846578ab4c.zip llvm-617e898dca861d61c18a4fa9b14f26846578ab4c.tar.gz llvm-617e898dca861d61c18a4fa9b14f26846578ab4c.tar.bz2 | |
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
Diffstat (limited to 'clang/lib/Driver/ToolChain.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChain.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp index 2660c5a..0476d15 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 { |