* gcc.dg/20001013-1.c: Move to gcc.target/sparc.

	* gcc.dg/20001101-1.c: Likewise.
	* gcc.dg/20001102-1.c: Likewise.
	* gcc.dg/20020116-2.c: Likewise.
	* gcc.dg/20020416-1.c: Likewise.
	* gcc.dg/sparc-constant-1.c: Likewise.
	* gcc.dg/sparc-dwarf2.c: Likewise.
	* gcc.dg/sparc-frame-1.c: Likewise.
	* gcc.dg/sparc-getcontext-1.c: Likewise.
	* gcc.dg/sparc-loop-1.c: Likewise.
	* gcc.dg/sparc-reg-1.c: Likewise.
	* gcc.dg/sparc-ret.c: Likewise.
	* gcc.dg/sparc-trap-1.c: Likewise.
	* gcc.dg/ultrasp10.c: Likewise.
	* gcc.dg/ultrasp11.c: Likewise.
	* gcc.dg/ultrasp1.c: Likewise.
	* gcc.dg/ultrasp2.c: Likewise.
	* gcc.dg/ultrasp3.c: Likewise.
	* gcc.dg/ultrasp4.c: Likewise.
	* gcc.dg/ultrasp5.c: Likewise.
	* gcc.dg/ultrasp6.c: Likewise.
	* gcc.dg/ultrasp7.c: Likewise.
	* gcc.dg/ultrasp8.c: Likewise.
	* gcc.dg/ultrasp9.c: Likewise.
	* gcc.dg/splet-1.c: Delete.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126641 138bc75d-0d04-0410-961f-82ee72b054a4

27 files changed, 89 insertions, 79 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e8584844a8b..7d9d43679c2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,31 @@
+2007-07-14  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* gcc.dg/20001013-1.c: Move to gcc.target/sparc.
+	* gcc.dg/20001101-1.c: Likewise.
+	* gcc.dg/20001102-1.c: Likewise.
+	* gcc.dg/20020116-2.c: Likewise.
+	* gcc.dg/20020416-1.c: Likewise.
+	* gcc.dg/sparc-constant-1.c: Likewise.
+	* gcc.dg/sparc-dwarf2.c: Likewise.
+	* gcc.dg/sparc-frame-1.c: Likewise.
+	* gcc.dg/sparc-getcontext-1.c: Likewise.
+	* gcc.dg/sparc-loop-1.c: Likewise.
+	* gcc.dg/sparc-reg-1.c: Likewise.
+	* gcc.dg/sparc-ret.c: Likewise.
+	* gcc.dg/sparc-trap-1.c: Likewise.
+	* gcc.dg/ultrasp10.c: Likewise.
+	* gcc.dg/ultrasp11.c: Likewise.
+	* gcc.dg/ultrasp1.c: Likewise.
+	* gcc.dg/ultrasp2.c: Likewise.
+	* gcc.dg/ultrasp3.c: Likewise.
+	* gcc.dg/ultrasp4.c: Likewise.
+	* gcc.dg/ultrasp5.c: Likewise.
+	* gcc.dg/ultrasp6.c: Likewise.
+	* gcc.dg/ultrasp7.c: Likewise.
+	* gcc.dg/ultrasp8.c: Likewise.
+	* gcc.dg/ultrasp9.c: Likewise.
+	* gcc.dg/splet-1.c: Delete.
+
 2007-07-14  Daniel Franke  <franke.daniel@gmail.com>
 
 	PR fortran/32724
