Revert "clang: forward -no-integrated-as from the driver"

This seems to break a MIPS test.  Revert until I figure out the root cause.

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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 31192a2b0281f47007b9c4954e3452dc5eb87fea..b6214a7177ccd476676d182679afbbffd83e8d99 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2514,17 +2514,12 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   // Decide whether to use verbose asm. Verbose assembly is the default on
   // toolchains which have the integrated assembler on by default.
-  bool IsIntegratedAssemblerDefault =
-      getToolChain().IsIntegratedAssemblerDefault();
+  bool IsVerboseAsmDefault = getToolChain().IsIntegratedAssemblerDefault();
   if (Args.hasFlag(options::OPT_fverbose_asm, options::OPT_fno_verbose_asm,
-                   IsIntegratedAssemblerDefault) ||
+                   IsVerboseAsmDefault) ||
       Args.hasArg(options::OPT_dA))
     CmdArgs.push_back("-masm-verbose");
 
-  if (!Args.hasFlag(options::OPT_integrated_as, options::OPT_no_integrated_as,
-                    IsIntegratedAssemblerDefault))
-    CmdArgs.push_back("-no-integrated-as");
-
   if (Args.hasArg(options::OPT_fdebug_pass_structure)) {
     CmdArgs.push_back("-mdebug-pass");
     CmdArgs.push_back("Structure");

diff --git a/test/Driver/no-integrated-as.c b/test/Driver/no-integrated-as.c
deleted file mode 100644 (file)
index 4e2039a..0000000
--- a/test/Driver/no-integrated-as.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: %clang -triple i386 -### -no-integrated-as %s 2>&1 \
-// RUN:     | FileCheck %s -check-prefix NOIAS
-
-// NOIAS: -no-integrated-as
-
-// RUN: %clang -triple i386 -### -integrated-as %s 2>&1 \
-// RUN:     | FileCheck %s -check-prefix IAS
-
-// IAS-NOT: -no-integrated-as
-
-// RUN: %clang -triple i386 -### %s 2>&1 | FileCheck %s -check-prefix DEFAULT
-
-// DEFAULT-NOT: -no-integrated-as
-
-// RUN: %clang -triple msp430 -### %s 2>&1 \
-// RUN:     | FileCheck %s -check-prefix NO-IAS-DEFAULT
-
-// NO-IAS-DEFAULT-NOT: -no-integrated-as
-