diff --git a/ld/ChangeLog b/ld/ChangeLog
index 81519124fb..dab46921e0 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-15  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/3107
+	* ldlang.c (lang_size_sections_1): Do not abort when encountering
+	a non-empty section that is ignored.  Instead produce a warning
+	message.
+
 2006-09-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld.texinfo: Document --dynamic-list-cpp-typeinfo.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index bd9fd89a52..8b6cbd2d64 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4367,7 +4367,18 @@ lang_size_sections_1
 	    os->processed_vma = TRUE;
 
 	    if (bfd_is_abs_section (os->bfd_section) || os->ignored)
-	      ASSERT (os->bfd_section->size == 0);
+	      {
+		if (os->bfd_section->size > 0)
+		  {
+		    /* PR ld/3107:  Do not abort when a buggy linker script
+		       causes a non-empty section to be discarded.  */
+		    if (bfd_is_abs_section (os->bfd_section))
+		      einfo (_("%P%X: internal error: attempting to take the size of the non-section *ABS*\n"));
+		    else
+		      einfo (_("%P: warning: discarding non-empty, well known section %A\n"),
+			     os->bfd_section);
+		  }
+	      }
 	    else
 	      {
 		dot = os->bfd_section->vma;