summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorJiangning Liu <jiangning.liu@arm.com>2012-07-30 11:05:56 +0000
committerJiangning Liu <jiangning.liu@arm.com>2012-07-30 11:05:56 +0000
commiteabbf92223759e69907b5ad31ff57095ee439db8 (patch)
tree54b5af701c2d53bc56df7024015771efba90077a /clang/lib/Driver/Tools.cpp
parent36d2dff143af524527160cea32b6255fe6f04842 (diff)
downloadbcm5719-llvm-eabbf92223759e69907b5ad31ff57095ee439db8.tar.gz
bcm5719-llvm-eabbf92223759e69907b5ad31ff57095ee439db8.zip
Fix dynamic object linker for ARM GNUEABIHF.
llvm-svn: 160958
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 54f209d7d9e..e13f709185f 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -5516,8 +5516,12 @@ void linuxtools::Link::ConstructJob(Compilation &C, const JobAction &JA,
else if (ToolChain.getArch() == llvm::Triple::x86)
CmdArgs.push_back("/lib/ld-linux.so.2");
else if (ToolChain.getArch() == llvm::Triple::arm ||
- ToolChain.getArch() == llvm::Triple::thumb)
- CmdArgs.push_back("/lib/ld-linux.so.3");
+ ToolChain.getArch() == llvm::Triple::thumb) {
+ if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
+ CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
+ else
+ CmdArgs.push_back("/lib/ld-linux.so.3");
+ }
else if (ToolChain.getArch() == llvm::Triple::mips ||
ToolChain.getArch() == llvm::Triple::mipsel)
CmdArgs.push_back("/lib/ld.so.1");
OpenPOWER on IntegriCloud