From 42348a6906649986c77dd2071c48e63292a53762 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Sat, 13 Nov 2010 16:19:33 +0000
Subject: [PATCH] re PR c/46462 (Revision 166700 caused new C test failures)

2010-11-13  Paolo Bonzini  <bonzini@gnu.org>

	PR c/46462
	* gcc.dg/gomp/pr34607.c: Adjust errors for unknown typenames.
	* gcc.dg/pr35746.c: Likewise.
	* gcc.dg/cpp/direct2.c: Likewise.
	* gcc.dg/cpp/direct2s.c: Likewise.
	* gcc.dg/noncompile/920923-1.c: Likewise.
	* gcc.dg/dfp/constants-c99.c: Add -Wno-overflow.

From-SVN: r166711
---
 gcc/testsuite/ChangeLog                    | 10 ++++++++++
 gcc/testsuite/gcc.dg/cpp/direct2.c         |  4 ++--
 gcc/testsuite/gcc.dg/cpp/direct2s.c        |  4 ++--
 gcc/testsuite/gcc.dg/dfp/constants-c99.c   |  2 +-
 gcc/testsuite/gcc.dg/gomp/pr34607.c        |  7 +++----
 gcc/testsuite/gcc.dg/noncompile/920923-1.c |  9 +++++----
 gcc/testsuite/gcc.dg/pr35746.c             |  5 ++---
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 306239a5a65c..708d31ab1a83 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-13  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR c/46462
+	* gcc.dg/gomp/pr34607.c: Adjust errors for unknown typenames.
+	* gcc.dg/pr35746.c: Likewise.
+	* gcc.dg/cpp/direct2.c: Likewise.
+	* gcc.dg/cpp/direct2s.c: Likewise.
+	* gcc.dg/noncompile/920923-1.c: Likewise.
+	* gcc.dg/dfp/constants-c99.c: Add -Wno-overflow.
+
 2010-11-13  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	* obj-c++.dg/attributes/method-format-1.mm: Adjust.
diff --git a/gcc/testsuite/gcc.dg/cpp/direct2.c b/gcc/testsuite/gcc.dg/cpp/direct2.c
index 5ea04da37a11..858dec7f31ef 100644
--- a/gcc/testsuite/gcc.dg/cpp/direct2.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2.c
@@ -20,13 +20,13 @@ int resync_parser_2;
 
 void g1 ()
 {
-HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "# from macro" } */
+HASH define X 1 /* { dg-error "stray|unknown|expected" "# from macro" } */
   int resync_parser_3;
 }
 
 void g2 ()
 {
-HASHDEFINE  Y 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "#define from macro" } */
+HASHDEFINE  Y 1 /* { dg-error "stray|unknown|expected" "#define from macro" } */
   int resync_parser_4;
 }
 
diff --git a/gcc/testsuite/gcc.dg/cpp/direct2s.c b/gcc/testsuite/gcc.dg/cpp/direct2s.c
index 89c0f6b91728..9d0cc017df72 100644
--- a/gcc/testsuite/gcc.dg/cpp/direct2s.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2s.c
@@ -22,13 +22,13 @@ int resync_parser_2;
 
 void g1 ()
 {
-HASH define X 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "# from macro" } */
+HASH define X 1 /* { dg-error "stray|unknown|expected" "# from macro" } */
   int resync_parser_3;
 }
 
 void g2 ()
 {
-HASHDEFINE  Y 1 /* { dg-error "stray|undeclared|parse|syntax|expected|for each" "#define from macro" } */
+HASHDEFINE  Y 1 /* { dg-error "stray|unknown|expected" "#define from macro" } */
   int resync_parser_4;
 }
 
diff --git a/gcc/testsuite/gcc.dg/dfp/constants-c99.c b/gcc/testsuite/gcc.dg/dfp/constants-c99.c
index 8dcfc7b2420a..6a48bf501f03 100644
--- a/gcc/testsuite/gcc.dg/dfp/constants-c99.c
+++ b/gcc/testsuite/gcc.dg/dfp/constants-c99.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c99" } */
+/* { dg-options "-std=c99 -Wno-overflow" } */
 
 /* N1150 6: Constants.
    C99 6.4.4.2: Floating constants.  */
