diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7648d414509..03eb8d8d506 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -2,6 +2,8 @@
 
 	* aoutx.h (NAME(aout,find_nearest_line)): Correct case for N_SO
 	being the last symbol.
+	(aout_link_add_symbols): Just return TRUE if a warning
+	symbol was last.
 
 2005-02-07  Maciej W. Rozycki  <macro@mips.com>
 
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index beb63f9b1f6..ab3eb67bcd9 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -3430,8 +3430,9 @@ aout_link_add_symbols (abfd, info)
 	  break;
 	case N_WARNING:
 	  /* A warning symbol.  The next symbol is the one to warn
-	     about.  */
-	  BFD_ASSERT (p + 1 < pend);
+	     about.  If there is no next symbol, just look away.  */
+	  if (p + 1 >= pend)
+	    return TRUE;
 	  ++p;
 	  string = name;
 	  name = strings + GET_WORD (abfd, p->e_strx);