diff options
| -rw-r--r-- | lib/Target/Mips/MipsSubtarget.cpp | 6 | ||||
| -rw-r--r-- | lib/Target/Mips/MipsTargetMachine.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Target/Mips/MipsSubtarget.cpp b/lib/Target/Mips/MipsSubtarget.cpp index 530920b03c..48f58a55aa 100644 --- a/lib/Target/Mips/MipsSubtarget.cpp +++ b/lib/Target/Mips/MipsSubtarget.cpp @@ -65,9 +65,9 @@ MipsSubtarget::MipsSubtarget(const TargetMachine &TM, const Module &M, HasCondMov = true; } - // Abicall is the default for O32 ABI and is ignored - // for EABI. - if (NotABICall || isABI_EABI()) + // Abicall is the default for O32 ABI, but is disabled within EABI and in + // static code. + if (NotABICall || isABI_EABI() || (TM.getRelocationModel() == Reloc::Static)) HasABICall = false; // TODO: disable when handling 64 bit symbols in the future. diff --git a/lib/Target/Mips/MipsTargetMachine.cpp b/lib/Target/Mips/MipsTargetMachine.cpp index b24e498ae4..276868cbb2 100644 --- a/lib/Target/Mips/MipsTargetMachine.cpp +++ b/lib/Target/Mips/MipsTargetMachine.cpp @@ -46,7 +46,7 @@ MipsTargetMachine(const Module &M, const std::string &FS, bool isLittle=false): TLInfo(*this) { // Abicall enables PIC by default - if (Subtarget.hasABICall() && (getRelocationModel() != Reloc::Static)) + if (Subtarget.hasABICall()) setRelocationModel(Reloc::PIC_); // TODO: create an option to enable long calls, like -mlong-calls, |