Move -fnext-runtime defaulting to driver (and change clang-cc default to

-fnext-runtime), instead of using getDefaultLangOptions.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@89058 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h
index a0720a73ec1dfbfa0d53ae5d9df8debd49d38b3a..7fd57c0499a2aa4b59a9044f1ddea3b63b033907 100644 (file)
--- a/include/clang/Basic/LangOptions.h
+++ b/include/clang/Basic/LangOptions.h
@@ -126,7 +126,8 @@ public:
     ObjCConstantStringClass = 0;
     C99 = Microsoft = CPlusPlus = CPlusPlus0x = 0;
     CXXOperatorNames = PascalStrings = WritableStrings = 0;
-    Exceptions = NeXTRuntime = Freestanding = NoBuiltin = 0;
+    Exceptions = Freestanding = NoBuiltin = 0;
+    NeXTRuntime = 1;
     Rtti = 1;
     LaxVectorConversions = 1;
     HeinousExtensions = 0;

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 6c58d0dcb2d68ff71666797181c42b8a535e8b32..3a4d115db20237cef95520dd5db9f3130a38836b 100644 (file)
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -158,8 +158,6 @@ static void getDarwinIPhoneOSDefines(std::vector<char> &Defs,
 /// GetDarwinLanguageOptions - Set the default language options for darwin.
 static void GetDarwinLanguageOptions(LangOptions &Opts,
                                      const llvm::Triple &Triple) {
-  Opts.NeXTRuntime = true;
-
   unsigned MajorVersion = Triple.getDarwinMajorNumber();
 
   // Blocks and stack protectors default to on for 10.6 (darwin10) and beyond.

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 1eec2f288e6c9bb3450280dcc364e7dc9cbb3289..bc6ad1413a6f93b6e2a30a05ff0341178b632962 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -887,9 +887,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls);
   Args.AddLastArg(CmdArgs, options::OPT_ffreestanding);
   Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions);
-  Args.AddLastArg(CmdArgs, options::OPT_fgnu_runtime);
   Args.AddLastArg(CmdArgs, options::OPT_flax_vector_conversions);
-  Args.AddLastArg(CmdArgs, options::OPT_fnext_runtime);
   Args.AddLastArg(CmdArgs, options::OPT_fno_caret_diagnostics);
   Args.AddLastArg(CmdArgs, options::OPT_fno_show_column);
   Args.AddLastArg(CmdArgs, options::OPT_fobjc_gc_only);
@@ -955,6 +953,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
                    getToolChain().getTriple().getOS() == llvm::Triple::Win32))
     CmdArgs.push_back("-fms-extensions");
 
