diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9a50d255e2a54e12189deb230cdc2788b9db9d9e..b3851d468e6119f68f6d069e6fad7748ef165044 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-30  Mark Mitchell  <mark@codesourcery.com>
+
+	* decl.c (grokdeclarator): Diagnost "extern thread" and "static
+	thread" correctly.
+
 2002-12-30  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* decl.c, decl2.c, decl.h:  GCC, not GNU CC.  This is the C++ front
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index c0f82f70ac362740b004653f29ec3f0be4c3bca3..7b29820d1208a2544525719797d14cce725d12d0 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -10430,13 +10430,12 @@ grokdeclarator (declarator, declspecs, decl_context, initialized, attrlist)
 		  else if (RIDBIT_SETP (i, specbits))
 		    pedwarn ("duplicate `%s'", IDENTIFIER_POINTER (id));
 
-		  /* Diagnose "__thread extern".  Recall that this list
-		     is in the reverse order seen in the text.  */
-		  if (i == (int)RID_THREAD)
+		  /* Diagnose "__thread extern" or "__thread static".  */
+		  if (RIDBIT_SETP (RID_THREAD, specbits))
 		    {
-		      if (RIDBIT_SETP (RID_EXTERN, specbits))
+		      if (i == (int)RID_EXTERN)
 			error ("`__thread' before `extern'");
-		      if (RIDBIT_SETP (RID_STATIC, specbits))
+		      else if (i == (int)RID_STATIC)
 			error ("`__thread' before `static'");
 		    }