Commit c4e06943 authored Dec 02, 2013 by Daniel Sanders

Merged r195756:

------------------------------------------------------------------------
r195756 | atanasyan | 2013-11-26 11:58:04 +0000 (Tue, 26 Nov 2013) | 1 line

[Mips] Pass -mmsa option to the assembler.
------------------------------------------------------------------------

llvm-svn: 196083

parent de2f7f1d

clang/lib/Driver/Tools.cpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -6186,6 +6186,13 @@ void gnutools::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
		Args.AddLastArg(CmdArgs, options::OPT_mdsp, options::OPT_mno_dsp);
		Args.AddLastArg(CmdArgs, options::OPT_mdspr2, options::OPT_mno_dspr2);

		if (Arg *A = Args.getLastArg(options::OPT_mmsa, options::OPT_mno_msa)) {
		// Do not use AddLastArg because not all versions of MIPS assembler
		// support -mmsa / -mno-msa options.
		if (A->getOption().matches(options::OPT_mmsa))
		CmdArgs.push_back(Args.MakeArgString("-mmsa"));
		}

		Arg *LastPICArg = Args.getLastArg(options::OPT_fPIC, options::OPT_fno_PIC,
		options::OPT_fpic, options::OPT_fno_pic,
		options::OPT_fPIE, options::OPT_fno_PIE,

clang/test/Driver/mips-as.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -136,3 +136,14 @@
		// RUN: -no-integrated-as -c %s 2>&1 \
		// RUN: \| FileCheck -check-prefix=MIPS-MFP64 %s
		// MIPS-MFP64: as{{(.exe)?}}" "-march" "mips32" "-mabi" "32" "-EB" "-mfp64"
		//
		// RUN: %clang -target mips-linux-gnu -mno-msa -mmsa -### \
		// RUN: -no-integrated-as -c %s 2>&1 \
		// RUN: \| FileCheck -check-prefix=MIPS-MSA %s
		// MIPS-MSA: as{{(.exe)?}}" "-march" "mips32" "-mabi" "32" "-EB" "-mmsa"
		//
		// RUN: %clang -target mips-linux-gnu -mmsa -mno-msa -### \
		// RUN: -no-integrated-as -c %s 2>&1 \
		// RUN: \| FileCheck -check-prefix=MIPS-NMSA %s
		// MIPS-NMSA: as{{(.exe)?}}"
		// MIPS-NMSA-NOT: "-mmsa"