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

[Saleem Abdulrasool]

Author: compnerd
Date: Sat Feb 22 16:24:00 2014
New Revision: 201954

URL: http://llvm.org/viewvc/llvm-project?rev=201954&view=rev
Log:
Revert "clang: forward -no-integrated-as from the driver"

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

Removed:
    cfe/trunk/test/Driver/no-integrated-as.c
Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=201954&r1=201953&r2=201954&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Sat Feb 22 16:24:00 2014
@@ -2514,17 +2514,12 @@ void Clang::ConstructJob(Compilation &C,
 
   // 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");

Removed: cfe/trunk/test/Driver/no-integrated-as.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/no-integrated-as.c?rev=201953&view=auto
==============================================================================
--- cfe/trunk/test/Driver/no-integrated-as.c (original)
+++ cfe/trunk/test/Driver/no-integrated-as.c (removed)
@@ -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
-