diff --git a/gcc/testsuite/gcc.dg/splet-1.c b/gcc/testsuite/gcc.dg/splet-1.c
deleted file mode 100644
index 03dbb2e3a3c..00000000000
--- a/gcc/testsuite/gcc.dg/splet-1.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Test inl-sparc.h.  */
-
-/* { dg-do run { target sparclet-*-* } } */
-/* { dg-options -mcpu=sparclet } */
-
-#include <inl-sparc.h>
-
-main ()
-{
-  int a,b;
-
-  a = scan (1, 2);
-  if (a != 3)
-    abort ();
-
-  b = shuffle (4, 5);
-  if (b != 6)
-    abort ();
-
-  exit (0);
-}
diff --git a/gcc/testsuite/gcc.dg/ultrasp4.c b/gcc/testsuite/gcc.dg/ultrasp4.c
deleted file mode 100644
index 1c72d0659d4..00000000000
--- a/gcc/testsuite/gcc.dg/ultrasp4.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Simplified from PR target/5309.  */
-/* { dg-do compile } */
-/* { dg-options "-O2" } */
-/* { dg-options "-O2 -mcpu=ultrasparc" { target sparc64-*-* sparcv9-*-* } } */
-
-#if __INT_MAX__ > 32767
-#define PTR_TYPE long
-#else
-/* For 16-bit ports a long is a 32-bit quantity.  So you cannot
-   cast a 32-bit long integer into a pointer which will only be
-   16-bits long.  */
-#define PTR_TYPE int
-#endif
-
-extern PTR_TYPE bar (unsigned int);
-
-PTR_TYPE
-foo (PTR_TYPE x, unsigned int y)
-{
-  return *(((PTR_TYPE *) (bar (y) - 1)) + 1 + (x >> 2) % 359);
-}
diff --git a/gcc/testsuite/gcc.dg/20001013-1.c b/gcc/testsuite/gcc.target/sparc/20001013-1.c
index 8634a192820..891ccab0a34 100644
--- a/gcc/testsuite/gcc.dg/20001013-1.c
+++ b/gcc/testsuite/gcc.target/sparc/20001013-1.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { sparc*-*-* && ultrasparc_hw } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target ultrasparc_hw } */
 /* { dg-options "-O2 -mcpu=ultrasparc -mvis" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20001101-1.c b/gcc/testsuite/gcc.target/sparc/20001101-1.c
index 151a6cc19de..ec67e115f71 100644
--- a/gcc/testsuite/gcc.dg/20001101-1.c
+++ b/gcc/testsuite/gcc.target/sparc/20001101-1.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { sparc*-*-* && ultrasparc_hw } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target ultrasparc_hw } */
 /* { dg-options "-O2 -mcpu=ultrasparc -mvis" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20001102-1.c b/gcc/testsuite/gcc.target/sparc/20001102-1.c
index 62266a38164..b4ce8a0e74c 100644
--- a/gcc/testsuite/gcc.dg/20001102-1.c
+++ b/gcc/testsuite/gcc.target/sparc/20001102-1.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target { sparc*-*-* && ultrasparc_hw } } } */
+/* { dg-do run } */
+/* { dg-require-effective-target ultrasparc_hw } */
 /* { dg-options "-O2 -mcpu=ultrasparc -mvis" } */
 
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.dg/20020116-2.c b/gcc/testsuite/gcc.target/sparc/20020116-2.c
index 04f5c6ee571..828ffff264e 100644
--- a/gcc/testsuite/gcc.dg/20020116-2.c
+++ b/gcc/testsuite/gcc.target/sparc/20020116-2.c
@@ -1,8 +1,8 @@
+/* { dg-do compile } */
+/* { dg-options "-mcpu=supersparc" } */
+
 /* This testcase ICEd on sparc64 because -mcpu=supersparc and implicit
    -m64 resulted in MASK_V8 and MASK_V9 to be set at the same time.  */
-/* { dg-do compile } */
-/* { dg-options "" } */
-/* { dg-options "-mcpu=supersparc" { target sparc*-*-* } } */
 
 void bar (long *x, long *y);
 
diff --git a/gcc/testsuite/gcc.dg/20020416-1.c b/gcc/testsuite/gcc.target/sparc/20020416-1.c
index db1a2617fcd..05f0ee65504 100644
--- a/gcc/testsuite/gcc.dg/20020416-1.c
+++ b/gcc/testsuite/gcc.target/sparc/20020416-1.c
@@ -1,8 +1,7 @@
 /* PR bootstrap/6315 */
+
 /* { dg-do compile } */
-/* { dg-options "-O2" } */
-/* { dg-options "-O2 -mhard-quad-float" { target sparc*-*-* } } */
-/* { dg-options "-O2" { target sparclet*-*-* sparclite*-*-* sparc86x-*-* } } */
+/* { dg-options "-O2 -mhard-quad-float" } */
 
 void bar (const char *, ...);
 
