From 9c1883ccfcece3766ea9b922c267f877008312ea Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 22 Feb 2014 23:37:58 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@201960 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 9 +++++++-- test/Driver/no-integrated-as.c | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 test/Driver/no-integrated-as.c diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index b6214a7177..31192a2b02 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -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"); diff --git a/test/Driver/no-integrated-as.c b/test/Driver/no-integrated-as.c new file mode 100644 index 0000000000..812ab1e646 --- /dev/null +++ b/test/Driver/no-integrated-as.c @@ -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 + -- 2.49.0