PR21000: pass -I options to assembler

[tra]

Summary

This helps compiling assembly files that .include files.

[tra]

Moved test cases into a separate file.

[echristo]

To fix the bug need to make sure -I is passed to both the assembler and integrated assembler?

-eric

[tra]

In D7472#119929, @echristo wrote:

To fix the bug need to make sure -I is passed to both the assembler and integrated assembler?

Yes. Neither way we invoke assembler had -I passed to it and thus .include was failing in both cases.

[echristo]

Ah, right. Much better (or I missed that you were testing -no-integrated-as earlier).

-eric

cfe/trunk/lib/Driver/Tools.cpp

if (SourceAction->getType() == types::TY_Asm ||
 
     // Add the -fdebug-compilation-dir flag if needed.
     addDebugCompDirArg(Args, CmdArgs);
 
     // Set the AT_producer to the clang version when using the integrated
     // 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
   // analysis.
   if (getToolChain().UseDwarfDebugFlags()) {
     ArgStringList OriginalArgs;
     for (const auto &Arg : Args)
       Arg->render(Args, OriginalArgs);
case llvm::Triple::systemz: {
     CmdArgs.push_back(Args.MakeArgString("-march=" + CPUName));
     break;
   }
   }
 
   if (NeedsKPIC)
     addAssemblerKPIC(Args, CmdArgs);
 
+  Args.AddAllArgs(CmdArgs, options::OPT_I);
   Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA,
                        options::OPT_Xassembler);
 
   CmdArgs.push_back("-o");
   CmdArgs.push_back(Output.getFilename());
 
   for (const auto &II : Inputs)
     CmdArgs.push_back(II.getFilename());

cfe/trunk/test/Driver/as-options.s

+// 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"