diff --git a/ld/ChangeLog b/ld/ChangeLog
index dce7055aaf..0b7d0d41ed 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_finish): Don't set
+	bfd_section when removing unused empty output sections for
+	non-relocatable link.
+
 2005-03-19  Alan Modra  <amodra@bigpond.net.au>
 
 	* ldlang.c (lang_insert_orphan): Use old section_tail rather than
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index d8309597ea..1acedb456b 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1459,8 +1459,6 @@ gld${EMULATION_NAME}_finish (void)
 	    {
 	      asection **p;
 
-	      os->bfd_section = NULL;
-
 	      for (p = &output_bfd->sections; *p; p = &(*p)->next)
 		if (*p == s)
 		  {