am 87ce52ac: am f092feb8: Merge "Add R_X86_64_64 to the list of possible weak relocs"

* commit '87ce52ac08dd43bed0ceb16f284d5f73f40c7804':
  Add R_X86_64_64 to the list of possible weak relocs
This commit is contained in:
Dmitriy Ivanov 2014-05-20 19:19:53 +00:00 committed by Android Git Automerger
commit 45c1baf1ad

View File

@ -912,6 +912,7 @@ static int soinfo_relocate(soinfo* si, ElfW(Rela)* rela, unsigned count, soinfo*
case R_X86_64_JUMP_SLOT: case R_X86_64_JUMP_SLOT:
case R_X86_64_GLOB_DAT: case R_X86_64_GLOB_DAT:
case R_X86_64_32: case R_X86_64_32:
case R_X86_64_64:
case R_X86_64_RELATIVE: case R_X86_64_RELATIVE:
// No need to do anything. // No need to do anything.
break; break;