17 files changed, 25 insertions, 16 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0b5ed35..1888db7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-07  Neil Booth  <neilb@earthling.net>
+
+        * gcc.dg/wtr-aggr-init-1.c, wtr-escape-1.c, wtr-int-type-1.c,
+        wtr-label-1.c, wtr-static-1.c, wtr-strcat-1.c, wtr-suffix-1.c,
+        wtr-switch-1.c, wtr-unary-plus-1.c, wtr-union-init-1.c
+        wtr-union-init-2.c, wtr-union-init-3.c: Update.
+        * gcc.dg/cpp/extratokens.c, tr-warn4.c, tr-warn5.c, tr-warn6.c:
+        Update.
+
 2000-12-07  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* gcc.dg/format-nonlit-1.c, gcc.dg/format-nonlit-2.c: Use
diff --git a/gcc/testsuite/gcc.dg/cpp/extratokens.c b/gcc/testsuite/gcc.dg/cpp/extratokens.c
index 42090ec..0941be7 100644
--- a/gcc/testsuite/gcc.dg/cpp/extratokens.c
+++ b/gcc/testsuite/gcc.dg/cpp/extratokens.c
@@ -31,7 +31,7 @@
 
 #ident "something" bar /* { dg-error "extra tokens" "tokens after #ident" } */
 
-#line 36 "file.c" 3
+# 36 "file.c" 3
 
 /* ... but in a system header, it's acceptable.  */
 #ifdef KERNEL
diff --git a/gcc/testsuite/gcc.dg/cpp/tr-warn4.c b/gcc/testsuite/gcc.dg/cpp/tr-warn4.c
index fb9dee9..14dd8a3 100644
--- a/gcc/testsuite/gcc.dg/cpp/tr-warn4.c
+++ b/gcc/testsuite/gcc.dg/cpp/tr-warn4.c
@@ -13,7 +13,7 @@
 #if 1l
 #endif
   
-#line 17 "sys-header.h" 3
+# 17 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
 #if 1U
diff --git a/gcc/testsuite/gcc.dg/cpp/tr-warn5.c b/gcc/testsuite/gcc.dg/cpp/tr-warn5.c
index ab301b3..16dcf4c 100644
--- a/gcc/testsuite/gcc.dg/cpp/tr-warn5.c
+++ b/gcc/testsuite/gcc.dg/cpp/tr-warn5.c
@@ -7,7 +7,7 @@
 #if +1 /* { dg-warning "unary plus operator" "unary plus operator" } */
 #endif
   
-#line 11 "sys-header.h" 3
+# 11 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
 #if +1
diff --git a/gcc/testsuite/gcc.dg/cpp/tr-warn6.c b/gcc/testsuite/gcc.dg/cpp/tr-warn6.c
index 586c56c..5c94e4c 100644
--- a/gcc/testsuite/gcc.dg/cpp/tr-warn6.c
+++ b/gcc/testsuite/gcc.dg/cpp/tr-warn6.c
@@ -15,7 +15,7 @@
 /* Catch the second warning from the above line.  */
 /* { dg-warning "macro argument \"world\" would be stringified" "traditional stringification" { target *-*-* } 13 } */
 
-#line 19 "sys-header.h" 3
+# 19 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
 #define bar1(h) sdf "h3" fds "h"
diff --git a/gcc/testsuite/gcc.dg/wtr-aggr-init-1.c b/gcc/testsuite/gcc.dg/wtr-aggr-init-1.c
index 259716e..e283ea1 100644
--- a/gcc/testsuite/gcc.dg/wtr-aggr-init-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-aggr-init-1.c
@@ -22,7 +22,7 @@ testfunc1 (void)
   f3 = f4;
 }
   
-#line 26 "sys-header.h" 3
+# 26 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
 struct foo f5 = { 0, 0 };
diff --git a/gcc/testsuite/gcc.dg/wtr-escape-1.c b/gcc/testsuite/gcc.dg/wtr-escape-1.c
index a83bdc5..150b4ce 100644
--- a/gcc/testsuite/gcc.dg/wtr-escape-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-escape-1.c
@@ -13,7 +13,7 @@ testfunc (void)
   c = '\x2'; /* { dg-warning "the meaning of" "escaped character warning " } */
   c = '\n';
 
-#line 17 "sys-header.h" 3
+# 17 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   c = '\a';
diff --git a/gcc/testsuite/gcc.dg/wtr-int-type-1.c b/gcc/testsuite/gcc.dg/wtr-int-type-1.c
index 76de1af..52a5471 100644
--- a/gcc/testsuite/gcc.dg/wtr-int-type-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-int-type-1.c
@@ -25,7 +25,7 @@ testfunc (void)
      test passes and both matched by checking for "integer constant".  */
   i = 18446744073709551615; /* { dg-warning "integer constant" "integer constant" } */
   
-#line 29 "sys-header.h" 3
+# 29 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   i = 0x80000000;
diff --git a/gcc/testsuite/gcc.dg/wtr-label-1.c b/gcc/testsuite/gcc.dg/wtr-label-1.c
index 98f3eeb..38ccd16 100644
--- a/gcc/testsuite/gcc.dg/wtr-label-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-label-1.c
@@ -28,7 +28,7 @@ testfunc1 (int foo6)
  j: ;
 }
   
