replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clang: forward -no-integrated-as from the driver 

Forward the -no-integrated-as option to -cc1 rather than simply invoking the
appropriate tool.  This is useful since this option has been overloaded to
permit disabling of parsing inline assembly at the MC layer.

This re-applies the previous version of the patch with a renaming of the driver
option to the public name rather than the internal name (-target vs -triple).
The actual failure is fixed separately of an overly aggressive negative pattern
match in the MIPS driver tests.  It also fixes the incorrect test for targets
that have the integrated assembler disabled by default.

llvm-svn: 201960
This commit is contained in:
Saleem Abdulrasool 2014-02-22 23:37:58 +00:00
parent a56fc7c42c
commit 42e4b5997a
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Driver/Tools.cpp
View File

@ -2514,12 +2514,17 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
// 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");

19
clang/test/Driver/no-integrated-as.c Normal file
View File

@ -0,0 +1,19 @@
// RUN: %clang -target i386 -### -no-integrated-as -c %s 2>&1 \
// RUN: | FileCheck %s -check-prefix NOIAS
// NOIAS: -no-integrated-as
// RUN: %clang -target i386 -### -integrated-as -c %s 2>&1 \
// RUN: | FileCheck %s -check-prefix IAS
// IAS-NOT: -no-integrated-as
// RUN: %clang -target i386 -### -c %s 2>&1 | FileCheck %s -check-prefix DEFAULT
// DEFAULT-NOT: -no-integrated-as
// RUN: %clang -target msp430 -### -c %s 2>&1 \
// RUN: | FileCheck %s -check-prefix NO-IAS-DEFAULT
// NO-IAS-DEFAULT: -no-integrated-as