maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mips] -mno-shared should only be given to the assembler when -fPIC/-fpic/-fPIE/-fpie is not in effect. 

This fixes compiler recursion on MIPS32r2.

llvm-svn: 213741
This commit is contained in:
Daniel Sanders 2014-07-23 12:06:13 +00:00
parent 4ff1ffa1ce
commit 54d8ee6d7b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7049,8 +7049,22 @@ void gnutools::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back("-mabi");
CmdArgs.push_back(ABIName.data());
// LLVM doesn't support -mabicalls yet and acts as if it is always given.
CmdArgs.push_back("-mno-shared");
// -mno-shared should be emitted unless -fpic, -fpie, -fPIC, -fPIE,
// or -mshared (not implemented) is in effect.
bool IsPicOrPie = false;
if (Arg *A = Args.getLastArg(options::OPT_fPIC, options::OPT_fno_PIC,
options::OPT_fpic, options::OPT_fno_pic,
options::OPT_fPIE, options::OPT_fno_PIE,
options::OPT_fpie, options::OPT_fno_pie)) {
if (A->getOption().matches(options::OPT_fPIC) ||
A->getOption().matches(options::OPT_fpic) ||
A->getOption().matches(options::OPT_fPIE) ||
A->getOption().matches(options::OPT_fpie))
IsPicOrPie = true;
}
if (!IsPicOrPie)
CmdArgs.push_back("-mno-shared");
// LLVM doesn't support -mplt yet and acts as if it is always given.
// However, -mplt has no effect with the N64 ABI.
CmdArgs.push_back(ABIName == "64" ? "-KPIC" : "-call_nonpic");

2
clang/test/Driver/mips-as.c
View File

@ -12,7 +12,7 @@
// RUN: %clang -target mips-linux-gnu -### \
// RUN: -no-integrated-as -fPIC -c %s 2>&1 \
// RUN: | FileCheck -check-prefix=MIPS32R2-EB-PIC %s
// MIPS32R2-EB-PIC: as{{(.exe)?}}" "-march" "mips32r2" "-mabi" "32" "-mno-shared" "-call_nonpic" "-EB"
// MIPS32R2-EB-PIC: as{{(.exe)?}}" "-march" "mips32r2" "-mabi" "32" "-call_nonpic" "-EB"
// MIPS32R2-EB-PIC: "-KPIC"
//
// RUN: %clang -target mipsel-linux-gnu -### \