-#line 32 "sys-header.h" 3
+# 32 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
 void
diff --git a/gcc/testsuite/gcc.dg/wtr-static-1.c b/gcc/testsuite/gcc.dg/wtr-static-1.c
index 676b482..f00cd8a 100644
--- a/gcc/testsuite/gcc.dg/wtr-static-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-static-1.c
@@ -7,7 +7,7 @@
 static void testfunc1(void);
 void testfunc1(void) {} /* { dg-warning "non-static.*follows static" "non-static follows static" } */
 
-#line 11 "sys-header.h" 3
+# 11 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
 static void testfunc2(void);
diff --git a/gcc/testsuite/gcc.dg/wtr-strcat-1.c b/gcc/testsuite/gcc.dg/wtr-strcat-1.c
index 06806b1..ca85a5c 100644
--- a/gcc/testsuite/gcc.dg/wtr-strcat-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-strcat-1.c
@@ -11,7 +11,7 @@ testfunc (void)
   
   foo = "hello" "hello"; /* { dg-warning "string concatenation" "string concatenation" } */
 
-#line 15 "sys-header.h" 3
+# 15 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   foo = "hello" "hello";
diff --git a/gcc/testsuite/gcc.dg/wtr-suffix-1.c b/gcc/testsuite/gcc.dg/wtr-suffix-1.c
index 056dbb7..30e4959 100644
--- a/gcc/testsuite/gcc.dg/wtr-suffix-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-suffix-1.c
@@ -20,7 +20,7 @@ testfunc (void)
   f = 1.0L; /* { dg-warning "traditional C rejects the 'l' suffix" "numeric constant suffix" } */
   f = 1.0l; /* { dg-warning "traditional C rejects the 'l' suffix" "numeric constant suffix" } */
  
-#line 24 "sys-header.h" 3
+# 24 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   i = 1L;
diff --git a/gcc/testsuite/gcc.dg/wtr-switch-1.c b/gcc/testsuite/gcc.dg/wtr-switch-1.c
index c42cdb11..e1c0d30 100644
--- a/gcc/testsuite/gcc.dg/wtr-switch-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-switch-1.c
@@ -13,7 +13,7 @@ testfunc (long l)
     break;
   }
 
-#line 17 "sys-header.h" 3
+# 17 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   switch (l)
diff --git a/gcc/testsuite/gcc.dg/wtr-unary-plus-1.c b/gcc/testsuite/gcc.dg/wtr-unary-plus-1.c
index ec3cd19..b6b053c 100644
--- a/gcc/testsuite/gcc.dg/wtr-unary-plus-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-unary-plus-1.c
@@ -12,7 +12,7 @@ testfunc (void)
   i = +1; /* { dg-warning "unary plus operator" "unary plus operator" } */
   i = +i; /* { dg-warning "unary plus operator" "unary plus operator" } */
   
-#line 16 "sys-header.h" 3
+# 16 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   i = +1;
diff --git a/gcc/testsuite/gcc.dg/wtr-union-init-1.c b/gcc/testsuite/gcc.dg/wtr-union-init-1.c
index 1f00069..312bfa9 100644
--- a/gcc/testsuite/gcc.dg/wtr-union-init-1.c
+++ b/gcc/testsuite/gcc.dg/wtr-union-init-1.c
@@ -17,7 +17,7 @@ testfunc (void)
   static union foo f1 = { 0 };
   static union foo f2 = { 1 }; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
 
-#line 21 "sys-header.h" 3
+# 21 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   static union foo f3 = { 0 };
diff --git a/gcc/testsuite/gcc.dg/wtr-union-init-2.c b/gcc/testsuite/gcc.dg/wtr-union-init-2.c
index 3c2aad7..6366ff3 100644
--- a/gcc/testsuite/gcc.dg/wtr-union-init-2.c
+++ b/gcc/testsuite/gcc.dg/wtr-union-init-2.c
@@ -31,7 +31,7 @@ testfunc (void)
   static union foo1 f7 = {1.0}; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
   static union foo2 f8 = {1.0}; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
 
-#line 35 "sys-header.h" 3
+# 35 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   static union foo1 b1 = {0};
diff --git a/gcc/testsuite/gcc.dg/wtr-union-init-3.c b/gcc/testsuite/gcc.dg/wtr-union-init-3.c
index 3eec29e..c5d8e73 100644
--- a/gcc/testsuite/gcc.dg/wtr-union-init-3.c
+++ b/gcc/testsuite/gcc.dg/wtr-union-init-3.c
@@ -50,7 +50,7 @@ testfunc (void)
   static struct baz2 f5 = { 1, 2, {0} };
   static struct baz2 f6 = { 1, 2, {1} }; /* { dg-warning "traditional C rejects initialization of unions" "initialization of unions" } */
 
-#line 54 "sys-header.h" 3
+# 54 "sys-header.h" 3
 /* We are in system headers now, no -Wtraditional warnings should issue.  */
 
   static union foo b1 = {{0,0}};