From fd984e46b6590664ac6914e31f1dfc66d2efb113 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 6 May 2002 08:54:44 +0000 Subject: [PATCH] * elflink.h (elf_link_input_bfd ): Adjust r_offset when not relocatable. Fix reloc_emitter call for K&R. --- bfd/elflink.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bfd/elflink.h b/bfd/elflink.h index 06035b31be..37b2150969 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -6776,7 +6776,7 @@ elf_link_input_bfd (finfo, input_bfd) irela->r_offset += o->output_offset; /* Relocs in an executable have to be virtual addresses. */ - if (finfo->info->emitrelocations) + if (!finfo->info->relocateable) irela->r_offset += o->output_section->vma; r_symndx = ELF_R_SYM (irela->r_info); @@ -6908,7 +6908,8 @@ elf_link_input_bfd (finfo, input_bfd) { internal_relocs += (NUM_SHDR_ENTRIES (input_rel_hdr) * bed->s->int_rels_per_ext_rel); - reloc_emitter (output_bfd, o, input_rel_hdr, internal_relocs); + (*reloc_emitter) (output_bfd, o, input_rel_hdr, + internal_relocs); } }