From 4dce73af05b28ec30761c4b47f5de34b0b087e16 Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Wed, 11 Jul 2012 19:08:21 +0000 Subject: [PATCH] [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 . llvm-svn: 160060 --- clang/lib/Driver/ToolChains.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 93df747c3f16..b858c3e42872 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";