diff options
| -rw-r--r-- | clang/include/clang/Basic/ObjCRuntime.h | 4 | ||||
| -rw-r--r-- | clang/test/Driver/darwin-objc-defaults.m | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/ObjCRuntime.h b/clang/include/clang/Basic/ObjCRuntime.h index f65cc9345c2..fa375f4e183 100644 --- a/clang/include/clang/Basic/ObjCRuntime.h +++ b/clang/include/clang/Basic/ObjCRuntime.h @@ -100,10 +100,10 @@ public: return false; } else if ((getKind() == MacOSX) && isNonFragile() && - (getVersion() >= VersionTuple(10, 5)) && + (getVersion() >= VersionTuple(10, 0)) && (getVersion() < VersionTuple(10, 6))) return Arch != llvm::Triple::x86_64; - // Except for deployment target of 10.5, + // Except for deployment target of 10.5 or less, // Mac runtimes use legacy dispatch everywhere now. return true; } diff --git a/clang/test/Driver/darwin-objc-defaults.m b/clang/test/Driver/darwin-objc-defaults.m index 6f5ed87d286..1b3f7a84444 100644 --- a/clang/test/Driver/darwin-objc-defaults.m +++ b/clang/test/Driver/darwin-objc-defaults.m @@ -32,9 +32,17 @@ // x86_64 // RUN: %clang -target x86_64-apple-darwin10 -S -### %s \ +// RUN: -arch x86_64 -mmacosx-version-min=10.4 2> %t +// RUN: FileCheck --check-prefix CHECK-CHECK-X86_64_OSX10_4 < %t %s + +// CHECK-CHECK-X86_64_OSX10_4: "-cc1" +// CHECK-CHECK-X86_64_OSX10_4: -fobjc-dispatch-method=non-legacy + +// RUN: %clang -target x86_64-apple-darwin10 -S -### %s \ // RUN: -arch x86_64 -mmacosx-version-min=10.5 2> %t // RUN: FileCheck --check-prefix CHECK-CHECK-X86_64_OSX10_5 < %t %s + // CHECK-CHECK-X86_64_OSX10_5: "-cc1" // CHECK-CHECK-X86_64_OSX10_5: -fobjc-runtime=macosx-10.5 // CHECK-CHECK-X86_64_OSX10_5: -fobjc-dispatch-method=non-legacy |
