From: Artem Belevich <tra@google.com>
Date: Mon, 27 Apr 2015 21:11:08 +0000 (+0000)
Subject: Revert "PR21000: pass -I options to assembler" as the test was failing on hexagon.
X-Git-Tag: llvmorg-3.7.0-rc1~5902
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3e2fd7bea20a255ef071266ee7cac50a62be807;p=platform%2Fupstream%2Fllvm.git

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

llvm-svn: 235919
---

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index a398a5572428..526968cf41b8 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -5115,9 +5115,6 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
     // 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(Compilation &C, const JobAction &JA,
   if (NeedsKPIC)
     addAssemblerKPIC(Args, CmdArgs);
 
-  Args.AddAllArgs(CmdArgs, options::OPT_I);
   Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA,
                        options::OPT_Xassembler);
 
diff --git a/clang/test/Driver/as-options.s b/clang/test/Driver/as-options.s
deleted file mode 100644
index eb1f9c7ffb02..000000000000
--- a/clang/test/Driver/as-options.s
+++ /dev/null
@@ -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"