summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Korobeynikov <asl@math.spbu.ru>2013-03-18 07:59:20 +0000
committerAnton Korobeynikov <asl@math.spbu.ru>2013-03-18 07:59:20 +0000
commit2bed8472d13c4a917895752817ed38fa95722a13 (patch)
treefa2246fa11b12cf38ffc082a582c26c8c3933b6e
parent0f2c7ea5d04284999591b930d965ecc7994e5a82 (diff)
downloadbcm5719-llvm-2bed8472d13c4a917895752817ed38fa95722a13.tar.gz
bcm5719-llvm-2bed8472d13c4a917895752817ed38fa95722a13.zip
Make sure to use same EABI version for external assembler as for integrated as.
Patch by Andrew Turner! llvm-svn: 177252
-rw-r--r--clang/lib/Driver/Tools.cpp1
-rw-r--r--clang/test/Driver/freebsd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index d8c4415a7a5..f2760315116 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -5216,6 +5216,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:
diff --git a/clang/test/Driver/freebsd.c b/clang/test/Driver/freebsd.c
index d0e608cd31a..cc724439617 100644
--- a/clang/test/Driver/freebsd.c
+++ b/clang/test/Driver/freebsd.c
@@ -105,5 +105,5 @@
// RUN: %clang %s -### -o %t.o -target arm-gnueabi-freebsd10.0 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-ARM-EABI %s
// CHECK-ARM-EABI-NOT: clang{{.*}}" "-cc1"{{.*}}" "-fsjlj-exceptions"
-// CHECK-ARM-EABI: as{{.*}}" "-mfpu=softvfp"
+// CHECK-ARM-EABI: as{{.*}}" "-mfpu=softvfp" "-meabi=5"
// CHECK-ARM-EABI-NOT: as{{.*}}" "-matpcs"
OpenPOWER on IntegriCloud