summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>2001-06-02 20:35:08 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>2001-06-02 20:35:08 +0000
commit873279879c066303c96330ee913fa583a75c9280 (patch)
tree8845d023188cd0e4391fcff956447dbbd6339f9c
parent20f914dc057184c1f125f4e27969a644076e726b (diff)
downloadgcc-873279879c066303c96330ee913fa583a75c9280.tar.gz
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
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.misc-tests/linkage.exp6
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 <ghazi@caip.rutgers.edu>
+
+ * gcc.misc-tests/linkage.exp: Use wildcards when matching N32.
+ Ensure logfile entry matches exec command line.
+
2001-05-31 Richard Henderson <rth@redhat.com>
* 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 {