RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Don't relocate with sections if there might be a paired relocation.

Browse Source 
llvm-svn: 205240
This commit is contained in:
Rafael Espindola 2014-03-31 19:00:23 +00:00
parent eb9764fa98
commit e806144cb9
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/Support/ELF.h
View File

@ -880,6 +880,9 @@ enum {
R_MIPS_TLS_TPREL_HI16 = 49,
R_MIPS_TLS_TPREL_LO16 = 50,
R_MIPS_GLOB_DAT = 51,
R_MIPS16_GOT16 = 102,
R_MIPS16_HI16 = 104,
R_MIPS16_LO16 = 105,
R_MIPS_COPY = 126,
R_MIPS_JUMP_SLOT = 127,
R_MICROMIPS_26_S1 = 133,

20
lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
View File

@ -206,9 +206,25 @@ MipsELFObjectWriter::needsRelocateWithSymbol(unsigned Type) const {
default:
return true;
case ELF::R_MIPS_26:
case ELF::R_MIPS_LO16:
case ELF::R_MIPS_GOT16:
case ELF::R_MIPS16_GOT16:
case ELF::R_MICROMIPS_GOT16:
llvm_unreachable("Should have been handled already");
// These relocations might be paired with another relocation. The pairing is
// done by the static linker by matching the symbol. Since we only see one
// relocation at a time, we have to force them to relocate with a symbol to
// avoid ending up with a pair where one points to a section and another
// points to a symbol.
case ELF::R_MIPS_HI16:
case ELF::R_MIPS16_HI16:
case ELF::R_MICROMIPS_HI16:
case ELF::R_MIPS_LO16:
case ELF::R_MIPS16_LO16:
case ELF::R_MICROMIPS_LO16:
return true;
case ELF::R_MIPS_26:
case ELF::R_MIPS_32:
case ELF::R_MIPS_64:
case ELF::R_MIPS_GPREL16:

2
test/MC/Mips/xgot.s
View File

@ -11,7 +11,7 @@
// CHECK: 0x24 R_MIPS_CALL_HI16 printf
// CHECK: 0x2C R_MIPS_GOT16 $.str
// CHECK: 0x30 R_MIPS_CALL_LO16 printf
// CHECK: 0x38 R_MIPS_LO16 .rodata.str1.1
// CHECK: 0x38 R_MIPS_LO16 $.str
// CHECK: ]
.text