r235919 - Revert "PR21000: pass -I options to assembler" as the test was failing on hexagon.

[Artem Belevich]

Author: tra
Date: Mon Apr 27 16:11:08 2015
New Revision: 235919

URL: http://llvm.org/viewvc/llvm-project?rev=235919&view=rev
Log:
Revert "PR21000: pass -I options to assembler" as the test was failing on hexagon.

Removed:
    cfe/trunk/test/Driver/as-options.s
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=235919&r1=235918&r2=235919&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Apr 27 16:11:08 2015
@@ -5115,9 +5115,6 @@ void ClangAs::ConstructJob(Compilation &
     // assembler on assembly source files.
     CmdArgs.push_back("-dwarf-debug-producer");
     CmdArgs.push_back(Args.MakeArgString(getClangFullVersion()));
-
-    // And pass along -I options
-    Args.AddAllArgs(CmdArgs, options::OPT_I);
   }
 
   // Optionally embed the -cc1as level arguments into the debug info, for build
@@ -7587,7 +7584,6 @@ void gnutools::Assemble::ConstructJob(Co
   if (NeedsKPIC)
     addAssemblerKPIC(Args, CmdArgs);
 
-  Args.AddAllArgs(CmdArgs, options::OPT_I);
   Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA,
                        options::OPT_Xassembler);
 

Removed: cfe/trunk/test/Driver/as-options.s
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/as-options.s?rev=235918&view=auto
==============================================================================
--- cfe/trunk/test/Driver/as-options.s (original)
+++ cfe/trunk/test/Driver/as-options.s (removed)
@@ -1,12 +0,0 @@
-// PR21000: Test that -I is passed to assembler. 
-// RUN: %clang -### -c -no-integrated-as %s -Ifoo_dir 2>&1 | FileCheck --check-prefix=BARE_INCLUDE1 %s
-// BARE_INCLUDE1: "-I" "foo_dir"
-
-// RUN: %clang -### -c -no-integrated-as %s -I foo_dir 2>&1 | FileCheck --check-prefix=BARE_INCLUDE2 %s
-// BARE_INCLUDE2: "-I" "foo_dir"
-
-// RUN: %clang -### -c -integrated-as %s -Ifoo_dir 2>&1 | FileCheck --check-prefix=BARE_INT_INCLUDE1 %s
-// BARE_INT_INCLUDE1: "-I" "foo_dir"
-
-// RUN: %clang -### -c -integrated-as %s -I foo_dir 2>&1 | FileCheck --check-prefix=BARE_INT_INCLUDE2 %s
-// BARE_INT_INCLUDE2: "-I" "foo_dir"