* binutils-all/objcopy.exp

	(strip_executable_with_saving_a_symbol): Prune symbol Main in nm
	output for mmix-knuth-mmixware.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 59afb23..7e221cd 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-17  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       * binutils-all/objcopy.exp
+       (strip_executable_with_saving_a_symbol): Prune symbol Main in nm
+       output for mmix-knuth-mmixware.
+
 2002-02-13  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * binutils-all/readelf.ss-mips: Do not expect an explicit

diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp
index 22efb5d..470b369 100644 (file)
--- a/binutils/testsuite/binutils-all/objcopy.exp
+++ b/binutils/testsuite/binutils-all/objcopy.exp
@@ -596,6 +596,15 @@ proc strip_executable_with_saving_a_symbol { prog flags test } {
     }
 
     set exec_output [binutils_run $NM "$NMFLAGS ${copyfile}"]
+    if { [istarget mmix-knuth-mmixware] } {
+       # Whenever there's a symbol in the mmo format, there's the symbol
+       # Main, so remove it manually from the expected output for sake of
+       # this test.
+
+       # Using "" not {} to get the \n and \r translated.
+       regsub "^\[0-9a-fA-F\]+\[ \]+T Main\[\n\r\]+" $exec_output "" exec_output
+    }
+
     if {![regexp {^[0-9a-fA-F]+ T main} $exec_output] \
          && ![regexp {^[0-9a-fA-F]+ T _main} $exec_output]} {
        fail $test