decl.c (grokdeclarator): Diagnost "extern thread" and "static thread" correctly.

	* decl.c (grokdeclarator): Diagnost "extern thread" and "static
	thread" correctly.

From-SVN: r60637

gcc/cp/ChangeLog

+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

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'");
 		    }