commit 042a6c1fe19caf48af7e287dc8f6fd5fec158093
author Tim Northover <tnorthover@apple.com> Wed Jan 27 19:32:29 2016 +0000
committer Tim Northover <tnorthover@apple.com> Wed Jan 27 19:32:29 2016 +0000
tree fff3e2194f08029330b382bb3992f90a9df74d07
parent 391be792f296db7b99b4e92b5ae43710dfa7454d

ARMv7k: base ABI decision on v7k Arch rather than watchos OS.

Various bits we want 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: 258975

llvm/lib/MC/MCObjectFileInfo.cpp

diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp
index f86f7e4..0c86fa8 100644
--- a/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -30,7 +30,7 @@
     return true;
 
   // armv7k always has it.
-  if (T.isWatchOS())
+  if (T.isWatchABI())
     return true;
 
   // Use it on newer version of OS X.
@@ -58,7 +58,7 @@
   if (T.isOSDarwin() && T.getArch() == Triple::aarch64)
     SupportsCompactUnwindWithoutEHFrame = true;
 
-  if (T.isWatchOS())
+  if (T.isWatchABI())
     OmitDwarfIfHaveCompactUnwind = true;
 
   PersonalityEncoding = dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel