diff options
Diffstat (limited to 'ld/amd64.c')
-rw-r--r-- | ld/amd64.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -35,7 +35,7 @@ #include "ld_utils.h" #include "amd64.h" -ELFTC_VCSID("$Id: amd64.c 2963 2013-08-25 17:29:54Z kaiwang27 $"); +ELFTC_VCSID("$Id: amd64.c 3390 2016-02-05 16:15:58Z emaste $"); static void _create_plt_reloc(struct ld *ld, struct ld_symbol *lsb, uint64_t offset); @@ -115,7 +115,7 @@ _reloc2str(uint64_t r) case 4: return "R_X86_64_PLT32"; case 5: return "R_X86_64_COPY"; case 6: return "R_X86_64_GLOB_DAT"; - case 7: return "R_X86_64_JMP_SLOT"; + case 7: return "R_X86_64_JUMP_SLOT"; case 8: return "R_X86_64_RELATIVE"; case 9: return "R_X86_64_GOTPCREL"; case 10: return "R_X86_64_32"; @@ -133,7 +133,7 @@ _reloc2str(uint64_t r) case 22: return "R_X86_64_GOTTPOFF"; case 23: return "R_X86_64_TPOFF32"; default: - snprintf(s, sizeof(s), "<unkown: %ju>", r); + snprintf(s, sizeof(s), "<unkown: %ju>", (uintmax_t) r); return (s); } } @@ -268,12 +268,11 @@ static void _reserve_gotplt_entry(struct ld *ld, struct ld_symbol *lsb) { struct ld_input_section *is; - uint64_t off; is = _find_and_create_gotplt_section(ld, 1); /* Reserve a GOT entry for PLT. */ - off = ld_input_reserve_ibuf(is, 1); + (void) ld_input_reserve_ibuf(is, 1); /* * Record a R_X86_64_JUMP_SLOT entry for this symbol. Note that |