From 74463eb954bf7c579915ea2becdc1483359dacfc Mon Sep 17 00:00:00 2001 From: Michael Matz Date: Tue, 14 Nov 2017 16:43:22 +0100 Subject: [PATCH] Revert "gen_addrpc32: absolute ptr needs *ABS* relocation" This reverts commit 870271ea071971002fa556e09e1873db316fa1a9. The commit is broken, you can't unconditionally emit a PC-relative relocation without a symbol. And if there's a symbol the addend need to be in the relocation, not the section. --- x86_64-gen.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x86_64-gen.c b/x86_64-gen.c index f4d86e1..4d063cb 100644 --- a/x86_64-gen.c +++ b/x86_64-gen.c @@ -257,7 +257,8 @@ ST_FUNC void gen_addr64(int r, Sym *sym, int64_t c) /* output constant with relocation if 'r & VT_SYM' is true */ ST_FUNC void gen_addrpc32(int r, Sym *sym, int c) { - greloca(cur_text_section, sym, ind, R_X86_64_PC32, 0); + if (r & VT_SYM) + greloca(cur_text_section, sym, ind, R_X86_64_PC32, c-4), c=4; gen_le32(c-4); }