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

-fnext-runtime), instead of using getDefaultLangOptions.

llvm-svn: 89058

1 files changed, 1 insertions, 8 deletions

diff --git a/clang/tools/clang-cc/Options.cpp b/clang/tools/clang-cc/Options.cpp
index 2dc521986f8..9c4216749ec 100644
--- a/clang/tools/clang-cc/Options.cpp
+++ b/clang/tools/clang-cc/Options.cpp
@@ -541,11 +541,6 @@ 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())