maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

ARMv7k: simplify logic for deciding sjlj-exceptions. 

Slight change of behaviour in the odd armv7+watchos case, which should match
the other runtime components.

llvm-svn: 258994
This commit is contained in:
Tim Northover 2016-01-27 22:14:02 +00:00
parent e257f0f671
commit 4c9ac7d7df
2 changed files with 4 additions and 2 deletions
clang
lib/Driver
ToolChains.cpp
test/Driver
arch-armv7k.c

3
clang/lib/Driver/ToolChains.cpp
View File

@ -1076,8 +1076,7 @@ bool Darwin::UseSjLjExceptions(const ArgList &Args) const {
// Only watchOS uses the new DWARF/Compact unwinding method. // Only watchOS uses the new DWARF/Compact unwinding method.
llvm::Triple Triple(ComputeLLVMTriple(Args)); llvm::Triple Triple(ComputeLLVMTriple(Args));
return !(Triple.getArchName() == "armv7k" || return !Triple.isWatchABI();
Triple.getArchName() == "thumbv7k") && !isTargetWatchOS();
} }
bool MachO::isPICDefault() const { return true; } bool MachO::isPICDefault() const { return true; }

3
clang/test/Driver/arch-armv7k.c
View File

@ -9,3 +9,6 @@
// match. // match.
// RUN: %clang -target x86_64-apple-macosx10.9 -arch armv7k -miphoneos-version-min=9.0 -c %s -### 2>&1 | FileCheck %s // RUN: %clang -target x86_64-apple-macosx10.9 -arch armv7k -miphoneos-version-min=9.0 -c %s -### 2>&1 | FileCheck %s
// RUN: %clang -target x86_64-apple-macosx10.9 -arch armv7 -mwatchos-version-min=9.0 -c %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SJLJ
// CHECK-SJLJ: "-fsjlj-exceptions"