From ab7be2df2ab9fca2e19916e612433b63b0c87a08 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 22 Apr 2003 15:00:02 +0000 Subject: [PATCH] 2003-04-22 H.J. Lu * ld-elfcomm/elfcomm.exp: Support 64bit targets. --- 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 ec6c50c4ff..66c2049a2b 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-04-22 H.J. Lu + + * ld-elfcomm/elfcomm.exp: Support 64bit targets. + 2003-04-21 Stephane Carrez * ld-m68hc11/far-hc11.s: New file. diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index a205f566c3..37e5ede0f9 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -40,7 +40,7 @@ proc dump_common1 { testname } { send_log "readelf -s tmpdir/common1.o | grep foo\n" catch "exec readelf -s tmpdir/common1.o | grep foo" exec_output if { ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)80(\[ \]+)4(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)COM(\[ \]+)foo2" $exec_output] - || ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0\]*)1(\[ \]+)21(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)foo1" $exec_output] } { + || ![regexp "(\[ \]*)(\[0-9\]+):(\[ \]*)(\[0-9\]+)(\[ \]+)21(\[ \]+)OBJECT(\[ \]+)GLOBAL(\[ \]+)DEFAULT(\[ \]+)(\[0-9\]+)(\[ \]+)foo1" $exec_output] } { send_log "$exec_output\n" verbose $exec_output fail $testname @@ -65,7 +65,7 @@ if { [ld_simple_link $ld tmpdir/common1.o "-r tmpdir/common1a.o tmpdir/common1b. return } -if { ![regexp "Warning: alignment 1 of symbol \`foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] +if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] || ![regexp "Warning: size of symbol \`foo1\' changed from 2 in tmpdir/common1a.o to 21 in tmpdir/common1b.o" $link_output] } { fail "$test1 (warning 1)" } else { @@ -81,7 +81,7 @@ if { [ld_simple_link $ld tmpdir/common1.o "-r tmpdir/common1b.o tmpdir/common1a. return } -if { ![regexp "Warning: alignment 1 of symbol \`foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] } { +if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] } { fail "$test1 (warning 2)" } else { pass "$test1 (warning 2)"