aboutsummaryrefslogtreecommitdiff
path: root/lib/Basic/Targets.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2009-02-12 17:54:33 +0000
committerFariborz Jahanian <fjahanian@apple.com>2009-02-12 17:54:33 +0000
commita30b17b90033f40bb909d630466c2a04499b7bf0 (patch)
tree588904edc445a07d4f14534d88d002dca32e85c3 /lib/Basic/Targets.cpp
parent389bf46ae41241a656ed71b00ac2177d7f385651 (diff)
Make nonfragile-abi the default for darwin's 64bit
abi for objective-c programs. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64386 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Basic/Targets.cpp')
-rw-r--r--lib/Basic/Targets.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 80fbaaeb72..c72982bf22 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -149,8 +149,12 @@ static void GetDarwinLanguageOptions(LangOptions &Opts,
return;
// Blocks default to on for 10.6 (darwin10) and beyond.
- if (Maj > 9)
+ // As does nonfragile-abi for 64bit mode
+ if (Maj > 9) {
Opts.Blocks = 1;
+ if (Opts.ObjC1 && !strncmp(Triple, "x86_64", 6))
+ Opts.ObjCNonFragileABI = 1;
+ }
}