summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen/TargetInfo.cpp
diff options
context:
space:
mode:
authorTim Northover <tnorthover@apple.com>2016-01-27 19:32:40 +0000
committerTim Northover <tnorthover@apple.com>2016-01-27 19:32:40 +0000
commitd88ecb30a13abc1258408cf370156218c9f16891 (patch)
treead0db005208b304abe4897348c76b34ef58cff23 /clang/lib/CodeGen/TargetInfo.cpp
parent042a6c1fe19caf48af7e287dc8f6fd5fec158093 (diff)
downloadbcm5719-llvm-d88ecb30a13abc1258408cf370156218c9f16891.tar.gz
bcm5719-llvm-d88ecb30a13abc1258408cf370156218c9f16891.zip
ARMv7k: select ABI based on v7k Arch rather than watchos OS.
Various bits we'd like to use the new ABI actually compile with "-arch armv7k -miphoneos-version-min=9.0". Not ideal, but also not ridiculous given how slices work. llvm-svn: 258976
Diffstat (limited to 'clang/lib/CodeGen/TargetInfo.cpp')
-rw-r--r--clang/lib/CodeGen/TargetInfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp
index 2e73ee162ff..d7816260118 100644
--- a/clang/lib/CodeGen/TargetInfo.cpp
+++ b/clang/lib/CodeGen/TargetInfo.cpp
@@ -4939,7 +4939,7 @@ void ARMABIInfo::computeInfo(CGFunctionInfo &FI) const {
/// Return the default calling convention that LLVM will use.
llvm::CallingConv::ID ARMABIInfo::getLLVMDefaultCC() const {
// The default calling convention that LLVM will infer.
- if (isEABIHF() || getTarget().getTriple().isWatchOS())
+ if (isEABIHF() || getTarget().getTriple().isWatchABI())
return llvm::CallingConv::ARM_AAPCS_VFP;
else if (isEABI())
return llvm::CallingConv::ARM_AAPCS;
OpenPOWER on IntegriCloud