From 674e82fc127e4cd6bcdfea02536b839320e80db8 Mon Sep 17 00:00:00 2001 From: Thiemo Seufer Date: Mon, 18 Sep 2006 14:41:10 +0000 Subject: [PATCH] * ld-elfcomm/elfcomm.exp: Enable the alignment test for mips*-*-*. --- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-elfcomm/elfcomm.exp | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 10cb5f2..2bdeb12 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-09-18 Thiemo Seufer + + * ld-elfcomm/elfcomm.exp: Enable the alignment test for + mips*-*-*. + 2006-09-17 Mei Ligang * ld-elf/merge.d: Add special case for Score target. diff --git a/ld/testsuite/ld-elfcomm/elfcomm.exp b/ld/testsuite/ld-elfcomm/elfcomm.exp index 9b4edb4..84a68ed 100644 --- a/ld/testsuite/ld-elfcomm/elfcomm.exp +++ b/ld/testsuite/ld-elfcomm/elfcomm.exp @@ -77,17 +77,22 @@ if { [ld_simple_link $ld tmpdir/common1.o "-r tmpdir/common1a.o tmpdir/common1b. return } -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] } { - if { [istarget mips*-*-*] } { - # This test fails on MIPS because the backend sets type_change_ok. The - # size change warning is suppressed. - xfail $test1w1 +# This test fails on MIPS because the backend sets type_change_ok. +# The size change warning is suppressed. +if {[istarget mips*-*-*]} { + if { ![regexp "Warning: alignment (\[0-9\]+) of symbol \`_?foo1\' in tmpdir/common1b.o is smaller than 64 in tmpdir/common1a.o" $link_output] } { + fail $test1w1 } else { - fail $test1w1 + pass $test1w1 } } else { pass $test1w1 + 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 $test1w1 + } else { + pass $test1w1 + } } if { [dump_common1 $test1c1] } { -- 2.7.4