peep2-xsrand.c, [...]: Drop redundant target-specifier.

	* gcc.target/cris/peep2-xsrand.c, gcc.target/cris/asmreg-1.c,
	gcc.target/cris/peep2-andu1.c, gcc.target/cris/peep2-xsrand2.c,
	gcc.target/cris/20011127-1.c: Drop redundant target-specifier.
	* gcc.target/cris/peep2-andu2.c: Ditto.  Make dg-do assemble and
	add -save-temps.
	* gcc.target/cris/torture/cris-torture.exp,
	gcc.target/cris/cris.exp: Run for crisv32-*-* too.
	* gcc.target/cris/builtin_ctz_v3.c,
	gcc.target/cris/builtin_ctz_v8.c,
	gcc.target/cris/builtin_clz_v0.c,
	gcc.target/cris/builtin_clz_v3.c,
	gcc.target/cris/builtin_bswap_v3.c,
	gcc.target/cris/builtin_bswap_v8.c, gcc.dg/sibcall-4.c,
	gcc.dg/pr19340.c, gcc.dg/20020919-1.c, gcc.dg/pr31866.c,
	gcc.dg/torture/cris-asm-mof-1.c, gcc.dg/torture/cris-volatile-1.c,
	gcc.dg/weak/typeof-2.c, gcc.dg/tree-ssa/loop-1.c,
	gcc.dg/tree-ssa/20040204-1.c, gcc.dg/sibcall-3.c,
	lib/target-supports.exp: Adjust for crisv32-*-*.

From-SVN: r130962

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a80b86a147802163bed47667bf847dd50aa7f25f..3ceb531d389ca9910d6feb8fefe6489387f1ec47 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2007-12-15  Hans-Peter Nilsson  <hp@axis.com>
+
+       * gcc.target/cris/peep2-xsrand.c, gcc.target/cris/asmreg-1.c,
+       gcc.target/cris/peep2-andu1.c, gcc.target/cris/peep2-xsrand2.c,
+       gcc.target/cris/20011127-1.c: Drop redundant target-specifier.
+       * gcc.target/cris/peep2-andu2.c: Ditto.  Make dg-do assemble and
+       add -save-temps.
+       * gcc.target/cris/torture/cris-torture.exp,
+       gcc.target/cris/cris.exp: Run for crisv32-*-* too.
+       * gcc.target/cris/builtin_ctz_v3.c,
+       gcc.target/cris/builtin_ctz_v8.c,
+       gcc.target/cris/builtin_clz_v0.c,
+       gcc.target/cris/builtin_clz_v3.c,
+       gcc.target/cris/builtin_bswap_v3.c,
+       gcc.target/cris/builtin_bswap_v8.c, gcc.dg/sibcall-4.c,
+       gcc.dg/pr19340.c, gcc.dg/20020919-1.c, gcc.dg/pr31866.c,
+       gcc.dg/torture/cris-asm-mof-1.c, gcc.dg/torture/cris-volatile-1.c,
+       gcc.dg/weak/typeof-2.c, gcc.dg/tree-ssa/loop-1.c,
+       gcc.dg/tree-ssa/20040204-1.c, gcc.dg/sibcall-3.c,
+       lib/target-supports.exp: Adjust for crisv32-*-*.
+
 2007-12-15  Alexandre Oliva  <aoliva@redhat.com>
 
        * gcc.dg/debug/const-3.c: New.

diff --git a/gcc/testsuite/gcc.dg/20020919-1.c b/gcc/testsuite/gcc.dg/20020919-1.c
index 1224199407bcb356680d904fa08957e1b0990542..de58b0c91f5ae3bc2a891bfaa115d7322f73a3f4 100644 (file)
--- a/gcc/testsuite/gcc.dg/20020919-1.c
+++ b/gcc/testsuite/gcc.dg/20020919-1.c
@@ -8,7 +8,7 @@
    You must be this tall ---> fit two long longs in asm-declared registers
    to enter this amusement.  */
 
