[PATCH] clang: forward -no-integrated-as from the driver

[Saleem Abdulrasool]

  Include the fixed version of the tests.

Hi nlewycky, rafael, dwmw2, rengolin, chandlerc,

http://llvm-reviews.chandlerc.com/D2852

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D2852?vs=7267&id=7268#toc

Files:
  lib/Driver/Tools.cpp
  test/Driver/no-integrated-as.c

Index: lib/Driver/Tools.cpp
===================================================================
--- lib/Driver/Tools.cpp
+++ lib/Driver/Tools.cpp
@@ -2509,12 +2509,17 @@
 
   // Decide whether to use verbose asm. Verbose assembly is the default on
   // toolchains which have the integrated assembler on by default.
-  bool IsVerboseAsmDefault = getToolChain().IsIntegratedAssemblerDefault();
+  bool IsIntegratedAssemblerDefault =
+      getToolChain().IsIntegratedAssemblerDefault();
   if (Args.hasFlag(options::OPT_fverbose_asm, options::OPT_fno_verbose_asm,
-                   IsVerboseAsmDefault) ||
+                   IsIntegratedAssemblerDefault) ||
       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");
Index: test/Driver/no-integrated-as.c
===================================================================
--- /dev/null
+++ test/Driver/no-integrated-as.c
@@ -0,0 +1,14 @@
+// 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
+
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2852.2.patch
Type: text/x-patch
Size: 1627 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20140220/4dbd9645/attachment.bin>