generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f702652e: am 41b87c65: Merge "x86_64: Add R_X86_64_64 relocation handling"

Browse Source 
* commit 'f702652ef89ad53d9bac51fb6ffccd071e7c7b99':
  x86_64: Add R_X86_64_64 relocation handling
This commit is contained in:
Elliott Hughes 2013-10-17 12:57:58 -07:00 committed by Android Git Automerger
commit 26e2643949
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
linker/linker.cpp
View File

@ -947,6 +947,14 @@ static int soinfo_relocate_a(soinfo* si, Elf_Rela* rela, unsigned count, soinfo*
*reinterpret_cast<Elf_Addr*>(reloc) = sym_addr + rela->r_addend;
break;
case R_X86_64_64:
count_relocation(kRelocRelative);
MARK(rela->r_offset);
TRACE_TYPE(RELO, "RELO R_X86_64_64 %08zx <- +%08zx %s", static_cast<size_t>(reloc),
static_cast<size_t>(sym_addr), sym_name);
*reinterpret_cast<Elf_Addr*>(reloc) = sym_addr + rela->r_addend;
break;
case R_X86_64_PC32:
count_relocation(kRelocRelative);
MARK(rela->r_offset);