-/* { dg-do compile { target alpha-*-* cris-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */
+/* { dg-do compile { target alpha-*-* cris-*-* crisv32-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 /* Constructed examples; input/output (same register), output, input, and

diff --git a/gcc/testsuite/gcc.dg/pr19340.c b/gcc/testsuite/gcc.dg/pr19340.c
index 63fd41d8a6451da5fa332025a117d78a55ca0db1..a5ff410ff4828ac752a9d30454558bc1bf761f54 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr19340.c
+++ b/gcc/testsuite/gcc.dg/pr19340.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O1 -fschedule-insns2 -fsched2-use-traces" } */
-/* { dg-skip-if "No scheduling" { mmix-*-* cris-*-* fido-*-* m68k-*-* m32c-*-* } { "*" } { "" } } */
+/* { dg-skip-if "No scheduling" { mmix-*-* cris-*-* crisv32-*-* fido-*-* m68k-*-* m32c-*-* } { "*" } { "" } } */
 
 extern double f (double x);
 

diff --git a/gcc/testsuite/gcc.dg/pr31866.c b/gcc/testsuite/gcc.dg/pr31866.c
index a2a254a07985900e936f5432eac7c4567ab55874..f1afd93031872add532c2554136decdf996a28df 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr31866.c
+++ b/gcc/testsuite/gcc.dg/pr31866.c
@@ -1,5 +1,5 @@
 /* PR tree-optimization/31866 */
-/* { dg-do compile { target alpha-*-* cris-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */
+/* { dg-do compile { target alpha-*-* cris-*-* crisv32-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 #if defined (__alpha__)

diff --git a/gcc/testsuite/gcc.dg/sibcall-3.c b/gcc/testsuite/gcc.dg/sibcall-3.c
index 6e6b3aefd22184019a7031c58d2763b084cbfb1d..d351d4f74d18f2265ccccb4920e65b438c7536f0 100644 (file)
--- a/gcc/testsuite/gcc.dg/sibcall-3.c
+++ b/gcc/testsuite/gcc.dg/sibcall-3.c
@@ -5,7 +5,7 @@
    Copyright (C) 2002 Free Software Foundation Inc.
    Contributed by Hans-Peter Nilsson  <hp@bitrange.com>  */
 
-/* { dg-do run { xfail arc-*-* avr-*-* c4x-*-* cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
+/* { dg-do run { xfail arc-*-* avr-*-* c4x-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
 /* -mlongcall disables sibcall patterns.  */
 /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */
 /* { dg-options "-O2 -foptimize-sibling-calls" } */

diff --git a/gcc/testsuite/gcc.dg/sibcall-4.c b/gcc/testsuite/gcc.dg/sibcall-4.c
index c852c8af39a31f1c913fd91a509eb3842f62eeed..daba88b76ccdd61b276bd011877a36b9dcf503e8 100644 (file)
--- a/gcc/testsuite/gcc.dg/sibcall-4.c
+++ b/gcc/testsuite/gcc.dg/sibcall-4.c
@@ -5,7 +5,7 @@
    Copyright (C) 2002 Free Software Foundation Inc.
    Contributed by Hans-Peter Nilsson  <hp@bitrange.com>  */
 
-/* { dg-do run { xfail arc-*-* avr-*-* c4x-*-* cris-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
+/* { dg-do run { xfail arc-*-* avr-*-* c4x-*-* cris-*-* crisv32-*-* h8300-*-* hppa*64*-*-* m32r-*-* m68hc1?-*-* mcore-*-* mn10300-*-* xstormy16-*-* v850*-*-* vax-*-* xtensa-*-* } } */
 /* -mlongcall disables sibcall patterns.  */
 /* { dg-skip-if "" { powerpc*-*-* } { "-mlongcall" } { "" } } */
 /* { dg-options "-O2 -foptimize-sibling-calls" } */

