From 0422d54667cc4968ef328a546ee378d04264bb35 Mon Sep 17 00:00:00 2001 From: Andy Hutchinson Date: Mon, 23 Nov 2009 22:10:18 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 10 ++++++++++ gcc/testsuite/gcc.dg/utf-cvt.c | 10 +++++----- gcc/testsuite/gcc.dg/utf32-1.c | 1 - gcc/testsuite/gcc.dg/utf32-2.c | 1 - gcc/testsuite/gcc.dg/utf32-3.c | 1 - gcc/testsuite/gcc.dg/utf32-4.c | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3d83b2d5301..e7a37ea2161 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2009-11-23 Andy Hutchinson + + 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 * gcc.dg/tree-ssa/asmgoto-1.c: Suppress warnings. diff --git a/gcc/testsuite/gcc.dg/utf-cvt.c b/gcc/testsuite/gcc.dg/utf-cvt.c index 4c82dda2f7d..7f51179eeb4 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 7919faa6371..f9d24c4d0c3 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 */ /* 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 3fd1cf1fdf2..c0d23fb36ef 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 */ /* 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 486d04f946d..de7b2aa3532 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 */ /* 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 34a78da5f4b..aa7f66a3685 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 */ /* Expected errors for char32_t character constants. */ -/* { dg-do compile { target int32plus } } */ +/* { dg-do compile } */ /* { dg-options "-std=gnu99" } */ typedef __CHAR32_TYPE__ char32_t;