4 files changed, 15 insertions, 8 deletions
diff --git a/gcc/testsuite/gcc.dg/cpp/19951227-1.c b/gcc/testsuite/gcc.dg/cpp/19951227-1.c
index 0d8fcfd..da2f6d851 100644
--- a/gcc/testsuite/gcc.dg/cpp/19951227-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/19951227-1.c
@@ -1,3 +1,3 @@
 /* { dg-do preprocess } */
-#if 0xe-1	/* { dg-error "invalid number" } */
+#if 0xe-1	/* { dg-error "invalid suffix" } */
 #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/assert2.c b/gcc/testsuite/gcc.dg/cpp/assert2.c
index 26d3aad..bdbf85d 100644
--- a/gcc/testsuite/gcc.dg/cpp/assert2.c
+++ b/gcc/testsuite/gcc.dg/cpp/assert2.c
@@ -20,5 +20,5 @@
 #error		/* { dg-bogus "error" "test w/o answer" } */
 #endif
 
-#if #abc[def]	/* { dg-error "invalid char" "test with malformed answer" } */
+#if #abc[def]	/* { dg-error "is not valid" "test with malformed answer" } */
 #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/if-1.c b/gcc/testsuite/gcc.dg/cpp/if-1.c
index 9b7c8d3..863fa90 100644
--- a/gcc/testsuite/gcc.dg/cpp/if-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/if-1.c
@@ -9,22 +9,29 @@
 #error 077 != 63 /* { dg-bogus "#error" "normal conversion" } */
 #endif
 
-#if 12wrt /* { dg-error "nvalid number|missing white" "invalid number" } */
+#if 12wrt /* { dg-error "invalid suffix" "invalid number" } */
 #endif
 
-#if 0abc /* { dg-error "nvalid number|missing white" "invalid number" } */
+#if 0abc /* { dg-error "invalid suffix" "invalid number" } */
 #endif
 
-#if 42abc /* { dg-error "nvalid number|missing white" "invalid number" } */
+#if 42abc /* { dg-error "invalid suffix" "invalid number" } */
+#endif
+
+#if 0xabc != 2748
+#error 0xabc	/* { dg-bogus "#error" "normal conversion" } */
 #endif
 
 #if 1.2 /* { dg-error "loating point numbers" "floating point in #if" } */
 #endif
 
-#if 4uu /* { dg-error "too many 'u'" "too many suffixes" } */
+#if 4uu /* { dg-error "invalid suffix" "too many suffixes" } */
+#endif
+
+#if 124123231lll /* { dg-error "invalid suffix" "too many suffixes" } */
 #endif
 
-#if 124123231lll /* { dg-error "too many 'l'" "too many suffixes" } */
+#if 1234lul	/* { dg-error "invalid suffix" "u between ls" } */
 #endif
 
 #if 099 /* { dg-error "digits beyond the radix" "decimal in octal constant" } */
diff --git a/gcc/testsuite/gcc.dg/cpp/if-4.c b/gcc/testsuite/gcc.dg/cpp/if-4.c
index 84764fb..a39c11d 100644
--- a/gcc/testsuite/gcc.dg/cpp/if-4.c
+++ b/gcc/testsuite/gcc.dg/cpp/if-4.c
@@ -2,7 +2,7 @@
    NUL terminated, so we would print garbage after it.  */
 /* { dg-do compile } */
 
-#if 1 += 2   /* { dg-error "'\\+=' is not allowed" "+= in if" } */
+#if 1 += 2   /* { dg-error "'\\+=' is not valid" "+= in if" } */
 syntax_error
 #endif
 int foo;