diff --git a/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c b/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c
index 36a2de9ebd9236afd7993dbdc9aad0546c15ee80..5ebde5ed5440ea1b3d4f30d24ba35c3f82d811f2 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c
+++ b/gcc/testsuite/gcc.dg/torture/cris-asm-mof-1.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target cris-*-* } } */
-/* { dg-skip-if "" { cris-*-* } { "-march*" } { "" } } */
+/* { dg-do compile { target cris-*-* crisv32-*-* } } */
+/* { dg-skip-if "" { cris*-*-* } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v10" } */
 /* { dg-final { scan-assembler "in-asm: .mof" } } */
 /* { dg-final { scan-assembler "out-asm: .mof" } } */

diff --git a/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c b/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c
index 7f613c4dc7707256f335c704c4e0b438c50a3727..6b19852c27485402f2115a48629e6729036af8dd 100644 (file)
--- a/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c
+++ b/gcc/testsuite/gcc.dg/torture/cris-volatile-1.c
@@ -2,7 +2,7 @@
    Check that size-optimizations for move insns (specifically peephole
    optimizations) aren't applied to volatile objects in the CRIS port.
    Origin: Hans-Peter Nilsson.  */
-/* { dg-do compile { target cris-*-* } } */
+/* { dg-do compile { target cris-*-* crisv32-*-* } } */
 /* { dg-final { scan-assembler-not {movu\...\[} } } */
 /* { dg-final { scan-assembler-not {move\.[^d].\[} } } */
 /* { dg-final { scan-assembler-not {and\.[^d].\[} } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c b/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c
index 1ce72800a1189958a28d29dd3bc49fdeef70c0c9..28cdfd2318177de8eb46d9f5c6d34f3c91d10567 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/20040204-1.c
@@ -33,5 +33,5 @@ void test55 (int x, int y)
    that the && should be emitted (based on BRANCH_COST).  Fix this
    by teaching dom to look through && and register all components
    as true.  */
-/* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail { ! "powerpc*-*-* cris-*-* mmix-*-* mips*-*-*" } } } } */
+/* { dg-final { scan-tree-dump-times "link_error" 0 "optimized" { xfail { ! "powerpc*-*-* cris-*-* crisv32-*-* mmix-*-* mips*-*-*" } } } } */
 /* { dg-final { cleanup-tree-dump "optimized" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
index af03f9244b94840aae140c237e059e8bf1a390a7..751e3e89027cde2cad716e450b1b5e5f5beafb8a 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/loop-1.c
@@ -39,7 +39,7 @@ void xxx(void)
 /* CRIS keeps the address in a register.  */
 /* m68k sometimes puts the address in a register, depending on CPU and PIC.  */
 
-/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* fido-*-* m68k-*-* } } } */
+/* { dg-final { scan-assembler-times "foo" 5 { xfail hppa*-*-* ia64*-*-* sh*-*-* cris-*-* crisv32-*-* fido-*-* m68k-*-* } } } */
 /* { dg-final { scan-assembler-times "foo,%r" 5 { target hppa*-*-* } } } */
 /* { dg-final { scan-assembler-times "= foo"  5 { target ia64*-*-* } } } */
 /* { dg-final { scan-assembler-times "jsr|bsrf|blink\ttr?,r18"  5 { target sh*-*-* } } } */

diff --git a/gcc/testsuite/gcc.dg/weak/typeof-2.c b/gcc/testsuite/gcc.dg/weak/typeof-2.c
index 31d577fcc4e4f26aeece601c447b8b298d5f8f32..5d97dc5c240e6912d9548e9839fbab3c2c306f42 100644 (file)
--- a/gcc/testsuite/gcc.dg/weak/typeof-2.c
+++ b/gcc/testsuite/gcc.dg/weak/typeof-2.c
@@ -39,6 +39,7 @@ int bar3 (int x)
 // { dg-final { if [string match s390*-*-* $target_triplet ] {return} } }
 // Likewise for CRIS targets.
 // { dg-final { if [string match cris-*-* $target_triplet ] {return} } }
