summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/tools
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2013-03-20 08:34:30 +0000
committerandrew <andrew@FreeBSD.org>2013-03-20 08:34:30 +0000
commit24e611a89b6a2afd05f115a1cae4e1f9d398fb34 (patch)
treeb22021a5be682e4afa55b2fb009e2793a8b96f20 /contrib/llvm/tools
parentca2bfdcda74614da80aec70e6332addb1fd668c1 (diff)
downloadFreeBSD-src-24e611a89b6a2afd05f115a1cae4e1f9d398fb34.zip
FreeBSD-src-24e611a89b6a2afd05f115a1cae4e1f9d398fb34.tar.gz
Pull in r177252 from upstream clang trunk:
Make sure to use same EABI version for external assembler as for integrated as. This allows us to use gcc on a world built with clang on ARM.
Diffstat (limited to 'contrib/llvm/tools')
-rw-r--r--contrib/llvm/tools/clang/lib/Driver/Tools.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
index 4976b45..5739fa1 100644
--- a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
+++ b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
@@ -5438,6 +5438,7 @@ void freebsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
switch(getToolChain().getTriple().getEnvironment()) {
case llvm::Triple::GNUEABI:
case llvm::Triple::EABI:
+ CmdArgs.push_back("-meabi=5");
break;
default:
OpenPOWER on IntegriCloud