Make -fobjc-nonfragile-abi the -cc1 default, since it's the

increasingly prevailing case to the point that new features
like ARC don't even support the fragile ABI anymore.

This required a little bit of reshuffling with exceptions
because a check was assuming that ObjCNonFragileABI was
only being set in ObjC mode, and that's actually a bit
obnoxious to do.

Most, though, it involved a perl script to translate a ton
of test cases.

Mostly no functionality change for driver users, although
there are corner cases with disabling language-specific
exceptions that we should handle more correctly now.

llvm-svn: 140957

1 files changed, 3 insertions, 3 deletions

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 936dee16c94..e193c0f505a 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1965,9 +1965,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
     }
   }
 
-  if (objcABIVersion == 2 || objcABIVersion == 3) {
-    CmdArgs.push_back("-fobjc-nonfragile-abi");
-
+  if (objcABIVersion == 1) {
+    CmdArgs.push_back("-fobjc-fragile-abi");
+  } else {
     // -fobjc-dispatch-method is only relevant with the nonfragile-abi, and
     // legacy is the default.
     if (!Args.hasFlag(options::OPT_fobjc_legacy_dispatch,