diff options
| author | Alan Modra <amodra@gmail.com> | 2002-08-26 23:15:48 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2002-08-26 23:15:48 +0000 |
| commit | 68a4c07345e6cf85d8b6fbe0d846028ed48f0dba (patch) | |
| tree | 3cceca06530f3a03669b68a957c30f08d65fab03 | |
| parent | 55970da69c7cafed0c307890835bce67a8a41434 (diff) | |
| download | fsf-binutils-gdb-68a4c07345e6cf85d8b6fbe0d846028ed48f0dba.zip fsf-binutils-gdb-68a4c07345e6cf85d8b6fbe0d846028ed48f0dba.tar.gz fsf-binutils-gdb-68a4c07345e6cf85d8b6fbe0d846028ed48f0dba.tar.bz2 | |
Revert last change.
| -rw-r--r-- | binutils/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/nm.c | 10 | ||||
| -rw-r--r-- | binutils/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | binutils/testsuite/binutils-all/objcopy.exp | 4 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-mmix/b-nosym.d | 10 |
6 files changed, 27 insertions, 9 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 8d84465..b196c23 100644 --- 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 c3f2729..62bc2b4 100644 --- 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 aa768cb..7034c1f 100644 --- 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 ad92c0d..e36f14e 100644 --- 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 a1ef578..2c4a771 100644 --- 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 0d4531f..9c00d71 100644 --- 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 .* |