From 873279879c066303c96330ee913fa583a75c9280 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Sat, 2 Jun 2001 20:35:08 +0000 Subject: [PATCH] linkage.exp: Use wildcards when matching N32. * gcc.misc-tests/linkage.exp: Use wildcards when matching N32. Ensure logfile entry matches exec command line. From-SVN: r42814 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.misc-tests/linkage.exp | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0c562fdffa2..f933e1ab6d4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-06-02 Kaveh R. Ghazi + + * gcc.misc-tests/linkage.exp: Use wildcards when matching N32. + Ensure logfile entry matches exec command line. + 2001-05-31 Richard Henderson * gcc.c-torture/execute/memcheck/blkarg.x: Disable the test. diff --git a/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/testsuite/gcc.misc-tests/linkage.exp index 47cd2e3fd36..a58fea6b2f9 100644 --- a/gcc/testsuite/gcc.misc-tests/linkage.exp +++ b/gcc/testsuite/gcc.misc-tests/linkage.exp @@ -32,16 +32,16 @@ if [isnative] then { if [ string match "*64*" $file_string ] { set native_cflags "-64" } - if [ string match "N32" $file_string ] { + if [ string match "*N32*" $file_string ] { set native_cflags "-n32" } } catch { exec rm -f linkage-y.o } - send_log "cc -c $srcdir/$subdir/linkage-y.c >&/dev/null\n" + send_log "cc -c $native_cflags $srcdir/$subdir/linkage-y.c >&/dev/null\n" catch { exec cc -c $native_cflags "$srcdir/$subdir/linkage-y.c" >&/dev/null } if ![file exists "linkage-y.o"] then { - send_log "c89 -c $srcdir/$subdir/linkage-y.c >&/dev/null\n" + send_log "c89 -c $native_cflags $srcdir/$subdir/linkage-y.c >&/dev/null\n" catch { exec c89 -c $native_cflags "$srcdir/$subdir/linkage-y.c" >&/dev/null } } if [file exists "linkage-y.o"] then { -- 2.30.2