* elfcode.h (elf_object_p): Delay the setting of start_address

	until we're sure the backend matches the binary.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57ba88a73ce311693e52c90f7597c9f787a1c0c7..866466c76d93d4989c039856af913cfefd6d6813 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-23  Frederic Riss  <frederic.riss@st.com>
+
+       * elfcode.h (elf_object_p): Delay the setting of start_address
+       until we're sure the backend matches the binary.
+
 2005-11-20  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
        * som.c (som_decode_symclass): Decode BSF_WEAK symbols in the same

diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index 0ee50d740c34743065358d8c2dcf92e219b27ec2..f7f85ba2056cd786e90fa68413bb7d356a05a51c 100644 (file)
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -607,9 +607,6 @@ elf_object_p (bfd *abfd)
        goto got_no_match;
     }
 
-  /* Remember the entry point specified in the ELF file header.  */
-  bfd_set_start_address (abfd, i_ehdrp->e_entry);
-
   if (i_ehdrp->e_shoff != 0)
     {
       bfd_signed_vma where = i_ehdrp->e_shoff;
@@ -804,6 +801,9 @@ elf_object_p (bfd *abfd)
        goto got_wrong_format_error;
     }
 
+  /* Remember the entry point specified in the ELF file header.  */
+  bfd_set_start_address (abfd, i_ehdrp->e_entry);
+
   /* If we have created any reloc sections that are associated with
      debugging sections, mark the reloc sections as debugging as well.  */
   for (s = abfd->sections; s != NULL; s = s->next)