diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2013-12-02 10:14:43 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2013-12-02 10:14:43 +0000 |
| commit | 0d5d6ff1b8986352c523a1e83803787fdb0389f8 (patch) | |
| tree | f46b157033827b5698184ab78ead9630ddc374bc | |
| parent | 6c5c3adab3ff343c2fc6d9a34808aa9b65d6baaa (diff) | |
| download | clang-0d5d6ff1b8986352c523a1e83803787fdb0389f8.tar.gz clang-0d5d6ff1b8986352c523a1e83803787fdb0389f8.tar.bz2 clang-0d5d6ff1b8986352c523a1e83803787fdb0389f8.tar.xz | |
Merged r195756:
------------------------------------------------------------------------
r195756 | atanasyan | 2013-11-26 11:58:04 +0000 (Tue, 26 Nov 2013) | 1 line
[Mips] Pass -mmsa option to the assembler.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196083 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/Tools.cpp | 7 | ||||
| -rw-r--r-- | test/Driver/mips-as.c | 11 |
2 files changed, 18 insertions, 0 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index c0b4da15f4..b92b25eadb 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -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, diff --git a/test/Driver/mips-as.c b/test/Driver/mips-as.c index 55fa1ef927..df925f1a17 100644 --- a/test/Driver/mips-as.c +++ b/test/Driver/mips-as.c @@ -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" |