* ldlang.c (wild_sort): Formatting.

	(strip_excluded_output_sections): Strip zero size sections here.
	* emultempl/elf32.em (gld*_strip_empty_sections): Delete.
	(gld*_finish): Don't call the above.
	* emultempl/hppaelf.em (hppaelf_finish): Likewise.
	* emultempl/ppc64elf.em (ppc_finish): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 864a524b97c246df4cf51e6c3dca3b0aaddf37c7..61438178d7770c3e1a6c1c7fe50931f1b3bdee8f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-08  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldlang.c (wild_sort): Formatting.
+       (strip_excluded_output_sections): Strip zero size sections here.
+       * emultempl/elf32.em (gld*_strip_empty_sections): Delete.
+       (gld*_finish): Don't call the above.
+       * emultempl/hppaelf.em (hppaelf_finish): Likewise.
+       * emultempl/ppc64elf.em (ppc_finish): Likewise.
+
 2005-07-05  Paul Brook  <paul@codesourcery.com>
 
        * Makefile.am (ALL_EMULATIONS): Add eelf32ppcvxworks.o.

diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 9248c30bb76a6a72a922e95e3d01c4a936f2b5c1..da7af0bf38935004c1db62a87858cd5835eb4efa 100644 (file)
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -61,7 +61,6 @@ static void gld${EMULATION_NAME}_before_allocation (void);
 static bfd_boolean gld${EMULATION_NAME}_place_orphan
   (lang_input_statement_type *file, asection *s);
 static void gld${EMULATION_NAME}_layout_sections_again (void);
-static void gld${EMULATION_NAME}_strip_empty_sections (void);
 static void gld${EMULATION_NAME}_provide_init_fini_syms (void);
 static void gld${EMULATION_NAME}_finish (void) ATTRIBUTE_UNUSED;
 
@@ -1506,41 +1505,12 @@ gld${EMULATION_NAME}_layout_sections_again (void)
   lang_do_assignments ();
 }
 
-static void
-gld${EMULATION_NAME}_strip_empty_sections (void)
-{
-  if (!link_info.relocatable)
-    {
-      lang_output_section_statement_type *os;
-
-      for (os = &lang_output_section_statement.head->output_section_statement;
-          os != NULL;
-          os = os->next)
-       {
-         asection *s;
-
-         if (os == abs_output_section || os->constraint == -1)
-           continue;
-         s = os->bfd_section;
-         if (s != NULL
-             && s->size == 0
-             && (s->flags & SEC_KEEP) == 0
-             && !bfd_section_removed_from_list (output_bfd, s))
-           {
-             bfd_section_list_remove (output_bfd, s);
-             output_bfd->section_count--;
-           }
-       }
-    }
-}
-
 static void
 gld${EMULATION_NAME}_finish (void)
 {
   if (bfd_elf_discard_info (output_bfd, &link_info))
     gld${EMULATION_NAME}_layout_sections_again ();
 
-  gld${EMULATION_NAME}_strip_empty_sections ();
   gld${EMULATION_NAME}_provide_init_fini_syms ();
 }
 EOF

diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index 5e91fb66fe2592d9a7d6810a341bc49d35a888d9..96a98ed2b3bd7ff5278972e5999c3c016eeec14b 100644 (file)
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -305,7 +305,6 @@ hppaelf_finish (void)
        }
     }
 
-  gld${EMULATION_NAME}_strip_empty_sections ();
   gld${EMULATION_NAME}_provide_init_fini_syms ();
 }
 

diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
index 6eea93dd66960011318d9bb7fb9b9c0ecc268aa6..483d381252365de9afdd00bc6cdddcb6b5ece515 100644 (file)
--- a/ld/emultempl/ppc64elf.em
+++ b/ld/emultempl/ppc64elf.em
@@ -379,7 +379,6 @@ ppc_finish (void)
     }
 
   ppc64_elf_restore_symbols (&link_info);
-  gld${EMULATION_NAME}_strip_empty_sections ();
   gld${EMULATION_NAME}_provide_init_fini_syms ();
 }
 

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 4f9569f42ac5cb06abbed656881a74368514320a..ce178f18408f72e6138cffe3c03b472419e8cf29 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1960,11 +1960,8 @@ wild_sort (lang_wild_statement_type *wild,
         looking at the sections for this file.  */
 
       if (sec != NULL && sec->spec.sorted != none)
-       {
-         if (compare_section (sec->spec.sorted, section,
-                              ls->section) < 0)
-           break;
-       }
+       if (compare_section (sec->spec.sorted, section, ls->section) < 0)
+         break;
     }
 
   return l;
@@ -3086,39 +3083,40 @@ strip_excluded_output_sections (void)
       if (output_section == NULL)
        continue;
 
-      exclude = TRUE;
-      if (output_section->map_head.s != NULL)
+      exclude = (output_section->rawsize == 0
+                && (output_section->flags & SEC_KEEP) == 0
+                && !bfd_section_removed_from_list (output_bfd,
+                                                   output_section));
+
+      /* Some sections have not yet been sized, notably .gnu.version,
+        .dynsym, .dynstr and .hash.  These all have SEC_LINKER_CREATED
+        input sections, so don't drop output sections that have such
+        input sections unless they are also marked SEC_EXCLUDE.  */
+      if (exclude && output_section->map_head.s != NULL)
        {
          asection *s;
 
-         for (s = output_section->map_head.s; s != NULL;
-              s = s->map_head.s)
-           if ((s->flags & SEC_EXCLUDE) == 0)
+         for (s = output_section->map_head.s; s != NULL; s = s->map_head.s)
+           if ((s->flags & SEC_LINKER_CREATED) != 0
+               && (s->flags & SEC_EXCLUDE) == 0)
              {
                exclude = FALSE;
                break;
              }
-
-         output_section->map_head.link_order = NULL;
-         output_section->map_tail.link_order = NULL;
        }
 
-      if (exclude
-         && (output_section->flags & SEC_KEEP) == 0
-         && output_section->rawsize == 0
-         && !bfd_is_abs_section (output_section))
+      /* TODO: Don't just junk map_head.s, turn them into link_orders.  */
+      output_section->map_head.link_order = NULL;
+      output_section->map_tail.link_order = NULL;
+
+      if (exclude)
        {
          /* We don't set bfd_section to NULL since bfd_section of the
             removed output section statement may still be used.  */
          os->ignored = TRUE;
          output_section->flags |= SEC_EXCLUDE;
-
-         if (!bfd_section_removed_from_list (output_bfd,
-                                             output_section))
-           {
-             bfd_section_list_remove (output_bfd, output_section);
-             output_bfd->section_count--;
-           }
+         bfd_section_list_remove (output_bfd, output_section);
+         output_bfd->section_count--;
        }
     }