aboutsummaryrefslogtreecommitdiff
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
commitb234e7484b8b678977e5c6a6088dee323c72d3ab (patch)
tree35d5ee416b18914222168b3bd54b8868754cb62d
parent367989b354d38e9993eb53811501d794b385e661 (diff)
Make sure to use same EABI version for external assembler as for integrated as.
Patch by Andrew Turner! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177252 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Driver/Tools.cpp1
-rw-r--r--test/Driver/freebsd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index d8c4415a7a..f276031511 100644
--- a/lib/Driver/Tools.cpp
+++ b/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/test/Driver/freebsd.c b/test/Driver/freebsd.c
index d0e608cd31..cc72443961 100644
--- a/test/Driver/freebsd.c
+++ b/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"