| commit | f092feb81b36d024a3da4318a340e069ca1c2d3d | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Tue May 20 19:11:25 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 20 19:11:25 2014 +0000 |
| tree | 56f0685c9b77818e4978e61eb120ff1a09204c36 | |
| parent | 0a8f296e09c34a8eb21099d2a49e70b1b2641faa [diff] | |
| parent | bb5bb2046fa0759d94995cbfb4f41137cd0b2a91 [diff] |
Merge "Add R_X86_64_64 to the list of possible weak relocs"
diff --git a/linker/linker.cpp b/linker/linker.cpp index 881bcc2..9f458b4 100644 --- a/linker/linker.cpp +++ b/linker/linker.cpp
@@ -912,6 +912,7 @@ 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;