+  // -fnext-runtime is default.
+  if (!Args.hasFlag(options::OPT_fnext_runtime,
+                    options::OPT_fgnu_runtime,
+                    getToolChain().getTriple().getOS() == llvm::Triple::Darwin))
+    CmdArgs.push_back("-fgnu-runtime");
+
   // -fshort-wchar default varies depending on platform; only
   // pass if specified.
   if (Arg *A = Args.getLastArg(options::OPT_fshort_wchar)) {

diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index c8e52fe7cb6cca2d08327b2a52f3c53b154e65bd..3537bc58dabd81102132532adac668300409d0d6 100644 (file)
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -396,7 +396,8 @@ static void LangOptsToArgs(const LangOptions &Opts,
   Res.push_back(Opts.Exceptions ? "1" : "0");
   Res.push_back("-frtti");
   Res.push_back(Opts.Rtti ? "1" : "0");
-  Res.push_back(Opts.NeXTRuntime ? "-fnext-runtime" : "-fgnu-runtime");
+  if (!Opts.NeXTRuntime)
+    Res.push_back("-fgnu-runtime");
   if (Opts.Freestanding)
     Res.push_back("-ffreestanding");
   if (Opts.NoBuiltin)

diff --git a/test/CodeGenObjC/bitfield-1.m b/test/CodeGenObjC/bitfield-1.m
index 8ccbf4e8dde8437cc78d90c51e9566879070fe76..3f605ebc4e24d4bf0f9711c115ab608adabdc76a 100644 (file)
--- a/test/CodeGenObjC/bitfield-1.m
+++ b/test/CodeGenObjC/bitfield-1.m
@@ -1,5 +1,5 @@
-// RUN: clang-cc -triple x86_64-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
-// RUN: clang-cc -triple i386-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-apple-darwin9 -emit-llvm -o %t %s
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s
 // RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s
 
 @interface Object

diff --git a/test/CodeGenObjC/bitfield-ivar-metadata.m b/test/CodeGenObjC/bitfield-ivar-metadata.m
index 542a2424caa1b4a3569f87bb55b3e5bd09ac502d..f720bcc5b5b630484d79707afb2c254d4a20dd0f 100644 (file)
--- a/test/CodeGenObjC/bitfield-ivar-metadata.m
+++ b/test/CodeGenObjC/bitfield-ivar-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface INTF
 {

diff --git a/test/CodeGenObjC/category-super-class-meth.m b/test/CodeGenObjC/category-super-class-meth.m
index 95d8b3103c9fe53962fb9c5a11cb9a0279398621..ce27e87bbf501991d15b2904ba8947e5a912630f 100644 (file)
--- a/test/CodeGenObjC/category-super-class-meth.m
+++ b/test/CodeGenObjC/category-super-class-meth.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface BASE
 + (int) BaseMeth;

diff --git a/test/CodeGenObjC/class-getter-dotsyntax.m b/test/CodeGenObjC/class-getter-dotsyntax.m
index 3c82f78d08b5f1ac5e7b89da62953bd3e1cd0d69..1e1a7596795efc8a698527b55d194a68b21d8a8b 100644 (file)
--- a/test/CodeGenObjC/class-getter-dotsyntax.m
+++ b/test/CodeGenObjC/class-getter-dotsyntax.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface Test { }
 + (Test *)crash;

diff --git a/test/CodeGenObjC/constant-strings.m b/test/CodeGenObjC/constant-strings.m
index 84786c0cdc99fa1660abbe09ac89890ea9c1201a..8482376ff91335e5299da36204d915ba43542de2 100644 (file)
--- a/test/CodeGenObjC/constant-strings.m
+++ b/test/CodeGenObjC/constant-strings.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 // RUN: clang-cc -fgnu-runtime -emit-llvm -o %t %s && grep NXConstantString %t | count 1
 // RUN: clang-cc -fgnu-runtime -fconstant-string-class=NSConstantString -emit-llvm -o %t %s && grep NSConstantString %t | count 1
 

diff --git a/test/CodeGenObjC/continuation-class.m b/test/CodeGenObjC/continuation-class.m
index 925f3cd0c50d9c5668f686aeb0dc757eaf448a2f..305d6c7ab39a4490eded73fa7990a8a62983c888 100644 (file)
--- a/test/CodeGenObjC/continuation-class.m
+++ b/test/CodeGenObjC/continuation-class.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 @interface Object
 - (id)new;

diff --git a/test/CodeGenObjC/dot-syntax-1.m b/test/CodeGenObjC/dot-syntax-1.m
index 6c4dcbbef0dc1ab5247c32af6f808f239c4dc040..491ea0a5a6388589b5a67357be3d9869936d0129 100644 (file)
--- a/test/CodeGenObjC/dot-syntax-1.m
+++ b/test/CodeGenObjC/dot-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 #include <stdio.h>
 

diff --git a/test/CodeGenObjC/dot-syntax.m b/test/CodeGenObjC/dot-syntax.m
index 68c8ad0b75804cfc0aec2f6d5340977b6df5bd28..bd61a6aaf9576a02cdc7eabeb7c757c2074dab63 100644 (file)
--- a/test/CodeGenObjC/dot-syntax.m
+++ b/test/CodeGenObjC/dot-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 #include <stdio.h>
 

diff --git a/test/CodeGenObjC/encode-test-1.m b/test/CodeGenObjC/encode-test-1.m
index 93384558591de8722076cddbe93e837974ed972a..8e6fd861f9ccfddd74354a40d8a850f1d41eb4d5 100644 (file)
--- a/test/CodeGenObjC/encode-test-1.m
+++ b/test/CodeGenObjC/encode-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep -e "{Base=b2b3b4b5}" %t | count 1
 // RUN: grep -e "{Derived=b2b3b4b5b5b4b3}" %t | count 1
 

diff --git a/test/CodeGenObjC/encode-test-2.m b/test/CodeGenObjC/encode-test-2.m
index 9e3291c660ff7e60b214ef5c869c2f2c83fb44ac..b53ea6677ebd77f33767a877395b959794069df0 100644 (file)
--- a/test/CodeGenObjC/encode-test-2.m
+++ b/test/CodeGenObjC/encode-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep -e "@\\\22<X>\\\22" %t
 // RUN: grep -e "@\\\22<X><Y>\\\22" %t
 // RUN: grep -e "@\\\22<X><Y><Z>\\\22" %t

diff --git a/test/CodeGenObjC/encode-test-3.m b/test/CodeGenObjC/encode-test-3.m
index 78540d10976bc4162933f9dd39e6a239acb1c3c6..79a024fe1f7b9b85fee55959623b5481b3a67833 100644 (file)
--- a/test/CodeGenObjC/encode-test-3.m
+++ b/test/CodeGenObjC/encode-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep -e "\^i" %t | count 1
 // RUN: grep -e "\[0i\]" %t | count 1
 

diff --git a/test/CodeGenObjC/encode-test-5.m b/test/CodeGenObjC/encode-test-5.m
index ca94ad061863226c6eb8a1c038421697f7952e5f..d5ec9b3909c747aa7b8ffef0958ae9bbcc78afeb 100644 (file)
--- a/test/CodeGenObjC/encode-test-5.m
+++ b/test/CodeGenObjC/encode-test-5.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=x86_64-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=x86_64-apple-darwin9 -emit-llvm -o %t %s
 
 // RUN: grep ji.00 %t | count 1
 char *a = @encode(_Complex int);

diff --git a/test/CodeGenObjC/encode-test.m b/test/CodeGenObjC/encode-test.m
index dd658c6fc2d6d5dc0a767041453c8293e5ed3066..6665cb9d584bcd3600b0cd56e051409c9fa21a2f 100644 (file)
--- a/test/CodeGenObjC/encode-test.m
+++ b/test/CodeGenObjC/encode-test.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep -e "\^{Innermost=CC}" %t | count 1
 // RUN: grep -e "{Derived=#ib32b8b3b8sb16b8b8b2b8ccb6}" %t | count 1
 // RUN: grep -e "{B1=#@c}" %t | count 1

diff --git a/test/CodeGenObjC/hidden.m b/test/CodeGenObjC/hidden.m
index 6b86ca0581cc753284436d8279fb88e69f1a5009..fd87d992aaf422f88b43e525c37cdd8b02c60197 100644 (file)
--- a/test/CodeGenObjC/hidden.m
+++ b/test/CodeGenObjC/hidden.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 __attribute__((visibility("hidden")))
 @interface Hidden

diff --git a/test/CodeGenObjC/link-errors.m b/test/CodeGenObjC/link-errors.m
index be8df8e6dc681ae81fbefe0e399f2a1e77e5ddc8..4944f1b0782a05a9d935d59e55e2d9a204099ca2 100644 (file)
--- a/test/CodeGenObjC/link-errors.m
+++ b/test/CodeGenObjC/link-errors.m
@@ -1,8 +1,8 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep '.lazy_reference .objc_class_name_A' %t | count 1
 // RUN: grep '.lazy_reference .objc_class_name_Unknown' %t | count 1
 // RUN: grep '.lazy_reference .objc_class_name_Protocol' %t | count 1
-// RUN: clang-cc -triple i386-apple-darwin9 -DWITH_IMPL -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple i386-apple-darwin9 -DWITH_IMPL -emit-llvm -o %t %s
 // RUN: grep '.lazy_reference .objc_class_name_Root' %t | count 1
 
 @interface Root

diff --git a/test/CodeGenObjC/message-arrays.m b/test/CodeGenObjC/message-arrays.m
index c618672feab2e88f290ec78b34c05c8c717492e9..1ae6bf648c8a808149e223809a3e260a900d305a 100644 (file)
--- a/test/CodeGenObjC/message-arrays.m
+++ b/test/CodeGenObjC/message-arrays.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 void f0(id a) {
   // This should have an implicit cast

diff --git a/test/CodeGenObjC/messages-2.m b/test/CodeGenObjC/messages-2.m
index ca0eb94933870e7bc161cbeb929915012dab8dc2..02dbd01df8f1d30d3528a185a3a3bee70cb06eae 100644 (file)
--- a/test/CodeGenObjC/messages-2.m
+++ b/test/CodeGenObjC/messages-2.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 #include <stdio.h>
 

diff --git a/test/CodeGenObjC/messages.m b/test/CodeGenObjC/messages.m
index c987bbb44c0cd67ff7295abd86311cec0bf888ec..ea8809ffcd18695653efa1353c01862b2f276ab9 100644 (file)
--- a/test/CodeGenObjC/messages.m
+++ b/test/CodeGenObjC/messages.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 // RUN: grep "objc_msgSend" %t | count 6
 // RUN: clang-cc -fgnu-runtime --emit-llvm -o %t %s
 // RUN: grep "objc_msg_lookup" %t | count 6

diff --git a/test/CodeGenObjC/newproperty-nested-synthesis-1.m b/test/CodeGenObjC/newproperty-nested-synthesis-1.m
index 5196b8244dbba673e21e2dc16d28f2c9908abfbf..4d9319839d0b8e04db12a0e0247bbf255d95dc22 100644 (file)
--- a/test/CodeGenObjC/newproperty-nested-synthesis-1.m
+++ b/test/CodeGenObjC/newproperty-nested-synthesis-1.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 @interface Object
 - (id) new;

diff --git a/test/CodeGenObjC/objc-gc-aggr-assign.m b/test/CodeGenObjC/objc-gc-aggr-assign.m
index d5e4caa9fb4b0cd045d7043d184c3985d35a7d6f..1646cde892029c23a2df9a395d98f60195e7ccdc 100644 (file)
--- a/test/CodeGenObjC/objc-gc-aggr-assign.m
+++ b/test/CodeGenObjC/objc-gc-aggr-assign.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -fobjc-gc -emit-llvm -o %t %s
 // RUN: grep objc_memmove_collectable %t | grep call | count 3
 
 static int count;

diff --git a/test/CodeGenObjC/objc2-assign-global.m b/test/CodeGenObjC/objc2-assign-global.m
index 102e7bbdc2221c414d7eb05437c665946f7de91d..6b34796983ffea6b9b75d650527dcac1ffefdb8c 100644 (file)
--- a/test/CodeGenObjC/objc2-assign-global.m
+++ b/test/CodeGenObjC/objc2-assign-global.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s
 // RUN: grep -F '@objc_assign_global' %t  | count 26
 
 @class NSObject;

diff --git a/test/CodeGenObjC/objc2-new-gc-api-strongcast.m b/test/CodeGenObjC/objc2-new-gc-api-strongcast.m
index 2606737fc6ecdedd7d7cce6012ce2b935267ac85..b6a0c03ac35ba4e70306ead4e4522478afd4a044 100644 (file)
--- a/test/CodeGenObjC/objc2-new-gc-api-strongcast.m
+++ b/test/CodeGenObjC/objc2-new-gc-api-strongcast.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fblocks -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fblocks -fobjc-gc -emit-llvm -o %t %s
 // RUN: grep -F '@objc_assign_strongCast' %t  | count 4
 
 @interface DSATextSearch @end

diff --git a/test/CodeGenObjC/objc2-property-encode.m b/test/CodeGenObjC/objc2-property-encode.m
index 0015585b95e1a7d673c9d3434fcee53d50f8afd6..f1c1024cece5e6a5592da0ff16ad25d7bde6133c 100644 (file)
--- a/test/CodeGenObjC/objc2-property-encode.m
+++ b/test/CodeGenObjC/objc2-property-encode.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep -e "T@\\\\22NSString\\\\22" %t
 @interface NSString @end
 

diff --git a/test/CodeGenObjC/objc2-protocol-enc.m b/test/CodeGenObjC/objc2-protocol-enc.m
index 59a774b25df139690b77caf93698ad8cc84ccaa6..2174792bd920fd9b2a0a9c136c56accd4afa18ee 100644 (file)
--- a/test/CodeGenObjC/objc2-protocol-enc.m
+++ b/test/CodeGenObjC/objc2-protocol-enc.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -triple=i686-apple-darwin9 -emit-llvm -o %t %s
 // RUN: grep -e "T@\\\22<X>\\\22" %t
 // RUN: grep -e "T@\\\22<X><Y>\\\22" %t
 // RUN: grep -e "T@\\\22<X><Y><Z>\\\22" %t

diff --git a/test/CodeGenObjC/objc2-strong-cast.m b/test/CodeGenObjC/objc2-strong-cast.m
index d0fcb6ced928be28c01b6bcfa6b4a5924de1e091..73fe16af4f73f2816e3f25f19cb3280b33245f92 100644 (file)
--- a/test/CodeGenObjC/objc2-strong-cast.m
+++ b/test/CodeGenObjC/objc2-strong-cast.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -fobjc-gc -emit-llvm -o %t %s
 
 @interface I {
   __attribute__((objc_gc(strong))) signed long *_documentIDs;

diff --git a/test/CodeGenObjC/objc2-weak-compare.m b/test/CodeGenObjC/objc2-weak-compare.m
index be769899a17d5edb8e2076d8f22823b399a049c9..82cc558b567b19cb36c43878ab18feb5885d40f1 100644 (file)
--- a/test/CodeGenObjC/objc2-weak-compare.m
+++ b/test/CodeGenObjC/objc2-weak-compare.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fobjc-gc -emit-llvm -o %t %s
 
 @interface PBXTarget 
 {

diff --git a/test/CodeGenObjC/objc2-write-barrier-2.m b/test/CodeGenObjC/objc2-write-barrier-2.m
index e8a227b7f835abb1543c981782a13913ac097196..cdb135f0150c4f31f60596644c29c1cf1d22e679 100644 (file)
--- a/test/CodeGenObjC/objc2-write-barrier-2.m
+++ b/test/CodeGenObjC/objc2-write-barrier-2.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s
 // RUN: grep -F '@objc_assign_global' %t  | count 7
 // RUN: grep -F '@objc_assign_ivar' %t  | count 5
 // RUN: grep -F '@objc_assign_strongCast' %t  | count 8

diff --git a/test/CodeGenObjC/objc2-write-barrier.m b/test/CodeGenObjC/objc2-write-barrier.m
index 9a5416d8466f81ac103e0d830725e42c8b0803aa..bff6d8fdd012f1516aa25070ce8facf9b399de06 100644 (file)
--- a/test/CodeGenObjC/objc2-write-barrier.m
+++ b/test/CodeGenObjC/objc2-write-barrier.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple x86_64-apple-darwin10 -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-apple-darwin10 -fobjc-gc -emit-llvm -o %t %s
 // RUN: grep -F '@objc_assign_global' %t  | count 21
 // RUN: grep -F '@objc_assign_ivar' %t  | count 11
 

diff --git a/test/CodeGenObjC/object-incr-decr-1.m b/test/CodeGenObjC/object-incr-decr-1.m
index 53311f7aa18c399bea5b3311527e9563dda30c03..25b9698860232c369befa7c5822c661b84b84309 100644 (file)
--- a/test/CodeGenObjC/object-incr-decr-1.m
+++ b/test/CodeGenObjC/object-incr-decr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -triple i386-apple-darwin9 -fnext-runtime -emit-llvm %s -o %t
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm %s -o %t
 
 @interface Foo 
 {

diff --git a/test/CodeGenObjC/property-aggr-type.m b/test/CodeGenObjC/property-aggr-type.m
index 0cb7a5e2f40a9ec579f32c5a20b501426884a81d..e2890b6ee80e7a0e231d583d7da56dacdf638b8a 100644 (file)
--- a/test/CodeGenObjC/property-aggr-type.m
+++ b/test/CodeGenObjC/property-aggr-type.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface Object
 - (id) new;

diff --git a/test/CodeGenObjC/property-agrr-getter.m b/test/CodeGenObjC/property-agrr-getter.m
index 46205796936f853e1dcb41ba00fea6d5b260e247..e25429ed75259efb43e7585a83adf48e83d78149 100644 (file)
--- a/test/CodeGenObjC/property-agrr-getter.m
+++ b/test/CodeGenObjC/property-agrr-getter.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 typedef struct {
   unsigned f0;

diff --git a/test/CodeGenObjC/property-getter-dot-syntax.m b/test/CodeGenObjC/property-getter-dot-syntax.m
index d98e9bab6da9d61dd8e154aeb6ce7c2a3be5335c..c1cc5e994774f7e18c0321185ea85b157287fd71 100644 (file)
--- a/test/CodeGenObjC/property-getter-dot-syntax.m
+++ b/test/CodeGenObjC/property-getter-dot-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 @protocol NSObject
 - (void *)description;

diff --git a/test/CodeGenObjC/property-incr-decr-1.m b/test/CodeGenObjC/property-incr-decr-1.m
index 772e872a214f5f89a6791f72343bfd7014f82a21..eb227dde19d59442200be843bb97fa714e68ccb7 100644 (file)
--- a/test/CodeGenObjC/property-incr-decr-1.m
+++ b/test/CodeGenObjC/property-incr-decr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface Object
 - (id) new;

diff --git a/test/CodeGenObjC/property.m b/test/CodeGenObjC/property.m
index 264adf1106e2abe28b94300a602a044bc1afa2da..8ac44f1c794f92a7efcee479f634ee90f91c17d9 100644 (file)
--- a/test/CodeGenObjC/property.m
+++ b/test/CodeGenObjC/property.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
 
 #include <stdio.h>
 

diff --git a/test/CodeGenObjC/protocols.m b/test/CodeGenObjC/protocols.m
index 4cfb83bf00e0c80c6ceadefb011d1cba392836f8..c510685e521deafd6d0b02bd541da894ffe64e33 100644 (file)
--- a/test/CodeGenObjC/protocols.m
+++ b/test/CodeGenObjC/protocols.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
 
 void p(const char*, ...);
 

diff --git a/test/CodeGenObjC/runtime-fns.m b/test/CodeGenObjC/runtime-fns.m
index 9b4075a3b496086105f578a68856b39d6d09aaaf..3c6894dddd1772446f88680518513a47cc485d25 100644 (file)
--- a/test/CodeGenObjC/runtime-fns.m
+++ b/test/CodeGenObjC/runtime-fns.m
@@ -1,6 +1,6 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 // RUN: grep -e "^de.*objc_msgSend[0-9]*(" %t | count 1
-// RUN: clang-cc -DWITHDEF -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -DWITHDEF -emit-llvm -o %t %s
 // RUN: grep -e "^de.*objc_msgSend[0-9]*(" %t | count 1
 
 id objc_msgSend(int x);

diff --git a/test/CodeGenObjC/super-classmethod-category.m b/test/CodeGenObjC/super-classmethod-category.m
index 27cdbf6aed41885a3ad39937734a237fe8ef183d..033bc972a348aced1461d1979c8efcd4b0e442a9 100644 (file)
--- a/test/CodeGenObjC/super-classmethod-category.m
+++ b/test/CodeGenObjC/super-classmethod-category.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 
 @interface SUPER
 + (void)Meth;

diff --git a/test/CodeGenObjC/unname-bf-metadata.m b/test/CodeGenObjC/unname-bf-metadata.m
index a7636e4ebc8b658c37d7f58a39db46d323ce377a..605d09b03322cf58d517de5210f60a6f03f10d5f 100644 (file)
--- a/test/CodeGenObjC/unname-bf-metadata.m
+++ b/test/CodeGenObjC/unname-bf-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
 // Test that meta-data for ivar lists with unnamed bitfield are generated.
 //
 @interface Foo {

diff --git a/test/CodeGenObjC/variadic-sends.m b/test/CodeGenObjC/variadic-sends.m
index c4952767fb2bffcb6610ddc73f5bc88406382009..e2d13e3ae41defe59fed96b589f542e46999e18d 100644 (file)
--- a/test/CodeGenObjC/variadic-sends.m
+++ b/test/CodeGenObjC/variadic-sends.m
@@ -1,5 +1,5 @@
-// RUN: clang-cc -triple i386-unknown-unknown -fnext-runtime -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-X86-32 %s
-// RUN: clang-cc -triple x86_64-unknown-unknown -fnext-runtime -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-X86-64 %s
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-X86-32 %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o - %s | FileCheck -check-prefix=CHECK-X86-64 %s
 
 @interface A
 -(void) im0;

diff --git a/test/Coverage/codegen-next.m b/test/Coverage/codegen-next.m
index 5486b0dfb83d5b5a0fbf707dc42e2d059e54a5a8..f211a5914e55a8e426a68c64a57525dc9824d0b4 100644 (file)
--- a/test/Coverage/codegen-next.m
+++ b/test/Coverage/codegen-next.m
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
-// RUN: clang-cc -g -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
+// RUN: clang-cc -g -emit-llvm -o %t %s
 
 #include "objc-language-features.inc"

diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index 6ba64e4896408fc0236a4f123d5d8055fcf7bd70..2926900e78c54a3bf451f2958bcab405d0a31e37 100644 (file)
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -83,19 +83,15 @@
 // RUN: clang-cc -x=objective-c -E -dM < /dev/null | FileCheck -check-prefix OBJC %s
 //
 // OBJC:#define OBJC_NEW_PROPERTIES 1
+// OBJC:#define __NEXT_RUNTIME__ 1
 // OBJC:#define __OBJC__ 1
 //
-// 
+//
 // RUN: clang-cc -x=objective-c -fobjc-gc -E -dM < /dev/null | FileCheck -check-prefix OBJCGC %s
 //
 // OBJCGC:#define __OBJC_GC__ 1
 //
 // 
-// RUN: clang-cc -x=objective-c -fnext-runtime -E -dM < /dev/null | FileCheck -check-prefix NEXTRT %s
-//
-// NEXTRT:#define __NEXT_RUNTIME__ 1
-//
-// 
 // RUN: clang-cc -x=objective-c -fobjc-nonfragile-abi -E -dM < /dev/null | FileCheck -check-prefix NONFRAGILE %s
 //
 // NONFRAGILE:#define OBJC_ZEROCOST_EXCEPTIONS 1

diff --git a/tools/clang-cc/Options.cpp b/tools/clang-cc/Options.cpp
index 2dc521986f81b715f9700733758775f99392593b..9c4216749ecca3b858d3999e5e1cad34fb49f3ae 100644 (file)
--- a/tools/clang-cc/Options.cpp
+++ b/tools/clang-cc/Options.cpp
@@ -540,11 +540,6 @@ static llvm::cl::opt<bool>
 MathErrno("fmath-errno", llvm::cl::init(true),
           llvm::cl::desc("Require math functions to respect errno"));
 
-static llvm::cl::opt<bool>
-NeXTRuntime("fnext-runtime",
-            llvm::cl::desc("Generate output compatible with the NeXT "
-                           "runtime"));
-
 static llvm::cl::opt<bool>
 NoElideConstructors("fno-elide-constructors",
                     llvm::cl::desc("Disable C++ copy constructor elision"));
@@ -1268,9 +1263,7 @@ void clang::InitializeLangOptions(LangOptions &Options,
   Options.InstantiationDepth = TemplateDepth;
 
   // Override the default runtime if the user requested it.
-  if (NeXTRuntime)
-    Options.NeXTRuntime = 1;
-  else if (GNURuntime)
+  if (GNURuntime)
     Options.NeXTRuntime = 0;
 
   if (!ObjCConstantStringClass.empty())