diff options
| author | Renato Golin <renato.golin@linaro.org> | 2016-05-28 04:24:26 +0000 |
|---|---|---|
| committer | Renato Golin <renato.golin@linaro.org> | 2016-05-28 04:24:26 +0000 |
| commit | 4f22c51b0975dec69de681e6346baa7c32a2f824 (patch) | |
| tree | dfd662d4329902799a1f444c1caa27b96e5049b2 /llvm/lib/Target/ARM/ARMTargetMachine.cpp | |
| parent | 311cc8378e7e4ddf2f944963dcaf05e8a843cf83 (diff) | |
| download | bcm5719-llvm-4f22c51b0975dec69de681e6346baa7c32a2f824.tar.gz bcm5719-llvm-4f22c51b0975dec69de681e6346baa7c32a2f824.zip | |
Revert "Map DynamicNoPIC to Static on non-darwin."
This reverts commit r271052, as it broke some ARM buildbots.
llvm-svn: 271096
Diffstat (limited to 'llvm/lib/Target/ARM/ARMTargetMachine.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index d3276f79b5e..81127f7b813 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -177,11 +177,6 @@ static Reloc::Model getEffectiveRelocModel(const Triple &TT, if (!RM.hasValue()) // Default relocation model on Darwin is PIC, not DynamicNoPIC. return TT.isOSDarwin() ? Reloc::PIC_ : Reloc::DynamicNoPIC; - - // DynamicNoPIC is only used on darwin. - if (*RM == Reloc::DynamicNoPIC && !TT.isOSDarwin()) - return Reloc::Static; - return *RM; } |
