diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-09-15 16:00:51 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-09-15 16:00:51 +0000 |
| commit | 5f81d8aa26ad4de6568772c4768b272af96c18be (patch) | |
| tree | 5e8ae6ee04df0dc1ed9efe0015d8573d205c147f /lib/Driver/Tools.cpp | |
| parent | fa885c11e33ca1140e3cf376eb43cb70bbf96962 (diff) | |
Make the new -fobjc-nonfragile-abi2 the default
abi for clang's objective-c compilations.
(radar 8353555).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@113974 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Tools.cpp')
| -rw-r--r-- | lib/Driver/Tools.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 8e526e6897..ccf8041a74 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1244,20 +1244,27 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, // -fobjc-nonfragile-abi=0 is default. if (types::isObjC(InputType)) { unsigned Version = 1; - if (Args.hasArg(options::OPT_fobjc_nonfragile_abi) || - getToolChain().IsObjCNonFragileABIDefault()) + if (Args.hasArg(options::OPT_fobjc_nonfragile_abi)) Version = 2; + else if (Args.hasArg(options::OPT_fobjc_nonfragile_abi2) || + getToolChain().IsObjCNonFragileABIDefault()) + Version = 3; if (Arg *A = Args.getLastArg(options::OPT_fobjc_abi_version_EQ)) { if (llvm::StringRef(A->getValue(Args)) == "1") Version = 1; else if (llvm::StringRef(A->getValue(Args)) == "2") Version = 2; + else if (llvm::StringRef(A->getValue(Args)) == "3") + Version = 3; else D.Diag(clang::diag::err_drv_clang_unsupported) << A->getAsString(Args); } - - if (Version == 2) { - CmdArgs.push_back("-fobjc-nonfragile-abi"); + + if (Version == 2 || Version == 3) { + if (Version == 2) + CmdArgs.push_back("-fobjc-nonfragile-abi"); + else + CmdArgs.push_back("-fobjc-nonfragile-abi2"); // -fobjc-dispatch-method is only relevant with the nonfragile-abi, and // legacy is the default. @@ -1270,11 +1277,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-fobjc-dispatch-method=non-legacy"); } } - - // FIXME: -fobjc-nonfragile-abi2 is a transient option meant to expose - // features in testing. It will eventually be removed. - if (Args.hasArg(options::OPT_fobjc_nonfragile_abi2)) - CmdArgs.push_back("-fobjc-nonfragile-abi2"); } if (!Args.hasFlag(options::OPT_fassume_sane_operator_new, |