From 69da841e85785ea625467e23804f6a9dd376528b Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Wed, 22 Jan 2014 00:43:54 +0000 Subject: [PATCH] ObjectiveC driver. change to reinstate -fno-objc-legacy-dispatch behavior when the deployment target is 10.5. // rdar://15852259 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@199780 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Basic/ObjCRuntime.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/include/clang/Basic/ObjCRuntime.h b/include/clang/Basic/ObjCRuntime.h index 37c9ec2bf6..f65cc9345c 100644 --- a/include/clang/Basic/ObjCRuntime.h +++ b/include/clang/Basic/ObjCRuntime.h @@ -99,14 +99,10 @@ public: Arch == llvm::Triple::x86_64) return false; } - else if (isNeXTFamily() && getVersion().getMajor() == 10) { - unsigned minor = 0; - if (getVersion().getMinor().hasValue()) - minor = getVersion().getMinor().getValue(); - if (minor == 5 && - (Arch == llvm::Triple::x86 || Arch == llvm::Triple::x86_64)) - return false; - } + else if ((getKind() == MacOSX) && isNonFragile() && + (getVersion() >= VersionTuple(10, 5)) && + (getVersion() < VersionTuple(10, 6))) + return Arch != llvm::Triple::x86_64; // Except for deployment target of 10.5, // Mac runtimes use legacy dispatch everywhere now. return true; -- 2.40.0