summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2013-11-12 20:50:26 +0000
committerFariborz Jahanian <fjahanian@apple.com>2013-11-12 20:50:26 +0000
commitff6c97c0d2f28f1b454c8bd1ebc6d76c94607f2d (patch)
treef46ac441ce842ff80bab0c53d50aad368f7a7cb5 /clang/lib/Driver/Tools.cpp
parentdd8757abbc4be37297a20a5c65e6dc121630e6fb (diff)
downloadbcm5719-llvm-ff6c97c0d2f28f1b454c8bd1ebc6d76c94607f2d.tar.gz
bcm5719-llvm-ff6c97c0d2f28f1b454c8bd1ebc6d76c94607f2d.zip
ObjectiveC. availability of Array/Dictionary subscripting
is further restricted in legacy runtime to deployment target of 10.7 and later. // rdar://15363492 llvm-svn: 194507
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 84f756f83e8..810e3c1ef73 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -3300,7 +3300,10 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
// When ObjectiveC legacy runtime is in effect on MacOSX,
// turn on the option to do Array/Dictionary subscripting
// by default.
- if (objcRuntime.getKind() == ObjCRuntime::FragileMacOSX &&
+ if (getToolChain().getTriple().getArch() == llvm::Triple::x86 &&
+ getToolChain().getTriple().isMacOSX() &&
+ !getToolChain().getTriple().isMacOSXVersionLT(10, 7) &&
+ objcRuntime.getKind() == ObjCRuntime::FragileMacOSX &&
objcRuntime.isNeXTFamily())
CmdArgs.push_back("-fobjc-subscripting-legacy-runtime");
OpenPOWER on IntegriCloud