re PR c/36470 (sizeof UTF-32 is 2 on AVR)

PR testsuite/36470
* gcc.dg/utf-cvt.c: Skip int test for 16bit int targets.
Enable short test for avr target.
* gcc.dg/utf32-1.c: Enable test for avr and m32 targets.
* gcc.dg/utf32-2.c: Ditto.
* gcc.dg/utf32-3.c: Ditto.
* gcc.dg/utf32-4.c: Enable test for non-32bit targets.

From-SVN: r154471

6 files changed, 16 insertions, 9 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3d83b2d..e7a37ea 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,15 @@
 2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
 
+	PR testsuite/36470
+	* gcc.dg/utf-cvt.c: Skip int test for 16bit int targets.
+	Enable short test for avr target.
+	* gcc.dg/utf32-1.c: Enable test for avr and m32 targets.
+	* gcc.dg/utf32-2.c: Ditto.
+	* gcc.dg/utf32-3.c: Ditto.
+	* gcc.dg/utf32-4.c: Enable test for non-32bit targets.
+
+2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
+
 	* gcc.dg/tree-ssa/asmgoto-1.c: Suppress warnings.
 
 2009-11-23  Andy Hutchinson  <hutchinsonandy@gcc.gnu.org>
diff --git a/gcc/testsuite/gcc.dg/utf-cvt.c b/gcc/testsuite/gcc.dg/utf-cvt.c
index 4c82dda..7f51179 100644
--- a/gcc/testsuite/gcc.dg/utf-cvt.c
+++ b/gcc/testsuite/gcc.dg/utf-cvt.c
@@ -44,11 +44,11 @@ void m (char16_t c0, char32_t c1)
     f_c (c1);	/* { dg-warning "alter its value" } */
     fsc (c1);	/* { dg-warning "alter its value" } */
     fuc (c1);	/* { dg-warning "alter its value" } */
-    f_s (c1);	/* { dg-warning "alter its value" "" { target { ! "avr-*-*" } } } */
-    fss (c1);	/* { dg-warning "alter its value" "" { target { ! "avr-*-*" } } } */
-    fus (c1);	/* { dg-warning "alter its value" "" { target { ! "avr-*-*" } } } */
-    f_i (c1);	/* { dg-warning "change the sign" } */
-    fsi (c1);	/* { dg-warning "change the sign" } */
+    f_s (c1);	/* { dg-warning "alter its value" } */
+    fss (c1);	/* { dg-warning "alter its value" } */
+    fus (c1);	/* { dg-warning "alter its value" } */
+    f_i (c1);	/* { dg-warning "change the sign" "" { target { ! int16 } } } */
+    fsi (c1);	/* { dg-warning "change the sign" "" { target { ! int16 } } } */
     fui (c1);
     f_l (c1);	/* { dg-warning "change the sign" "" { target { llp64 || ilp32 } } } */
     fsl (c1);	/* { dg-warning "change the sign" "" { target { llp64 || ilp32 } } } */
diff --git a/gcc/testsuite/gcc.dg/utf32-1.c b/gcc/testsuite/gcc.dg/utf32-1.c
index 7919faa..f9d24c4 100644
--- a/gcc/testsuite/gcc.dg/utf32-1.c
+++ b/gcc/testsuite/gcc.dg/utf32-1.c
@@ -1,7 +1,6 @@
 /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
 /* Test the support for char32_t character constants. */
 /* { dg-do run } */
-/* { dg-xfail-run-if "PR36470" { "avr-*-*" "m32c-*-*" } { "*" } { "" } } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
 typedef __CHAR32_TYPE__ char32_t;
diff --git a/gcc/testsuite/gcc.dg/utf32-2.c b/gcc/testsuite/gcc.dg/utf32-2.c
index 3fd1cf1..c0d23fb 100644
--- a/gcc/testsuite/gcc.dg/utf32-2.c
+++ b/gcc/testsuite/gcc.dg/utf32-2.c
@@ -1,7 +1,6 @@
 /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
 /* Test the support for char32_t* string constants. */
 /* { dg-do run } */
-/* { dg-xfail-run-if "PR36470" { "avr-*-*" "m32c-*-*" } { "*" } { "" } } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
 typedef __CHAR32_TYPE__ char32_t;
diff --git a/gcc/testsuite/gcc.dg/utf32-3.c b/gcc/testsuite/gcc.dg/utf32-3.c
index 486d04f..de7b2aa 100644
--- a/gcc/testsuite/gcc.dg/utf32-3.c
+++ b/gcc/testsuite/gcc.dg/utf32-3.c
@@ -1,7 +1,6 @@
 /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
 /* Test concatenation of char32_t* string literals. */
 /* { dg-do run } */
-/* { dg-xfail-run-if "PR36470" { "avr-*-*" "m32c-*-*" } { "*" } { "" } } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
 typedef __CHAR32_TYPE__ char32_t;
diff --git a/gcc/testsuite/gcc.dg/utf32-4.c b/gcc/testsuite/gcc.dg/utf32-4.c
index 34a78da..aa7f66a 100644
--- a/gcc/testsuite/gcc.dg/utf32-4.c
+++ b/gcc/testsuite/gcc.dg/utf32-4.c
@@ -1,6 +1,6 @@
 /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
 /* Expected errors for char32_t character constants. */
-/* { dg-do compile { target int32plus } } */
+/* { dg-do compile } */
 /* { dg-options "-std=gnu99" } */
 
 typedef __CHAR32_TYPE__ char32_t;