diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2013-12-05 19:38:42 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2013-12-05 19:38:42 +0000 |
| commit | 83e723a9c9fe5dbcb3ae0ec37bcef11d8924c0be (patch) | |
| tree | 15eec93821e363b3a124f03f029b9ad36d56313a | |
| parent | c44a3ff63845cf73bdf0b559a8ddb06ff5f6c710 (diff) | |
| download | bcm5719-llvm-83e723a9c9fe5dbcb3ae0ec37bcef11d8924c0be.tar.gz bcm5719-llvm-83e723a9c9fe5dbcb3ae0ec37bcef11d8924c0be.zip | |
Fix assertion failure left over from changes to move away from "darwin" triples.
I happened to notice this while trying to write a test for an iOS simulator
target. I suspect we just missed this when we added separate "macosx" and "ios"
triples instead of the generic "darwin" OS.
llvm-svn: 196527
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/darwin-objc-options.m | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index ae19be76082..6e33e8f923a 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -1594,7 +1594,7 @@ shouldUseExceptionTablesForObjCExceptions(const ObjCRuntime &runtime, if (runtime.isNonFragile()) return true; - if (!Triple.isOSDarwin()) + if (!Triple.isMacOSX()) return false; return (!Triple.isMacOSXVersionLT(10,5) && diff --git a/clang/test/Driver/darwin-objc-options.m b/clang/test/Driver/darwin-objc-options.m index a90a12d733d..3e21fb38c0a 100644 --- a/clang/test/Driver/darwin-objc-options.m +++ b/clang/test/Driver/darwin-objc-options.m @@ -30,3 +30,6 @@ // CHECK-CHECK-I386_IOS: -fexceptions // CHECK-CHECK-I386_IOS-NOT: -fobjc-dispatch-method // CHECK-CHECK-I386_IOS: darwin-objc-options + +// Don't crash with an unexpected target triple. +// RUN: %clang -target i386-apple-ios7 -S -### %s |
