summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains.cpp
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2012-07-11 19:08:21 +0000
committerChad Rosier <mcrosier@apple.com>2012-07-11 19:08:21 +0000
commit4dce73af05b28ec30761c4b47f5de34b0b087e16 (patch)
treebf1d1771633ea49e5075e311586644291e7dbd39 /clang/lib/Driver/ToolChains.cpp
parentb17122859be828b3d0a7fa787b4ade2258edd473 (diff)
downloadbcm5719-llvm-4dce73af05b28ec30761c4b47f5de34b0b087e16.tar.gz
bcm5719-llvm-4dce73af05b28ec30761c4b47f5de34b0b087e16.zip
[driver] Fix so that clang can find correct path prefix for libc object files
from GNU binutils supporting multi-arch folder for ARM target. Patch by Jiangning Liu <jiangning.liu@arm.com>. llvm-svn: 160060
Diffstat (limited to 'clang/lib/Driver/ToolChains.cpp')
-rw-r--r--clang/lib/Driver/ToolChains.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 93df747c3f1..b858c3e4287 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1905,6 +1905,11 @@ static std::string getMultiarchTriple(const llvm::Triple TargetTriple,
// common linux triples that don't quite match the Clang triple for both
// 32-bit and 64-bit targets. Multiarch fixes its install triples to these
// regardless of what the actual target triple is.
+ case llvm::Triple::arm:
+ case llvm::Triple::thumb:
+ if (llvm::sys::fs::exists(SysRoot + "/lib/arm-linux-gnueabi"))
+ return "arm-linux-gnueabi";
+ return TargetTriple.str();
case llvm::Triple::x86:
if (llvm::sys::fs::exists(SysRoot + "/lib/i386-linux-gnu"))
return "i386-linux-gnu";
OpenPOWER on IntegriCloud