From ff35b1e659547644fb14f890eeec880cf4bafc4e Mon Sep 17 00:00:00 2001 From: Junichi Uekawa Date: Wed, 18 Nov 2015 10:18:59 +0900 Subject: [PATCH] Do not depend on host bits to get the right size to write. x86_64 32-bit or 64-bit relocations do not depend on ELF bit size, they are 32-bit or 64-bit respectively. Known compiler that emits such code is nacl-clang which emits R_X86_64_PC32 which should write 32 bits but ended up writing 64 bits. Change-Id: Ibb6b484c0fea6a7e291362148e8ac749d6674529 --- linker/linker.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linker/linker.cpp b/linker/linker.cpp index 27bcb216e..a67b4308d 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp @@ -2731,14 +2731,14 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO R_X86_64_32 %08zx <- +%08zx %s", static_cast(reloc), static_cast(sym_addr), sym_name); - *reinterpret_cast(reloc) = sym_addr + addend; + *reinterpret_cast(reloc) = sym_addr + addend; break; case R_X86_64_64: count_relocation(kRelocRelative); MARK(rel->r_offset); TRACE_TYPE(RELO, "RELO R_X86_64_64 %08zx <- +%08zx %s", static_cast(reloc), static_cast(sym_addr), sym_name); - *reinterpret_cast(reloc) = sym_addr + addend; + *reinterpret_cast(reloc) = sym_addr + addend; break; case R_X86_64_PC32: count_relocation(kRelocRelative); @@ -2746,7 +2746,7 @@ bool soinfo::relocate(const VersionTracker& version_tracker, ElfRelIteratorT&& r TRACE_TYPE(RELO, "RELO R_X86_64_PC32 %08zx <- +%08zx (%08zx - %08zx) %s", static_cast(reloc), static_cast(sym_addr - reloc), static_cast(sym_addr), static_cast(reloc), sym_name); - *reinterpret_cast(reloc) = sym_addr + addend - reloc; + *reinterpret_cast(reloc) = sym_addr + addend - reloc; break; #elif defined(__arm__) case R_ARM_ABS32: