RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-26 12:50:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of ELF::R_MIPS_32 on Mips64.

Browse Source 
Thanks to Aboud, Amjad for reporting the regression and providing the testcase.

llvm-svn: 241440
This commit is contained in:
Rafael Espindola 2015-07-06 12:18:44 +00:00
parent 156446ee87
commit b31a748216
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/llvm/Object/RelocVisitor.h
View File

@ -100,9 +100,9 @@ private:
case Triple::mips64:
switch (RelocType) {
case llvm::ELF::R_MIPS_32:
return visitELF_MIPS_32(R, Value);
return visitELF_MIPS64_32(R, Value);
case llvm::ELF::R_MIPS_64:
return visitELF_MIPS_64(R, Value);
return visitELF_MIPS64_64(R, Value);
default:
HasError = true;
return RelocToApply();
@ -313,11 +313,18 @@ private:
/// MIPS ELF
RelocToApply visitELF_MIPS_32(RelocationRef R, uint64_t Value) {
uint32_t Res = (Value)&0xFFFFFFFF;
uint32_t Res = Value & 0xFFFFFFFF;
return RelocToApply(Res, 4);
}
RelocToApply visitELF_MIPS_64(RelocationRef R, uint64_t Value) {
/// MIPS64 ELF
RelocToApply visitELF_MIPS64_32(RelocationRef R, uint64_t Value) {
int64_t Addend = getELFAddend(R);
uint32_t Res = (Value + Addend) & 0xFFFFFFFF;
return RelocToApply(Res, 4);
}
RelocToApply visitELF_MIPS64_64(RelocationRef R, uint64_t Value) {
int64_t Addend = getELFAddend(R);
uint64_t Res = (Value + Addend);
return RelocToApply(Res, 8);

BIN
test/Object/Inputs/elf-mip64-reloc.o Normal file
View File

Binary file not shown.

6
test/Object/Mips/reloc-visit.test Normal file
View File

@ -0,0 +1,6 @@
RUN: llvm-dwarfdump -debug-dump=info %p/../Inputs/elf-mip64-reloc.o 2>&1 | \
RUN: FileCheck %s
CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000037] = "<stdin>")
CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000054] = "foo")
CHECK: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000058] = "int")