diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cb9c6124ac4a..2970abba965c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* decl.c (start_decl): Only check DECL_THREAD_LOCAL for VAR_DECLs.
+
 2003-01-09  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
 
 	* pt.c (push_access_scope_real): Call push_to_top_level for
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 8d8e53fb92f6..35a14e8cbe0f 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -7177,7 +7177,8 @@ start_decl (tree declarator,
      wrong semantics.  If we say -fno-conserve-space, we want this to
      produce errors about redefs; to do this we force variables into the
      data segment.  */
-  DECL_COMMON (tem) = (!DECL_THREAD_LOCAL (tem)
+  DECL_COMMON (tem) = ((TREE_CODE (tem) != VAR_DECL
+			|| !DECL_THREAD_LOCAL (tem))
 		       && (flag_conserve_space || ! TREE_PUBLIC (tem)));
 #endif