diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b7386015aa352fd674de2e6907449fadd8e9dac..ca728cd97f65991416c38f2e6e369fddfee79ba0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-29  Joseph S. Myers  <joseph@codesourcery.com>
+
+	PR c/20672
+	* c-parser.c (c_parser_compound_statement_nostart): Give error
+	message for EOF instead of just setting parser->error.
+
 2005-03-29  Dorit Naishlos  <dorit@il.ibm.com>
 
 	* tree-vectorizer.c (slpeel_update_phi_nodes_for_guard): Removed.
diff --git a/gcc/c-parser.c b/gcc/c-parser.c
index 8e8626ef248efdd0b886bd799cc25da469c1c934..9a5d669d034a7deaaf7b0d19cac3c01cdf44a503 100644
--- a/gcc/c-parser.c
+++ b/gcc/c-parser.c
@@ -3238,7 +3238,7 @@ c_parser_compound_statement_nostart (c_parser *parser)
       location_t loc = c_parser_peek_token (parser)->location;
       if (c_parser_next_token_is (parser, CPP_EOF))
 	{
-	  parser->error = true;
+	  c_parser_error (parser, "expected declaration or statement");
 	  return;
 	}
       if (c_parser_next_token_is_keyword (parser, RID_CASE)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dba8cc6a10cd4b0be46b471db9cef8214cbd3cd4..2c1e6d0c5e9674d5eed509e9af7fc2d1343363ef 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-29  Joseph S. Myers  <joseph@codesourcery.com>
+
+	PR c/20672
+	* gcc.dg/pr20672-1.c: New test.
+
 2005-03-29  Dorit Naishlos  <dorit@il.ibm.com>
 
 	* gfortran.dg/vect: New directory.
diff --git a/gcc/testsuite/gcc.dg/pr20672-1.c b/gcc/testsuite/gcc.dg/pr20672-1.c
new file mode 100644
index 0000000000000000000000000000000000000000..e47fef3fa4338d02f6e687a7fd8d3f5d3a50e1e2
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr20672-1.c
@@ -0,0 +1,7 @@
+/* EOF must cause an error inside a function, not just set parser->error.
+   Bug 20672.  */
+/* { dg-do compile } */
+/* { dg-options "" } */
+int main(void)
+{
+int a; /* { dg-error "expected" } */