RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[MC][ELF] Work around R_MIPS_LO16 relocation handling problem"

Browse Source 
This reverts commit ab40c027f0ce9492919a72ad339de40bdb84b354.

Some additional test cases are influenced by the workaround, and I need
to do a complete test run to identify and check them all.
This commit is contained in:
Dimitry Andric 2021-05-03 23:08:04 +02:00
parent 064700fe8e
commit bdc09c32cd
2 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/MC/ELFObjectWriter.cpp
View File

@ -1381,17 +1381,6 @@ bool ELFObjectWriter::shouldRelocateWithSymbol(const MCAssembler &Asm,
if (TargetObjectWriter->getEMachine() == ELF::EM_386 &&
Type == ELF::R_386_GOTOFF)
return true;
// ld.lld handles R_MIPS_HI16/R_MIPS_LO16 separately, not as a whole, so
// it doesn't know that an R_MIPS_HI16 with implicit addend 1 and an
// R_MIPS_LO16 with implicit addend -32768 represents 32768, which is in
// range of a MergeInputSection. We could introduce a new RelExpr member
// (like R_RISCV_PC_INDIRECT for R_RISCV_PCREL_HI20 / R_RISCV_PCREL_LO12)
// but the complexity is unnecessary given that GNU as keeps the original
// symbol for this case as well.
if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS &&
!hasRelocationAddend())
return true;
}
// Most TLS relocations use a got, so they need the symbol. Even those that

22
test/MC/Mips/mips_lo16.s
View File

@ -1,22 +0,0 @@
# PR49821: Check that R_MIPS_LO16 relocs do not wrap around with large addends.
# RUN: llvm-mc %s -triple mips-unknown-unknown -filetype=obj | \
# RUN: llvm-objdump -d -r --no-show-raw-insn - | \
# RUN: FileCheck -check-prefix=MIPS32 %s
# RUN: llvm-mc %s -triple mips64-unknown-unknown -filetype=obj | \
# RUN: llvm-objdump -d -r --no-show-raw-insn - | \
# RUN: FileCheck -check-prefix=MIPS64 %s
.text
foo:
lui $2, %hi(bar)
# MIPS32: 00000000: R_MIPS_HI16 bar
# MIPS64: 0000000000000000: R_MIPS_HI16/R_MIPS_NONE/R_MIPS_NONE .rodata.str1.1+0x8000
addiu $2, $2, %lo(bar)
# MIPS32: 00000004: R_MIPS_LO16 bar
# MIPS64: 0000000000000004: R_MIPS_LO16/R_MIPS_NONE/R_MIPS_NONE .rodata.str1.1+0x8000
.section .rodata.str1.1,"aMS",@progbits,1
.zero 0x8000
bar:
.asciz "hello"