From c89583f83f25ee43b9c60220a81914d78a1e9916 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 16 Jul 2002 09:00:42 +0000 Subject: [PATCH] * elflink.h (elf_link_input_bfd): Don't call reloc_emitter when reloc section size is zero. Correct reloc output location. --- bfd/ChangeLog | 5 +++++ bfd/elflink.h | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f0942206bcf..796858d2f46 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2002-07-16 Alan Modra + + * elflink.h (elf_link_input_bfd): Don't call reloc_emitter when + reloc section size is zero. Correct reloc output location. + 2002-07-16 John David Anglin * elf-hppa.h (elf_hppa_reloc_final_type): Use R_PARISC_PCREL16F as diff --git a/bfd/elflink.h b/bfd/elflink.h index 7fa2ccb0474..8d2e1e6de3a 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -6945,7 +6945,7 @@ elf_link_input_bfd (finfo, input_bfd) Elf_Internal_Rela *irela; Elf_Internal_Rela *irelaend; struct elf_link_hash_entry **rel_hash; - Elf_Internal_Shdr *input_rel_hdr; + Elf_Internal_Shdr *input_rel_hdr, *input_rel_hdr2; unsigned int next_erel; boolean (*reloc_emitter) PARAMS ((bfd *, asection *, Elf_Internal_Shdr *, @@ -7115,16 +7115,17 @@ elf_link_input_bfd (finfo, input_bfd) else reloc_emitter = elf_link_output_relocs; - if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr, - internal_relocs)) + if (input_rel_hdr->sh_size != 0 + && ! (*reloc_emitter) (output_bfd, o, input_rel_hdr, + internal_relocs)) return false; - input_rel_hdr = elf_section_data (o)->rel_hdr2; - if (input_rel_hdr) + input_rel_hdr2 = elf_section_data (o)->rel_hdr2; + if (input_rel_hdr2 && input_rel_hdr2->sh_size != 0) { internal_relocs += (NUM_SHDR_ENTRIES (input_rel_hdr) * bed->s->int_rels_per_ext_rel); - if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr, + if (! (*reloc_emitter) (output_bfd, o, input_rel_hdr2, internal_relocs)) return false; } -- 2.30.2