Fix some testsuite failures on x86-64

[Andreas Jaeger <aj at suse dot de>]

Running the testsuite I noticed some failures that are problems in the
testsuite itself:

/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/20030926-1.c:0: error: CPU you selected does not support x86-64 instruction set
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/20030926-1.c:0: error: CPU you selected does not support x86-64 instruction set
compiler exited with status 1

Executing on host: /abuild/aj/builds/gcc/one/gcc/xgcc -B/abuild/aj/builds/gcc/one/gcc/ /usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c   -std=iso9899:1990 -S  -o c90-const-
expr-2.s    (timeout = 300)
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c: In function `foo':

/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:31: warning: assignment from incompatible pointer type
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:32: warning: assignment from incompatible pointer type
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:33: warning: cast to pointer from integer of different size
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:34: warning: assignment from incompatible pointer type
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:36: warning: assignment from incompatible pointer type
output is:
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c: In function `foo':

/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:31: warning: assignment from incompatible pointer type
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:32: warning: assignment from incompatible pointer type
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:33: warning: cast to pointer from integer of different size
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:34: warning: assignment from incompatible pointer type
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:36: warning: assignment from incompatible pointer type

XFAIL: gcc.dg/c90-const-expr-2.c bogus null pointer constant (test for bogus messages, line 31)
XFAIL: gcc.dg/c90-const-expr-2.c bogus null pointer constant (test for bogus messages, line 32)
PASS: gcc.dg/c90-const-expr-2.c bogus null pointer constant (test for bogus messages, line 33)
XFAIL: gcc.dg/c90-const-expr-2.c bogus null pointer constant (test for bogus messages, line 34)
XFAIL: gcc.dg/c90-const-expr-2.c bogus null pointer constant (test for bogus messages, line 36)
FAIL: gcc.dg/c90-const-expr-2.c (test for excess errors)
Excess errors:
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/c90-const-expr-2.c:33: warning: cast to pointer from integer of different size

Executing on host: /abuild/aj/builds/gcc/one/gcc/xgcc -B/abuild/aj/builds/gcc/one/gcc/ /usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c   -O2 -march=pentium4 -S  -o i3
86-pentium4-not-mull.s    (timeout = 300)
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c:0: error: CPU you selected does not support x86-64 instruction set
/usr/src/aj/cvs/gcc/gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c:0: error: CPU you selected does not support x86-64 instruction set
compiler exited with status 1

For the two tests with -march=pentium4, we can either disable them on
x86_64 or change them to use -march=k8 - the latter will work also
with 32-bit compilation.  The name of one testcase contains pentium4,
should it get renamed?  Or what should be done?

Ok to commit?

Andreas

2003-11-11  Andreas Jaeger  <aj@suse.de>

	* gcc.dg/c90-const-expr-2.c (foo): Avoid extra warning on 64-bit
	systems.

	* gcc.dg/20030926-1.c: Don't run on x86_64.
	* gcc.dg/i386-pentium4-not-mull.c: Likewise.

============================================================
Index: gcc/testsuite/gcc.dg/c90-const-expr-2.c
--- testsuite/gcc.dg/c90-const-expr-2.c	8 Nov 2003 01:38:48 -0000	1.4
+++ testsuite/gcc.dg/c90-const-expr-2.c	11 Nov 2003 15:45:01 -0000
@@ -30,7 +30,7 @@ foo (void)
   ASSERT_NPC ((void *)0);
   ASSERT_NOT_NPC ((void *)(void *)0); /* { dg-bogus "incompatible" "bogus null pointer constant" { xfail *-*-* } } */
   ASSERT_NOT_NPC ((void *)(char *)0); /* { dg-bogus "incompatible" "bogus null pointer constant" { xfail *-*-* } } */
-  ASSERT_NOT_NPC ((void *)(0, 0)); /* { dg-bogus "incompatible" "bogus null pointer constant" } */
+  ASSERT_NOT_NPC ((void *)(0, 0L)); /* { dg-bogus "incompatible" "bogus null pointer constant" } */
   ASSERT_NOT_NPC ((void *)(&"Foobar"[0] - &"Foobar"[0])); /* { dg-bogus "incompatible" "bogus null pointer constant" { xfail *-*-* } } */
   /* This last one is a null pointer constant in C99 only.  */
   ASSERT_NOT_NPC ((void *)(1 ? 0 : (0, 0))); /* { dg-bogus "incompatible" "bogus null pointer constant" { xfail *-*-* } } */
============================================================
Index: gcc/testsuite/gcc.dg/20030926-1.c
--- testsuite/gcc.dg/20030926-1.c	26 Sep 2003 18:23:33 -0000	1.1
+++ testsuite/gcc.dg/20030926-1.c	11 Nov 2003 15:45:01 -0000
@@ -1,6 +1,6 @@
 /* PR optimization/11741  */
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2 -minline-all-stringops -march=pentium4" } */
+/* { dg-options "-O2 -minline-all-stringops -march=k8" } */
 
 void
 foo (char *p)
============================================================
Index: gcc/testsuite/gcc.dg/i386-pentium4-not-mull.c
--- testsuite/gcc.dg/i386-pentium4-not-mull.c	16 Jul 2003 20:07:50 -0000	1.1
+++ testsuite/gcc.dg/i386-pentium4-not-mull.c	11 Nov 2003 15:45:01 -0000
@@ -1,5 +1,5 @@
 /* { dg-do compile { target i?86-*-* x86_64-*-* } } */
-/* { dg-options "-O2 -march=pentium4" } */
+/* { dg-options "-O2 -march=k8" } */
 /* { dg-final { scan-assembler-not "imull" } } */
 
 /* Should be done not using imull.  */

-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature