[PATCH] Fix a ppc64 make check failure

Jakub Jelinek jakub@redhat.com
Sat Mar 27 06:29:00 GMT 2004


Hi!

Current CVS fails the
Running /usr/src/build/381510-ppc64/BUILD/binutils-2.15.90.0.1.1/binutils/testsuite/binutils-all/objcopy.exp ...
Version /usr/src/build/381510-ppc64/BUILD/binutils-2.15.90.0.1.1/build-ppc64-redhat-linux/binutils/objcopy 20040326
FAIL: run stripped executable with saving a symbol
test on ppc64.  nm outputs address D main while the test expected address T main.
This uses the same regex as is used in another place in objcopy.exp.
Ok to commit?

2004-03-26  Jakub Jelinek  <jakub@redhat.com>

	* binutils-all/objcopy.exp: Accept main as a data symbol as well.

--- binutils/testsuite/binutils-all/objcopy.exp.jj	2004-03-03 18:44:02.000000000 +0100
+++ binutils/testsuite/binutils-all/objcopy.exp	2004-03-26 18:42:40.343978722 +0100
@@ -613,8 +613,8 @@ proc strip_executable_with_saving_a_symb
 	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]} {
+    if {![regexp {^([0-9a-fA-F]+)?[ ]+[TD] main} $exec_output] \
+         && ![regexp {^([0-9a-fA-F]+)?[ ]+[TD] _main} $exec_output]} {
 	fail $test
 	return
     }

	Jakub



More information about the Binutils mailing list