* elflink.h (elf_link_input_bfd): Don't call reloc_emitter when

	reloc section size is zero.  Correct reloc output location.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f0942206bcffd316282e97c5115e654306d6baa3..796858d2f46841b4ed3c69980ecf379bf4005c54 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-16  Alan Modra  <amodra@bigpond.net.au>
+
+       * 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  <dave@hiauly1.hia.nrc.ca>
 
        * elf-hppa.h (elf_hppa_reloc_final_type): Use R_PARISC_PCREL16F as

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 7fa2ccb04743835cd038b73836cf987afd89453e..8d2e1e6de3a2c3f32b1852ec5ce77e61cab56519 100644 (file)
--- 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;
                }