+// { dg-final { if [string match crisv32-*-* $target_triplet ] {return} } }
 // Likewise for m68k targets.
 // { dg-final { if [string match fido-*-* $target_triplet ] {return} } }
 // { dg-final { if [string match m68k-*-* $target_triplet ] {return} } }

diff --git a/gcc/testsuite/gcc.target/cris/20011127-1.c b/gcc/testsuite/gcc.target/cris/20011127-1.c
index ab781241a6de4d671d667259c5483254cf8802a6..0e448f8b0b8467e9fb48e9a80d0e0dbbd0348fe6 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/20011127-1.c
+++ b/gcc/testsuite/gcc.target/cris/20011127-1.c
@@ -3,9 +3,9 @@
 
    Making sure that invalid asm operand modifiers don't cause an ICE.  */
 
-/* { dg-do compile { target cris-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
-/* { dg-message "reg:SI|const_double:DF" "prune debug_rtx output" { target cris-*-* } 0 } */
+/* { dg-message "reg:SI|const_double:DF" "prune debug_rtx output" { target *-*-* } 0 } */
 
 void
 foo (void)

diff --git a/gcc/testsuite/gcc.target/cris/asmreg-1.c b/gcc/testsuite/gcc.target/cris/asmreg-1.c
index 85827e9a9a344854ca7453ef5f303aaa197d1fa4..f430fafbeea20f025fd54a6c7be370f86d29b671 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/asmreg-1.c
+++ b/gcc/testsuite/gcc.target/cris/asmreg-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target cris-*-* } } */
+/* { dg-do compile } */
 /* { dg-options "-O2" } */
 /* { dg-final { scan-assembler "\\\.ifnc \\\$r9-\\\$r10-\\\$r11-\\\$r12" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/builtin_bswap_v3.c b/gcc/testsuite/gcc.target/cris/builtin_bswap_v3.c
index 86dc938263ef871570a0ca1e44b23e7d92b051f9..1230d4b596d4a6962b686d4bd1dcb8ffb7acf854 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/builtin_bswap_v3.c
+++ b/gcc/testsuite/gcc.target/cris/builtin_bswap_v3.c
@@ -1,7 +1,7 @@
 /* Check that we don't use the swap insn for bswap by checking assembler 
    output.  The swap instruction was added in v8.  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { "cris-*-elf" } { "-march*" } { "" } } */
+/* { dg-skip-if "" { "cris*-*-elf" } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v3" } */
 /* { dg-final { scan-assembler-not "\[ \t\]swapwb\[ \t\]" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/builtin_bswap_v8.c b/gcc/testsuite/gcc.target/cris/builtin_bswap_v8.c
index 408f08911de4fba05735920ecbc770f8e4cb7911..b7a8d268401e18bb7281fe60e43dcfa0705ef3f6 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/builtin_bswap_v8.c
+++ b/gcc/testsuite/gcc.target/cris/builtin_bswap_v8.c
@@ -1,7 +1,7 @@
 /* Check that we use the swap insn for bswap by checking assembler
    output.  The swap instruction was added in v8.  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { "cris-*-elf" } { "-march*" } { "" } } */
+/* { dg-skip-if "" { "cris*-*-elf" } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v8" } */
 /* { dg-final { scan-assembler "\[ \t\]swapwb\[ \t\]" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/builtin_clz_v0.c b/gcc/testsuite/gcc.target/cris/builtin_clz_v0.c
index d848a75b76caca92273674454ea618541e4ae10e..318402faa37f286a1a8746207768e638ae261a5c 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/builtin_clz_v0.c
+++ b/gcc/testsuite/gcc.target/cris/builtin_clz_v0.c
@@ -1,7 +1,7 @@
 /* Check that we don't use the lz insn for clz by checking assembler output.
    The lz insn was implemented in CRIS v3 (ETRAX 4).  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { "cris-*-elf" } { "-march*" } { "" } } */