diff --git a/gcc/testsuite/gcc.dg/gomp/pr34607.c b/gcc/testsuite/gcc.dg/gomp/pr34607.c
index 25ce406d7d5d..d64af282f9ef 100644
--- a/gcc/testsuite/gcc.dg/gomp/pr34607.c
+++ b/gcc/testsuite/gcc.dg/gomp/pr34607.c
@@ -1,7 +1,6 @@
 /* PR c++/34607 */
 /* { dg-do compile } */
 /* { dg-options "-fopenmp -std=gnu99" } */
-/* { dg-message "undeclared identifier is reported only once" "reminder" { target *-*-* } 0 } */
 void
 foo ()
 {
@@ -9,10 +8,10 @@ foo ()
   for (int i =; i < 2; ++i)	/* { dg-error "expected expression before" } */
     ;
 #pragma omp for
-  for (T i = 54; i < 56; i++)	/* { dg-error "expected iteration declaration" } */
+  for (T i = 54; i < 56; i++)	/* { dg-error "unknown type name" } */
     ;
-  T j;				/* { dg-error "undeclared|for each function|expected" } */
+  T j;				/* { dg-error "unknown type name" } */
 #pragma omp for
-  for (j = 1; j < 3; j++)	/* { dg-error "undeclared" } */
+  for (j = 1; j < 3; j++)
     ;
 }
diff --git a/gcc/testsuite/gcc.dg/noncompile/920923-1.c b/gcc/testsuite/gcc.dg/noncompile/920923-1.c
index 8dd19b272f9e..f586a7c0d043 100644
--- a/gcc/testsuite/gcc.dg/noncompile/920923-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/920923-1.c
@@ -1,3 +1,4 @@
+/* { dg-message "undeclared identifier is reported only once" "reminder for mmu_base" { target *-*-* } 0 } */
 typedef BYTE unsigned char;	/* { dg-error "expected" } */
 typedef int item_n;
 typedef int perm_set;
@@ -5,7 +6,7 @@ struct PENT { caddr_t v_addr; };/* { dg-error "expected" } */
 typedef struct PENT prec;
 typedef struct PENT *prec_t;
 prec_t mem_hash;
-BYTE *mem_base;			/* { dg-error "expected" } */
+BYTE *mem_base;			/* { dg-error "unknown type name" } */
 struct PTE {
      BYTE *p_page;		/* { dg-error "expected" } */
      perm_set p_perms;
@@ -24,9 +25,9 @@ int pcount=0;
 
 void
 mmu_walk_find(va)
-caddr_t va;			/* { dg-error "expected" } */
+caddr_t va;			/* { dg-error "unknown type name" } */
 {
-     BYTE *page_addr; /* { dg-error "undeclared|for each function" } */
+     BYTE *page_addr; /* { dg-error "unknown type name" } */
      if (mmu_base[Level1(va)]->valid==0x0) { /* { dg-error "undeclared" } */
 	  l1_base = mmu_base[Level1(va)]->(u.p_tablep) = p_alloc(); /* { dg-error "expected|undeclared" } */
 	  mmu_base[Level1(va)]->valid = 0x3;
@@ -52,7 +53,7 @@ caddr_t va;			/* { dg-error "expected" } */
 void *
 a_translate(va_op, v_addr)
 int va_op;
-caddr_t v_addr;			/* { dg-error "expected" } */
+caddr_t v_addr;			/* { dg-error "unknown type name" } */
 {
      register prec_t bucket;
      register caddr_t p_addr;	/* { dg-error "expected|undeclared" } */
diff --git a/gcc/testsuite/gcc.dg/pr35746.c b/gcc/testsuite/gcc.dg/pr35746.c
index c04053f596fc..274f4a968273 100644
--- a/gcc/testsuite/gcc.dg/pr35746.c
+++ b/gcc/testsuite/gcc.dg/pr35746.c
@@ -6,8 +6,7 @@ int foo(int i);
 void bar()
 {
   __complex__ int i;
-  X j;			/* { dg-error "undeclared|expected" } */
-                        /* { dg-message "undeclared identifier is reported only once" "reminder" { target *-*-* } 9 } */
-  if (i = foo(j))	/* { dg-error "undeclared" } */
+  X j;			/* { dg-error "unknown" } */
+  if (i = foo(j))
     ;
 }
-- 
GitLab