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

[ELF] Support explicitly overriding relocation model in LTO 

lld currently selects the relocation model automatically depending on
the link flags specified, but in some cases it'd be useful to allow
explicitly overriding the relocation model using a flag.

llvm-svn: 366644
This commit is contained in:
Petr Hosek 2019-07-20 21:59:47 +00:00
parent a2dd672c5f
commit ae4c30a4be
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/Common/TargetOptionsCommandFlags.cpp
View File

@ -26,6 +26,10 @@ llvm::TargetOptions lld::initTargetOptionsFromCodeGenFlags() {
return ::InitTargetOptionsFromCodeGenFlags(); return ::InitTargetOptionsFromCodeGenFlags();
} }
llvm::Optional<llvm::Reloc::Model> lld::getRelocModelFromCMModel() {
return getRelocModel();
}
llvm::Optional<llvm::CodeModel::Model> lld::getCodeModelFromCMModel() { llvm::Optional<llvm::CodeModel::Model> lld::getCodeModelFromCMModel() {
return getCodeModel(); return getCodeModel();
} }

4
lld/ELF/LTO.cpp
View File

@ -76,7 +76,9 @@ static lto::Config createConfig() {
c.Options.FunctionSections = true; c.Options.FunctionSections = true;
c.Options.DataSections = true; c.Options.DataSections = true;
if (config->relocatable) if (auto relocModel = getRelocModelFromCMModel())
c.RelocModel = *relocModel;
else if (config->relocatable)
c.RelocModel = None; c.RelocModel = None;
else if (config->isPic) else if (config->isPic)
c.RelocModel = Reloc::PIC_; c.RelocModel = Reloc::PIC_;

1
lld/include/lld/Common/TargetOptionsCommandFlags.h
View File

@ -16,6 +16,7 @@
namespace lld { namespace lld {
llvm::TargetOptions initTargetOptionsFromCodeGenFlags(); llvm::TargetOptions initTargetOptionsFromCodeGenFlags();
llvm::Optional<llvm::Reloc::Model> getRelocModelFromCMModel();
llvm::Optional<llvm::CodeModel::Model> getCodeModelFromCMModel(); llvm::Optional<llvm::CodeModel::Model> getCodeModelFromCMModel();
std::string getCPUStr(); std::string getCPUStr();
std::vector<std::string> getMAttrs(); std::vector<std::string> getMAttrs();

9
lld/test/ELF/lto/relocation-model.ll
View File

@ -33,6 +33,15 @@
; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC ; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
;; Explicit flag.
; RUN: ld.lld %t.o -o %t-out -save-temps -r -mllvm -relocation-model=pic
; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=PIC
; RUN: ld.lld %t.o -o %t-out -save-temps -r -mllvm -relocation-model=static
; RUN: llvm-readobj -r %t-out.lto.o | FileCheck %s --check-prefix=STATIC
; PIC: R_X86_64_REX_GOTPCRELX foo ; PIC: R_X86_64_REX_GOTPCRELX foo
; STATIC: R_X86_64_PC32 foo ; STATIC: R_X86_64_PC32 foo