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

[Rafael Espíndola]

thanks!

On 22 February 2014 18:37, Saleem Abdulrasool <compnerd at compnerd.org> wrote:
> Author: compnerd
> Date: Sat Feb 22 17:37:58 2014
> New Revision: 201960
>
> URL: http://llvm.org/viewvc/llvm-project?rev=201960&view=rev
> Log:
> 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.
>
> Added:
>     cfe/trunk/test/Driver/no-integrated-as.c
> Modified:
>     cfe/trunk/lib/Driver/Tools.cpp
>
> Modified: cfe/trunk/lib/Driver/Tools.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=201960&r1=201959&r2=201960&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Driver/Tools.cpp (original)
> +++ cfe/trunk/lib/Driver/Tools.cpp Sat Feb 22 17:37:58 2014
> @@ -2514,12 +2514,17 @@ void Clang::ConstructJob(Compilation &C,
>
>    // 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");
>
> Added: cfe/trunk/test/Driver/no-integrated-as.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/no-integrated-as.c?rev=201960&view=auto
> ==============================================================================
> --- cfe/trunk/test/Driver/no-integrated-as.c (added)
> +++ cfe/trunk/test/Driver/no-integrated-as.c Sat Feb 22 17:37:58 2014
> @@ -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
> +
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits