replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass the relocation model to LLVM for assembler files. 

llvm-svn: 247981
This commit is contained in:
Joerg Sonnenberger 2015-09-18 11:13:43 +00:00
parent 020296a968
commit 924f6ad63d
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/lib/CodeGen/BackendUtil.cpp
View File

@ -463,6 +463,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) {
FeaturesStr = Features.getString();
}
// Keep this synced with the equivalent code in tools/driver/cc1as_main.cpp.
llvm::Reloc::Model RM = llvm::Reloc::Default;
if (CodeGenOpts.RelocationModel == "static") {
RM = llvm::Reloc::Static;

19
clang/tools/driver/cc1as_main.cpp
View File

@ -126,6 +126,9 @@ struct AssemblerInvocation {
unsigned NoExecStack : 1;
unsigned FatalWarnings : 1;
/// The name of the relocation model to use.
std::string RelocationModel;
/// @}
public:
@ -248,6 +251,7 @@ bool AssemblerInvocation::CreateFromArgs(AssemblerInvocation &Opts,
Opts.RelaxAll = Args.hasArg(OPT_mrelax_all);
Opts.NoExecStack = Args.hasArg(OPT_mno_exec_stack);
Opts.FatalWarnings = Args.hasArg(OPT_massembler_fatal_warnings);
Opts.RelocationModel = Args.getLastArgValue(OPT_mrelocation_model, "pic");
return Success;
}
@ -321,8 +325,19 @@ static bool ExecuteAssembler(AssemblerInvocation &Opts,
std::unique_ptr<MCObjectFileInfo> MOFI(new MCObjectFileInfo());
MCContext Ctx(MAI.get(), MRI.get(), MOFI.get(), &SrcMgr);
// FIXME: Assembler behavior can change with -static.
MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), Reloc::Default,
llvm::Reloc::Model RM = llvm::Reloc::Default;
if (Opts.RelocationModel == "static") {
RM = llvm::Reloc::Static;
} else if (Opts.RelocationModel == "pic") {
RM = llvm::Reloc::PIC_;
} else {
assert(Opts.RelocationModel == "dynamic-no-pic" &&
"Invalid PIC model!");
RM = llvm::Reloc::DynamicNoPIC;
}
MOFI->InitMCObjectFileInfo(Triple(Opts.Triple), RM,
CodeModel::Default, Ctx);
if (Opts.SaveTemporaryLabels)
Ctx.setAllowTemporaryLabels(false);