From 5c8178309791120badd1a8d5a5223a0fcc29e85a Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 28 Mar 2008 01:12:56 +0000 Subject: [PATCH] * ld-elfcomm/elfcomm.exp: Run $READELF not readelf. --- ld/testsuite/ChangeLog | 4 ++++ ld/testsuite/ld-elfcomm/elfcomm.exp | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index d6eddb3..325ffd7 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2008-03-28 Joseph Myers + + * ld-elfcomm/elfcomm.exp: Run $READELF not readelf. + 2008-03-26 Daniel Jacobowitz * ld-elf/flags1.d: Adjust for MIPS text alignment. diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index 400dcad..f7de6fc 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -54,7 +54,7 @@ proc dump_common1 { testname } { global READELF send_log "$READELF --syms tmpdir/common1.o | grep foo\n" - set exec_output [run_host_cmd "readelf" "--syms tmpdir/common1.o | grep foo"] + set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common1.o | grep foo"] if { ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)80(\[ \]+)4(\[ \]+)(COMMON|OBJECT)(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(PRC\\\[0xff03\\\]|COM|SCOM)(\[ \]+)_?foo2" $exec_output] || ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0-9\]+)(\[ \]+)21(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)_?foo1" $exec_output] } { @@ -79,7 +79,7 @@ proc stt_common_test { options testname } { } send_log "$READELF --syms tmpdir/common.exe | grep foo\n" - set exec_output [run_host_cmd "readelf" "--syms tmpdir/common.exe | grep foo"] + set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common.exe | grep foo"] if {![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0-9\]+)(\[ \]+)(\[0-9\]+)(\[ \]+)COMMON(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)_?foo2" $exec_output] } { fail $testname @@ -96,7 +96,7 @@ proc assembler_generates_commons {} { global READELF verbose "Check to see if STT_COMMON symbols are being generated:" - set exec_output [run_host_cmd "readelf" "--syms tmpdir/common1a.o | grep foo"] + set exec_output [run_host_cmd "$READELF" "--syms tmpdir/common1a.o | grep foo"] if { ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)80(\[ \]+).(\[ \]+)COMMON(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(PRC\\\[0xff03\\\]|COM|SCOM)(\[ \]+)_?foo2" $exec_output] } { verbose "STT_COMMON not generated" -- 2.7.4