diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Driver/Tools.cpp | 5 | ||||
| -rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 7 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index cee00edd2d..9d9179b621 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1468,10 +1468,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, } if (Version == 2 || Version == 3) { - if (Version == 2) - CmdArgs.push_back("-fobjc-nonfragile-abi"); - else - CmdArgs.push_back("-fobjc-nonfragile-abi2"); + CmdArgs.push_back("-fobjc-nonfragile-abi"); // -fobjc-dispatch-method is only relevant with the nonfragile-abi, and // legacy is the default. diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 29aac8a9da..48121a1770 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -549,7 +549,7 @@ static void LangOptsToArgs(const LangOptions &Opts, if (Opts.ObjCNonFragileABI) Res.push_back("-fobjc-nonfragile-abi"); if (Opts.ObjCNonFragileABI2) - Res.push_back("-fobjc-nonfragile-abi2"); + Res.push_back("-fobjc-nonfragile-abi"); if (Opts.ObjCDefaultSynthProperties) Res.push_back("-fobjc-default-synthesize-properties"); // NoInline is implicit. @@ -1423,9 +1423,8 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, Opts.ObjCConstantStringClass = Args.getLastArgValue(OPT_fconstant_string_class); Opts.ObjCNonFragileABI = Args.hasArg(OPT_fobjc_nonfragile_abi); - Opts.ObjCNonFragileABI2 = Args.hasArg(OPT_fobjc_nonfragile_abi2); - if (Opts.ObjCNonFragileABI2) - Opts.ObjCNonFragileABI = true; + if (Opts.ObjCNonFragileABI) + Opts.ObjCNonFragileABI2 = true; Opts.ObjCDefaultSynthProperties = Args.hasArg(OPT_fobjc_default_synthesize_properties); Opts.CatchUndefined = Args.hasArg(OPT_fcatch_undefined_behavior); |