[PATCH] PR c/28800

[PATCH] PR c/28800

[Ralf Wildenhues]

OK for trunk?  Bootstrapped and regtested i686-pc-linux-gnu.

Thanks,
Ralf

gcc/ChangeLog:
2008-02-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	PR c/28800
	* c-parser.c (c_parser_translation_unit): Warn for empty
	translation unit, not empty source file.

gcc/testsuite/ChangeLog:
2008-02-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	PR c/28800
	* gcc.dg/empty-source-2.c: Adjust for warning message.
	* gcc.dg/empty-source-3.c: Likewise.
	* gcc.dg/pack-test-2.c: Adjust comment.
	* gcc.dg/pragma-ep-2.c: Likewise.
	* gcc.dg/pragma-re-2.c: Likewise.
	* gcc.dg/va-arg-2.c: Likewise.

diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index 72f8a21..1e63c14 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -1069,7 +1069,7 @@ c_parser_translation_unit (c_parser *parser)
   if (c_parser_next_token_is (parser, CPP_EOF))
     {
       if (pedantic)
-	pedwarn ("%HISO C forbids an empty source file",
+	pedwarn ("%HISO C forbids an empty translation unit",
 		 &c_parser_peek_token (parser)->location);
     }
   else
diff --git a/gcc/testsuite/gcc.dg/empty-source-2.c b/gcc/testsuite/gcc.dg/empty-source-2.c
index 4d9cc25..8ce201c 100644
--- a/gcc/testsuite/gcc.dg/empty-source-2.c
+++ b/gcc/testsuite/gcc.dg/empty-source-2.c
@@ -3,4 +3,4 @@
 /* { dg-do compile } */
 /* { dg-options "-pedantic" } */
 
-/* { dg-warning "ISO C forbids an empty source file" "empty" { target *-*-* } 6 } */
+/* { dg-warning "ISO C forbids an empty translation unit" "empty" { target *-*-* } 6 } */
diff --git a/gcc/testsuite/gcc.dg/empty-source-3.c b/gcc/testsuite/gcc.dg/empty-source-3.c
index 4facdab..0fd7be7 100644
--- a/gcc/testsuite/gcc.dg/empty-source-3.c
+++ b/gcc/testsuite/gcc.dg/empty-source-3.c
@@ -4,4 +4,4 @@
 /* { dg-do compile } */
 /* { dg-options "-pedantic-errors" } */
 
-/* { dg-error "ISO C forbids an empty source file" "empty" { target *-*-* } 7 } */
+/* { dg-error "ISO C forbids an empty translation unit" "empty" { target *-*-* } 7 } */
diff --git a/gcc/testsuite/gcc.dg/pack-test-2.c b/gcc/testsuite/gcc.dg/pack-test-2.c
index 8cb89f4..86e4d8d 100644
--- a/gcc/testsuite/gcc.dg/pack-test-2.c
+++ b/gcc/testsuite/gcc.dg/pack-test-2.c
@@ -22,4 +22,4 @@
 
 #pragma pack(push, foo, 3)      /* { dg-warning "small power of two" } */
 
-extern int blah;	/* prevent "ISO C forbids an empty source file" */
+extern int blah;	/* prevent "ISO C forbids an empty translation unit" */
diff --git a/gcc/testsuite/gcc.dg/pragma-ep-2.c b/gcc/testsuite/gcc.dg/pragma-ep-2.c
index 6e5c467..1151d9b 100644
--- a/gcc/testsuite/gcc.dg/pragma-ep-2.c
+++ b/gcc/testsuite/gcc.dg/pragma-ep-2.c
@@ -4,4 +4,4 @@
 #pragma extern_prefix foo		/* { dg-warning "malformed" } */
 #pragma extern_prefix "foo" 1		/* { dg-warning "junk" } */
 
-int bar; /* silence `ISO C forbids an empty source file' warning */
+int bar; /* silence `ISO C forbids an empty translation unit' warning */
diff --git a/gcc/testsuite/gcc.dg/pragma-re-2.c b/gcc/testsuite/gcc.dg/pragma-re-2.c
index 40b9148..e86bb87 100644
--- a/gcc/testsuite/gcc.dg/pragma-re-2.c
+++ b/gcc/testsuite/gcc.dg/pragma-re-2.c
@@ -5,4 +5,4 @@
 #pragma redefine_extname foo 1		/* { dg-warning "malformed" } */
 #pragma redefine_extname foo bar 2	/* { dg-warning "junk" } */
 
-int bar; /* silence `ISO C forbids an empty source file' warning */
+int bar; /* silence `ISO C forbids an empty translation unit' warning */
diff --git a/gcc/testsuite/gcc.dg/va-arg-2.c b/gcc/testsuite/gcc.dg/va-arg-2.c
index 597bf98..2fd0ed9 100644
--- a/gcc/testsuite/gcc.dg/va-arg-2.c
+++ b/gcc/testsuite/gcc.dg/va-arg-2.c
@@ -9,4 +9,4 @@
 /* { dg-error "no longer implements" "#error 1" { target *-*-* } 4 } */
 /* { dg-error "Revise your code" "#error 2" { target *-*-* } 5 } */
 
-int x;  /* prevent empty-source-file warning */
+int x;  /* prevent empty-translation-unit warning */

Re: [PATCH] PR c/28800

[Joseph S. Myers]

On Tue, 26 Feb 2008, Ralf Wildenhues wrote:

> gcc/ChangeLog:
> 2008-02-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	PR c/28800
> 	* c-parser.c (c_parser_translation_unit): Warn for empty
> 	translation unit, not empty source file.
> 
> gcc/testsuite/ChangeLog:
> 2008-02-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
> 
> 	PR c/28800
> 	* gcc.dg/empty-source-2.c: Adjust for warning message.
> 	* gcc.dg/empty-source-3.c: Likewise.
> 	* gcc.dg/pack-test-2.c: Adjust comment.
> 	* gcc.dg/pragma-ep-2.c: Likewise.
> 	* gcc.dg/pragma-re-2.c: Likewise.
> 	* gcc.dg/va-arg-2.c: Likewise.

OK.

-- 
Joseph S. Myers
joseph@codesourcery.com