+/* { dg-skip-if "" { "cris*-*-elf" } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v0" } */
 /* { dg-final { scan-assembler-not "\[ \t\]lz\[ \t\]" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/builtin_clz_v3.c b/gcc/testsuite/gcc.target/cris/builtin_clz_v3.c
index 0abaccbc6d0022c3f2bc72f997e479cc78bb329b..ecf0390487f30f4708028b92c99aa79c41164987 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/builtin_clz_v3.c
+++ b/gcc/testsuite/gcc.target/cris/builtin_clz_v3.c
@@ -1,7 +1,7 @@
 /* Check that we use the lz insn for clz by checking assembler output.
    The lz insn was implemented in CRIS v3 (ETRAX 4).  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { "cris-*-elf" } { "-march*" } { "" } } */
+/* { dg-skip-if "" { "cris*-*-elf" } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v3" } */
 /* { dg-final { scan-assembler "\[ \t\]lz\[ \t\]" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/builtin_ctz_v3.c b/gcc/testsuite/gcc.target/cris/builtin_ctz_v3.c
index 17b14c788ce9788a9e9300b420a7bdcf7bcb7c9d..8971a47a0b7b90a72ab138d14cd1f25a4e3aaee4 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/builtin_ctz_v3.c
+++ b/gcc/testsuite/gcc.target/cris/builtin_ctz_v3.c
@@ -1,7 +1,7 @@
 /* Check that we don't use the swap insn for ctz by checking
    assembler output.  The swap instruction was implemented in v8.  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { "cris-*-elf" } { "-march*" } { "" } } */
+/* { dg-skip-if "" { "cris*-*-elf" } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v3" } */
 /* { dg-final { scan-assembler-not "\[ \t\]swapwbr\[ \t\]" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/builtin_ctz_v8.c b/gcc/testsuite/gcc.target/cris/builtin_ctz_v8.c
index 4ea1d721a9a7a0d990e7ce2cee39a00e8782ef85..853b1740aac7db4412dfffefe34e0782757686ec 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/builtin_ctz_v8.c
+++ b/gcc/testsuite/gcc.target/cris/builtin_ctz_v8.c
@@ -1,7 +1,7 @@
 /* Check that we use the swap insn for ctz by checking assembler output.
    The swap instruction was implemented in v8.  */
 /* { dg-do compile } */
-/* { dg-skip-if "" { "cris-*-elf" } { "-march*" } { "" } } */
+/* { dg-skip-if "" { "cris*-*-elf" } { "-march*" } { "" } } */
 /* { dg-options "-O2 -march=v8" } */
 /* { dg-final { scan-assembler "\[ \t\]swapwbr\[ \t\]" } } */
 

diff --git a/gcc/testsuite/gcc.target/cris/cris.exp b/gcc/testsuite/gcc.target/cris/cris.exp
index d48ace6d288593643f1d2f90bc5beb13c5a7a967..769052a285205b438bb672e53842a010acc125ac 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/cris.exp
+++ b/gcc/testsuite/gcc.target/cris/cris.exp
@@ -18,7 +18,7 @@
 # looping over tests.
 
 # Exit immediately if this isn't a CRIS target.
-if ![istarget cris-*-*] then {
+if { ![istarget cris-*-*] && ![istarget crisv32-*-*] } then {
   return
 }
 

diff --git a/gcc/testsuite/gcc.target/cris/peep2-andu1.c b/gcc/testsuite/gcc.target/cris/peep2-andu1.c
index 2e546e6256d687575de2bf0a9cf4ce441d3fdc1d..3b54c32958608ac056014b910e53568561bf72fe 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/peep2-andu1.c
+++ b/gcc/testsuite/gcc.target/cris/peep2-andu1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target cris-*-* } } */
+/* { dg-do compile } */
 /* { dg-final { scan-assembler-not "and.d " } } */
 /* { dg-final { scan-assembler-not "move.d " } } */
 /* { dg-final { scan-assembler "cLear.b" } } */

