2002-06-07 Chris Demetriou <cgd@broadcom.com>

[deliverable/binutils-gdb.git] / bfd / merge.c

diff --git a/bfd/merge.c b/bfd/merge.c
index 150e9365f2dc6ee36c8cdf0908c68de19887fdec..9af93b0f1a9f8f4d3e2b3eea620ca8e664c69195 100644 (file)
--- a/bfd/merge.c
+++ b/bfd/merge.c
@@ -1,22 +1,22 @@
 /* SEC_MERGE support.
-   Copyright 2001 Free Software Foundation, Inc.
+   Copyright 2001, 2002 Free Software Foundation, Inc.
    Written by Jakub Jelinek <jakub@redhat.com>.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* This file contains support for merging duplicate entities within sections,
    as used in ELF SHF_MERGE.  */
@@ -25,8 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 #include "libbfd.h"
 #include "hashtab.h"
-
-#include <ctype.h>
+#include "libiberty.h"
 
 struct sec_merge_sec_info;
 
@@ -40,7 +39,8 @@ struct sec_merge_hash_entry
   /* Start of this string needs to be aligned to
      alignment octets (not 1 << align).  */
   unsigned int alignment;
-  union {
+  union
+  {
     /* Index within the merged section.  */
     bfd_size_type index;
     /* Entity size (if present in suffix hash tables).  */
@@ -146,7 +146,7 @@ sec_merge_hash_newfunc (entry, table, string)
       ret->next = NULL;
     }
 
-  return (struct bfd_hash_entry *)ret;
+  return (struct bfd_hash_entry *) ret;
 }
 
 /* Look up an entry in a section merge hash table.  */
@@ -773,9 +773,10 @@ alloc_failure:
    with _bfd_merge_section.  */
 
 boolean
-_bfd_merge_sections (abfd, xsinfo)
+_bfd_merge_sections (abfd, xsinfo, remove_hook)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR xsinfo;
+     void (*remove_hook) PARAMS((bfd *, asection *));
 {
   struct sec_merge_info *sinfo;
 
@@ -794,13 +795,20 @@ _bfd_merge_sections (abfd, xsinfo)
       /* Record the sections into the hash table.  */
       for (secinfo = sinfo->chain; secinfo; secinfo = secinfo->next)
        if (secinfo->sec->flags & SEC_EXCLUDE)
-         *secinfo->psecinfo = NULL;
+         {
+           *secinfo->psecinfo = NULL;
+           if (remove_hook)
+             (*remove_hook) (abfd, secinfo->sec);
+         }
        else if (! record_section (sinfo, secinfo))
          break;
 
       if (secinfo)
        continue;
 
+      if (sinfo->htab->first == NULL)
+       continue;
+
       if (sinfo->htab->strings)
        merge_strings (sinfo);
       else
@@ -889,9 +897,11 @@ _bfd_merged_section_offset (output_bfd, psec, psecinfo, offset, addend)
   if (offset + addend >= sec->_raw_size)
     {
       if (offset + addend > sec->_raw_size)
-       (*_bfd_error_handler) (_("%s: access beyond end of merged section (%ld + %ld)"),
-                              bfd_get_filename (sec->owner), (long)offset,
-                              (long) addend);
+       {
+         (*_bfd_error_handler)
+           (_("%s: access beyond end of merged section (%ld + %ld)"),
+            bfd_get_filename (sec->owner), (long) offset, (long) addend);
+       }
       return (secinfo->first ? sec->_cooked_size : 0);
     }