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

* commit 'f092feb81b36d024a3da4318a340e069ca1c2d3d': Add R_X86_64_64 to the list of possible weak relocs
2014-05-20 19:16:50 +00:00
parent 5277e7726f f092feb81b
commit 87ce52ac08
1 changed files with 1 additions and 0 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -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_GLOB_DAT:
        case R_X86_64_32:
+        case R_X86_64_64:
        case R_X86_64_RELATIVE:
          // No need to do anything.
          break;