Use NonFragileABI as name of new Next abi. More comments 
for the new meta-data.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62806 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index 9d28720..cf58f34 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -484,7 +484,7 @@
 EnableBlocks("fblocks", llvm::cl::desc("enable the 'blocks' language feature"));
 
 static llvm::cl::opt<bool>
-ObjCModernABI("fobjc-modern-abi", llvm::cl::desc("enable objective-c's modern abi"));
+ObjCNonFragileABI("fobjc-nonfragile-abi", llvm::cl::desc("enable objective-c's nonfragile abi"));
 
 
 // FIXME: This (and all GCC -f options) really come in -f... and
@@ -618,8 +618,8 @@
   else if (GNURuntime)
     Options.NeXTRuntime = 0;
 
-  if (ObjCModernABI)
-    Options.ObjCModernABI = 1;
+  if (ObjCNonFragileABI)
+    Options.ObjCNonFragileABI = 1;
 }
 
 static llvm::cl::opt<bool>