Revert last change.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 8d844655a3deebbb9ba680ba57d09bed5a5b8f02..b196c23afefbf997083d9eb19ead318b3871efcb 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+       * nm.c: Revert last change.
+
 2002-08-26  Alan Modra  <amodra@bigpond.net.au>
 
        * nm.c (display_rel_file): Don't report "no symbols" as an error.

diff --git a/binutils/nm.c b/binutils/nm.c
index c3f2729b749f546752feb7521ea5614a61fc4d2d..62bc2b46198e20b48f96e7fe9cc0f4b6f94fda84 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -955,7 +955,10 @@ display_rel_file (abfd, archive_bfd)
   if (! dynamic)
     {
       if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
-       return;
+       {
+         non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+         return;
+       }
     }
 
   symcount = bfd_read_minisymbols (abfd, dynamic, &minisyms, &size);
@@ -963,7 +966,10 @@ display_rel_file (abfd, archive_bfd)
     bfd_fatal (bfd_get_filename (abfd));
 
   if (symcount == 0)
-    return;
+    {
+      non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+      return;
+    }
 
   /* Discard the symbols we don't want to print.
      It's OK to do this in place; we'll free the storage anyway

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index aa768cb62992229d479146fa65c60af951dbc545..7034c1fc9f4e39dea1fbdc62049ee7e939b6ff2b 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+       * binutils-all/objcopy.exp: Revert last change.
+
 2002-08-26  Alan Modra  <amodra@bigpond.net.au>
 
        * binutils-all/objcopy.exp (strip_test): Adjust for "no symbols" on

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index ad92c0da8ad11bd8812c88d8b0d5b4d1d95c8b1c..e36f14edb0fa4a4326f9d45a469dad3ed2ffcd7d 100644 (file)
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -371,7 +371,7 @@ proc strip_test { } {
     }
 
     set exec_output [binutils_run $NM "-a $NMFLAGS $objfile"]
-    if ![string match "" $exec_output] {
+    if ![string match "*: no symbols*" $exec_output] {
        fail $test
        return
     }
@@ -558,7 +558,7 @@ proc strip_executable { prog flags test } {
     }
 
     set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
-    if ![string match "" $exec_output] {
+    if ![string match "*: no symbols*" $exec_output] {
        fail $test
        return
     }

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a1ef5783da052f668f7f2759f5329d48891f726c..2c4a7717252398da594df8f9f9cbc34da7255649 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-27  Alan Modra  <amodra@bigpond.net.au>
+
+       * ld-mmix/b-nosym.d: Revert last change.
+
 2002-08-26  Alan Modra  <amodra@bigpond.net.au>
 
        * ld-mmix/b-nosym.d: Adjust for "no symbols" on stdout.

diff --git a/ld/testsuite/ld-mmix/b-nosym.d b/ld/testsuite/ld-mmix/b-nosym.d
index 0d4531fc47719d03815a960b6fccaecc3e0957b5..9c00d716094e697d2a1499e2f91947185adbb1a9 100644 (file)
--- a/ld/testsuite/ld-mmix/b-nosym.d
+++ b/ld/testsuite/ld-mmix/b-nosym.d
@@ -3,13 +3,13 @@
 #source: b-nosym.s
 #ld: --oformat binary
 #objcopy_linked_file:
-#objdump: -st
+#objdump: -st 2>/dev/null
 
-.*:     file format mmo
-
-SYMBOL TABLE:
-no symbols
+# Note that we have to redirect stderr when objdumping to get rid of the
+# "no symbols" message that would otherwise cause a spurious failure and
+# which we seemingly can't identify or prune in another way.
 
+.*:     file format mmo
 
 Contents of section \.text:
  0000 e3fd0001 e3fd0004                    .*