diff --git a/gcc/testsuite/gcc.dg/sparc-constant-1.c b/gcc/testsuite/gcc.target/sparc/sparc-constant-1.c
index bb4b1bce4f8..491f9d3f8b0 100644
--- a/gcc/testsuite/gcc.dg/sparc-constant-1.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-constant-1.c
@@ -1,5 +1,6 @@
 /* PR optimization/10876 */
-/* { dg-do compile { target sparc*-*-* } } */
+
+/* { dg-do compile } */
 
 /* Verify that adding the constant 4096 is turned
    into substracting the constant -4096. */
diff --git a/gcc/testsuite/gcc.dg/sparc-dwarf2.c b/gcc/testsuite/gcc.target/sparc/sparc-dwarf2.c
index d68cf620428..819ec3863e5 100644
--- a/gcc/testsuite/gcc.dg/sparc-dwarf2.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-dwarf2.c
@@ -1,6 +1,7 @@
 /* PR target/10114 */
 /* Originator: James Troup <james@nocrew.org> */
-/* { dg-do compile { target sparc-*-linux* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-g -O1" } */
 
 extern __inline double sqrt (double __x)
diff --git a/gcc/testsuite/gcc.dg/sparc-frame-1.c b/gcc/testsuite/gcc.target/sparc/sparc-frame-1.c
index 24fe390aedd..7aac1e26e65 100644
--- a/gcc/testsuite/gcc.dg/sparc-frame-1.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-frame-1.c
@@ -1,5 +1,6 @@
 /* PR target/24284 */
-/* { dg-do compile { target sparc*-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-O -g" } */
 
 void do_run(void *ip)
diff --git a/gcc/testsuite/gcc.dg/sparc-getcontext-1.c b/gcc/testsuite/gcc.target/sparc/sparc-getcontext-1.c
index 7b5939d17ed..cd468c56288 100644
--- a/gcc/testsuite/gcc.dg/sparc-getcontext-1.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-getcontext-1.c
@@ -1,7 +1,7 @@
 /* PR middle-end/22127 */
 /* Testcase by <akr@m17n.org> */
 
-/* { dg-do run { target sparc*-sun-solaris2.* } } */
+/* { dg-do run { target *-*-solaris2.* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-O" } */
 
diff --git a/gcc/testsuite/gcc.dg/sparc-loop-1.c b/gcc/testsuite/gcc.target/sparc/sparc-loop-1.c
index 8d5f7519b03..cb8d007627d 100644
--- a/gcc/testsuite/gcc.dg/sparc-loop-1.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-loop-1.c
@@ -1,6 +1,7 @@
 /* PR optimization/10157 */
 /* Originator: Peter van Hoof <p.van-hoof@qub.ac.uk> */
-/* { dg-do compile { target sparc*-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-O2 -ffast-math" } */
 
 /* Verify that the loop optimizer doesn't
diff --git a/gcc/testsuite/gcc.dg/sparc-reg-1.c b/gcc/testsuite/gcc.target/sparc/sparc-reg-1.c
index 860094299a1..0adb4cdca9d 100644
--- a/gcc/testsuite/gcc.dg/sparc-reg-1.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-reg-1.c
@@ -1,6 +1,6 @@
 /* PR middle-end/20263 */
 
-/* { dg-do assemble { target sparc64-*-* } } */
+/* { dg-do assemble } */
 /* { dg-options "" } */
 
 register void *tp __asm__("%g7");
diff --git a/gcc/testsuite/gcc.dg/sparc-ret.c b/gcc/testsuite/gcc.target/sparc/sparc-ret.c
index 3a4ddea58ec..11afc10821d 100644
--- a/gcc/testsuite/gcc.dg/sparc-ret.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-ret.c
@@ -1,11 +1,8 @@
-/* Copyright (C) 2001  Free Software Foundation.
-
-   Making sure that Ultrasparc return instructions do not read
-   below the stack.  */
-
-/* { dg-do compile { target sparc-*-* } } */
+/* { dg-do compile } */
+/* { dg-require-effective-target ilp32 } */
 /* { dg-options "-mcpu=ultrasparc -O" } */
 
