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

* commit '45c1baf1ad7cc5e31a09cd11740846a0ba69041c':
  Add R_X86_64_64 to the list of possible weak relocs
This commit is contained in:
Dmitriy Ivanov 2014-05-20 20:17:55 +00:00 committed by Android Git Automerger
commit a67d3168b9

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;