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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0c562fdffa21080062e97a78a573dccc29915362..f933e1ab6d429a2838a4235e403832b1a1924481 100644 (file)
--- 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 47cd2e3fd36b22418d668a48ccac9556c11a9130..a58fea6b2f9e1f95124db6ab42c4d77be1c1f635 100644 (file)
--- 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 {