diff options
| author | Tim Northover <tnorthover@apple.com> | 2016-01-27 19:32:29 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2016-01-27 19:32:29 +0000 |
| commit | 042a6c1fe19caf48af7e287dc8f6fd5fec158093 (patch) | |
| tree | fff3e2194f08029330b382bb3992f90a9df74d07 /llvm/lib/MC/MCObjectFileInfo.cpp | |
| parent | 391be792f296db7b99b4e92b5ae43710dfa7454d (diff) | |
| download | bcm5719-llvm-042a6c1fe19caf48af7e287dc8f6fd5fec158093.tar.gz bcm5719-llvm-042a6c1fe19caf48af7e287dc8f6fd5fec158093.zip | |
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
Diffstat (limited to 'llvm/lib/MC/MCObjectFileInfo.cpp')
| -rw-r--r-- | llvm/lib/MC/MCObjectFileInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/MC/MCObjectFileInfo.cpp b/llvm/lib/MC/MCObjectFileInfo.cpp index f86f7e40acb..0c86fa81c1b 100644 --- a/llvm/lib/MC/MCObjectFileInfo.cpp +++ b/llvm/lib/MC/MCObjectFileInfo.cpp @@ -30,7 +30,7 @@ static bool useCompactUnwind(const Triple &T) { 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 @@ void MCObjectFileInfo::initMachOMCObjectFileInfo(Triple T) { 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 |
