diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-01-04 20:05:20 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-01-04 20:05:20 +0000 |
| commit | 3aa19e9a706b9725720bffe393dc7bce5b432abf (patch) | |
| tree | c3a6dec33e0a774e7424f339c135df584150745a /clang/lib/Frontend/CompilerInvocation.cpp | |
| parent | 36fd9f96cffba43c75cfd482c1491ef9ad5e89dc (diff) | |
| download | bcm5719-llvm-3aa19e9a706b9725720bffe393dc7bce5b432abf.tar.gz bcm5719-llvm-3aa19e9a706b9725720bffe393dc7bce5b432abf.zip | |
Fold -fobjc-nonfragile-abi2 into -fobjc-nonfragile-abi.
// rdar://8818375
llvm-svn: 122831
Diffstat (limited to 'clang/lib/Frontend/CompilerInvocation.cpp')
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 29aac8a9daa..48121a1770e 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/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); |
