summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2010-06-16 19:01:17 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2010-06-16 19:01:17 +0000
commit23a8a06554c1b03932010e5a233fa11656f3363a (patch)
tree6995adc0cdca378b982810109d95f11b803b15f6 /clang/lib/CodeGen
parent1d44608cc112ee68ee523c5664f7340e8c81c2fa (diff)
downloadbcm5719-llvm-23a8a06554c1b03932010e5a233fa11656f3363a.tar.gz
bcm5719-llvm-23a8a06554c1b03932010e5a233fa11656f3363a.zip
Change the test for which ABI/CC to use on ARM to be base on the environment
(the last argument of the triple). llvm-svn: 106131
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/TargetInfo.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp
index 608929270d5..1de0ebc41c3 100644
--- a/clang/lib/CodeGen/TargetInfo.cpp
+++ b/clang/lib/CodeGen/TargetInfo.cpp
@@ -1778,10 +1778,11 @@ void ARMABIInfo::computeInfo(CGFunctionInfo &FI, ASTContext &Context,
const llvm::Triple &Triple(Context.Target.getTriple());
llvm::CallingConv::ID DefaultCC;
- if (Triple.getOS() == llvm::Triple::Darwin)
- DefaultCC = llvm::CallingConv::ARM_APCS;
- else
+ if (Triple.getEnvironmentName() == "gnueabi" ||
+ Triple.getEnvironmentName() == "eabi")
DefaultCC = llvm::CallingConv::ARM_AAPCS;
+ else
+ DefaultCC = llvm::CallingConv::ARM_APCS;
switch (getABIKind()) {
case APCS:
OpenPOWER on IntegriCloud