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

am a23569c9: Merge "Refactoring: use generic reloc constants"

Browse Source 
* commit 'a23569c9485d50e9184dcc7d97640140015b3f3d':
  Refactoring: use generic reloc constants
This commit is contained in:
Dmitriy Ivanov
2015-01-14 12:00:19 +00:00
committed by Android Git Automerger
parent 5bff8a2337 a23569c948
commit 47a32828c2
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
linker/linker.cpp
View File

@@ -1320,29 +1320,25 @@ int soinfo::relocate(ElfW(Rela)* rela, unsigned count, const soinfo_list_t& glob
*/
switch (type) {
case R_GENERIC_JUMP_SLOT:
case R_GENERIC_GLOB_DAT:
case R_GENERIC_RELATIVE:
case R_GENERIC_IRELATIVE:
#if defined(__aarch64__)
case R_AARCH64_JUMP_SLOT:
case R_AARCH64_GLOB_DAT:
case R_AARCH64_ABS64:
case R_AARCH64_ABS32:
case R_AARCH64_ABS16:
case R_AARCH64_RELATIVE:
case R_AARCH64_IRELATIVE:
#elif defined(__x86_64__)
case R_X86_64_32:
case R_X86_64_64:
#endif
/*
* The sym_addr was initialized to be zero above, or the relocation
* code below does not care about value of sym_addr.
* No need to do anything.
*/
break;
#elif defined(__x86_64__)
case R_X86_64_JUMP_SLOT:
case R_X86_64_GLOB_DAT:
case R_X86_64_32:
case R_X86_64_64:
case R_X86_64_RELATIVE:
case R_X86_64_IRELATIVE:
// No need to do anything.
break;
#if defined(__x86_64__)
case R_X86_64_PC32:
sym_addr = reloc;
break;
@@ -1591,11 +1587,6 @@ int soinfo::relocate(ElfW(Rel)* rel, unsigned count, const soinfo_list_t& global
sym_addr = reloc;
break;
#endif
#if defined(__arm__)
case R_ARM_COPY:
// Fall through. Can't really copy if weak symbol is not found at run-time.
#endif
default:
DL_ERR("unknown weak reloc type %d @ %p (%zu)", type, rel, idx);
return -1;