From 7808a191bec712a48859ebddcdb5ab708ca8eef7 Mon Sep 17 00:00:00 2001 From: Artem Belevich Date: Mon, 27 Apr 2015 21:11:08 +0000 Subject: [PATCH] Revert "PR21000: pass -I options to assembler" as the test was failing on hexagon. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@235919 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 4 ---- test/Driver/as-options.s | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100644 test/Driver/as-options.s diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index a398a55724..526968cf41 100644 --- a/lib/Driver/Tools.cpp +++ b/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/test/Driver/as-options.s b/test/Driver/as-options.s deleted file mode 100644 index eb1f9c7ffb..0000000000 --- a/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" -- 2.40.0