diff --git a/gcc/testsuite/gcc.target/cris/peep2-andu2.c b/gcc/testsuite/gcc.target/cris/peep2-andu2.c
index 4f687cc081c347bdef73f0ced7a383e3c8d9fb2f..55f638cdb5f735cd77d389e06ee5114e992bd706 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/peep2-andu2.c
+++ b/gcc/testsuite/gcc.target/cris/peep2-andu2.c
@@ -1,11 +1,11 @@
-/* { dg-do compile { target cris-*-* } } */
-/* { dg-final { scan-assembler "movu.w \\\$r10,\\\$r" } } */
-/* { dg-final { scan-assembler "and.w 2047,\\\$r" } } */
-/* { dg-final { scan-assembler-not "move.d \\\$r10,\\\$r" } } */
-/* { dg-final { scan-assembler "movu.b \\\$r10,\\\$r" } } */
-/* { dg-final { scan-assembler "and.b 95,\\\$r" } } */
-/* { dg-final { scan-assembler "andq -2,\\\$r" } } */
-/* { dg-options "-O2" } */
+/* { dg-do assemble } */
+/* { dg-final { scan-assembler "movu.w \\\$r10,\\\$" } } */
+/* { dg-final { scan-assembler "and.w 2047,\\\$" } } */
+/* { dg-final { scan-assembler-not "move.d \\\$r10,\\\$" } } */
+/* { dg-final { scan-assembler "movu.b \\\$r10,\\\$" } } */
+/* { dg-final { scan-assembler "and.b 95,\\\$" } } */
+/* { dg-final { scan-assembler "andq -2,\\\$" } } */
+/* { dg-options "-O2 -save-temps" } */
 
 /* Test the "andu" peephole2 trivially, register operand.  */
 

diff --git a/gcc/testsuite/gcc.target/cris/peep2-xsrand.c b/gcc/testsuite/gcc.target/cris/peep2-xsrand.c
index 9cfe40fb6e14616a0bb7379190d849ecdb4b1c6e..df0e76886b47d89968d03cdf07badec067c31c97 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/peep2-xsrand.c
+++ b/gcc/testsuite/gcc.target/cris/peep2-xsrand.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target cris-*-* } } */
+/* { dg-do compile } */
 /* { dg-final { scan-assembler "and.w " } } */
 /* { dg-final { scan-assembler "and.b " } } */
 /* { dg-final { scan-assembler-not "and.d" } } */

diff --git a/gcc/testsuite/gcc.target/cris/peep2-xsrand2.c b/gcc/testsuite/gcc.target/cris/peep2-xsrand2.c
index 30679b271cb42226e6554452e30e02185e68d0f3..5d6ca788d73a4151e336157c912b557ee154f244 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/peep2-xsrand2.c
+++ b/gcc/testsuite/gcc.target/cris/peep2-xsrand2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target cris-*-* } } */
+/* { dg-do compile } */
 /* { dg-final { scan-assembler "and.w -137," } } */
 /* { dg-final { scan-assembler "and.b -64," } } */
 /* { dg-final { scan-assembler "and.w -139," } } */

diff --git a/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp b/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
index b45590b9778f6a0dfce0c61811c1b026bdc043bd..a0b294fcde83eb2d47eed54db18db111d65af26e 100644 (file)
--- a/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
+++ b/gcc/testsuite/gcc.target/cris/torture/cris-torture.exp
@@ -18,7 +18,7 @@
 # optimization options.
 
 # Exit immediately if this isn't a CRIS target.
-if ![istarget cris-*-*] then {
+if { ![istarget cris-*-*] && ![istarget crisv32-*-*] } then {
   return
 }
 

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 0ee3918ef07cb9d846241661f0450b34e86faf18..aaa3b5beb1d991421a91cf33704acec41255cafb 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -421,6 +421,7 @@ proc check_profiling_available { test_what } {
             || [istarget strongarm*-*-elf]
             || [istarget xscale*-*-elf]
             || [istarget cris-*-*]
+            || [istarget crisv32-*-*]
             || [istarget fido-*-elf]
             || [istarget h8300-*-*]
             || [istarget m32c-*-elf]