* elflink.c (elf_link_add_object_symbols): Return via

	error_free_vers on "notice" failure.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 57e5eb5cad99aced67a8c0aff479d7e1369a8845..be0ad302441b50e5c53a302b657d5b1574d40b45 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-06  Michael Snyder  <msnyder@access-company.com>
+
+       * elflink.c (elf_link_add_object_symbols): Return via
+       error_free_vers on "notice" failure.
+
 2007-07-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        * peicode.h (pe_bfd_object_p): Don't check PE vs. EFI target
@@ -6,7 +11,7 @@
 2007-07-04  Nick Clifton  <nickc@redhat.com>
 
        Import this patch from an internal tree:
-       
+
        2001-07-17  Richard Henderson  <rth@redhat.com>
 
        * elf32-mep.c (mep_final_link_relocate) [R_MEP_HI16S]: Correctly

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 82016e6855f1dece5ed93d18b4c3660768d89bf4..4de73a059a8d0a3b8520facbe51e426b352004f6 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -3674,8 +3674,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
         tell it that we are about to handle an as-needed lib.  */
       if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
                                       notice_as_needed))
-       return FALSE;
-
+       goto error_free_vers;
 
       /* Clone the symbol table and sym hashes.  Remember some
         pointers into the symbol table, and dynamic symbol count.  */
@@ -4382,7 +4381,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
         tell it that symbols added for crefs may need to be removed.  */
       if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
                                       notice_not_needed))
-       return FALSE;
+       goto error_free_vers;
 
       free (old_tab);
       objalloc_free_block ((struct objalloc *) htab->root.table.memory,
@@ -4396,7 +4395,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
     {
       if (!(*info->callbacks->notice) (info, NULL, abfd, NULL,
                                       notice_needed))
-       return FALSE;
+       goto error_free_vers;
       free (old_tab);
       old_tab = NULL;
     }