+/* Make sure that Ultrasparc return insn do not read below the stack.  */
 
 int bar (int a, int b, int c, int d, int e, int f, int g, int h)
 {
diff --git a/gcc/testsuite/gcc.dg/sparc-trap-1.c b/gcc/testsuite/gcc.target/sparc/sparc-trap-1.c
index a516a886495..82a86fbe1a2 100644
--- a/gcc/testsuite/gcc.dg/sparc-trap-1.c
+++ b/gcc/testsuite/gcc.target/sparc/sparc-trap-1.c
@@ -1,5 +1,6 @@
 /* PR target/15693 */
-/* { dg-do compile { target sparc*-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 
 /* This used to fail on SPARC at -O2 because the combiner
diff --git a/gcc/testsuite/gcc.dg/ultrasp1.c b/gcc/testsuite/gcc.target/sparc/ultrasp1.c
index 82f586c7db8..7db75058990 100644
--- a/gcc/testsuite/gcc.dg/ultrasp1.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp1.c
@@ -1,8 +1,7 @@
 /* Simplified from testcase by David Staepelaere <staapa@ultimatech.com> */
 
 /* { dg-do compile } */
-/* { dg-options "" } */
-/* { dg-options -mcpu=ultrasparc { target sparc-*-* } } */
+/* { dg-options -mcpu=ultrasparc } */
 
 int foo(long long y) {
   return -1 * y;
diff --git a/gcc/testsuite/gcc.dg/ultrasp10.c b/gcc/testsuite/gcc.target/sparc/ultrasp10.c
index 7cc5c93aaf7..d3edaca6c88 100644
--- a/gcc/testsuite/gcc.dg/ultrasp10.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp10.c
@@ -1,6 +1,8 @@
 /* PR target/11965 */
 /* Originator: <jk@tools.de> */
-/* { dg-do run { target { sparc*-*-* && ultrasparc_hw } } } */
+
+/* { dg-do run } */
+/* { dg-require-effective-target ultrasparc_hw } */
 /* { dg-options "-O -mcpu=ultrasparc" } */
 
 /* This used to fail on 32-bit Ultrasparc because GCC emitted
diff --git a/gcc/testsuite/gcc.dg/ultrasp11.c b/gcc/testsuite/gcc.target/sparc/ultrasp11.c
index 8f279f721ae..91e64782bd1 100644
--- a/gcc/testsuite/gcc.dg/ultrasp11.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp11.c
@@ -1,7 +1,8 @@
 /* PR target/17245 */
 /* Origin: <aaronw@net.com> */
 /* Testcase by Christian Ehrhardt <ehrhardt@mathematik.uni-ulm.de> */
-/* { dg-do compile { target sparc*-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-O -mcpu=v9" } */
 
 /* This used to fail on 32-bit Ultrasparc because reload was emitting
diff --git a/gcc/testsuite/gcc.dg/ultrasp2.c b/gcc/testsuite/gcc.target/sparc/ultrasp2.c
index 1fd821c34e8..24202ba5ad4 100644
--- a/gcc/testsuite/gcc.dg/ultrasp2.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp2.c
@@ -3,8 +3,7 @@
    Simplified from libg++/src/Fix16.cc */
 
 /* { dg-do compile } */
-/* { dg-options "" } */
-/* { dg-options "-O0" { target sparc64-*-* sparcv9-*-* } } */
+/* { dg-options "-O0" } */
 
 short foo() {
   short i = (short)(1<<15);
diff --git a/gcc/testsuite/gcc.dg/ultrasp3.c b/gcc/testsuite/gcc.target/sparc/ultrasp3.c
index 4458658a58e..1e028add878 100644
--- a/gcc/testsuite/gcc.dg/ultrasp3.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp3.c
@@ -1,5 +1,6 @@
-/* { dg-options "" } */
-/* { dg-options "-mcpu=ultrasparc -mv8plus" { target sparc-*-* } } */
+/* { dg-do run } */
+/* { dg-require-effective-target ilp32 && ultrasparc_hw } */
+/* { dg-options "-mcpu=ultrasparc -mv8plus" } */
 
 extern void abort (void);
 extern void exit (int);
@@ -24,7 +25,7 @@ unsigned long long baz (void)
   return c * a;
 }
 
-main ()
+int main (void)
 {
   if (foo (0x56789LL) != 0x26f32e5d26f32e5dLL)
     abort ();
diff --git a/gcc/testsuite/gcc.target/sparc/ultrasp4.c b/gcc/testsuite/gcc.target/sparc/ultrasp4.c
new file mode 100644
index 00000000000..f3958cbe781
--- /dev/null
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp4.c
@@ -0,0 +1,12 @@
+/* Simplified from PR target/5309.  */
+
+/* { dg-do compile } */
+/* { dg-options "-O2 -mcpu=ultrasparc" } */
+
+extern long bar (unsigned int);
+
+long
+foo (long x, unsigned int y)
+{
+  return *(((long *) (bar (y) - 1)) + 1 + (x >> 2) % 359);
+}
diff --git a/gcc/testsuite/gcc.dg/ultrasp5.c b/gcc/testsuite/gcc.target/sparc/ultrasp5.c
index 91f3d21ffb6..feb6cf244b8 100644
--- a/gcc/testsuite/gcc.dg/ultrasp5.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp5.c
@@ -1,6 +1,7 @@
 /* PR target/10072 */
 /* Originator: Peter van Hoof <p.van-hoof@qub.ac.uk> */
-/* { dg-do compile { target sparc-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-std=c99 -O1 -mcpu=ultrasparc -ffast-math" } */
 
 void p(int v)
diff --git a/gcc/testsuite/gcc.dg/ultrasp6.c b/gcc/testsuite/gcc.target/sparc/ultrasp6.c
index 0518086402e..ad341dc16eb 100644
--- a/gcc/testsuite/gcc.dg/ultrasp6.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp6.c
@@ -1,6 +1,7 @@
 /* PR target/7784 */
 /* Originator: Peter van Hoof <p.van-hoof@qub.ac.uk> */
-/* { dg-do compile { target sparc-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-options "-O2 -mcpu=ultrasparc" } */
 
 typedef struct
diff --git a/gcc/testsuite/gcc.dg/ultrasp7.c b/gcc/testsuite/gcc.target/sparc/ultrasp7.c
index 541295da88b..b5a17b448a8 100644
--- a/gcc/testsuite/gcc.dg/ultrasp7.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp7.c
@@ -1,6 +1,7 @@
 /* PR c/8281 */
 /* Originator: TANIGUCHI Yasuaki <yasuaki@k8.dion.ne.jp> */
-/* { dg-do compile { target sparc-*-* } } */
+
+/* { dg-do compile } */
 /* { dg-require-effective-target fpic } */
 /* { dg-options "-O2 -mcpu=ultrasparc -fPIC" } */
 
diff --git a/gcc/testsuite/gcc.dg/ultrasp8.c b/gcc/testsuite/gcc.target/sparc/ultrasp8.c
index f9289fae0ea..a8bfefee57a 100644
--- a/gcc/testsuite/gcc.dg/ultrasp8.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp8.c
@@ -1,7 +1,8 @@
 /* PR target/10067 */
 /* Originator: <dat94ali@ludat.lth.se> */
-/* { dg-do compile { target sparc*-*-* } } */
-/* { dg-options "-O2 -mtune=supersparc" { target sparc64-*-* sparcv9-*-* } } */
+
+/* { dg-do compile } */
+/* { dg-options "-O2 -mtune=supersparc" } */
 
 struct _reent;
 
diff --git a/gcc/testsuite/gcc.dg/ultrasp9.c b/gcc/testsuite/gcc.target/sparc/ultrasp9.c
index 0af2c7e8601..b26d7dce1bc 100644
--- a/gcc/testsuite/gcc.dg/ultrasp9.c
+++ b/gcc/testsuite/gcc.target/sparc/ultrasp9.c
@@ -1,6 +1,8 @@
 /* PR optimization/11018 */
 /* Originator: <partain@dcs.gla.ac.uk> */
-/* { dg-do run { target { sparc*-*-* && ultrasparc_hw } } } */
+
+/* { dg-do run } */
+/* { dg-require-effective-target ultrasparc_hw } */
 /* { dg-options "-O2 -mcpu=ultrasparc" } */
 
 /* This used to fail on 32-bit Ultrasparc because