diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b44835975d2..78ef900c80b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-20  Mark Mitchell  <mark@codesourcery.com>
+
+	* tree.c (set_decl_assembler_name): Set DECL_ASSEMBLER_NAME for
+	variables that are TREE_PUBLIC, even if not TREE_STATIC.
+
 2001-03-20  DJ Delorie  <dj@redhat.com>
 
 	* Makefile.in (install-libgcc): Pass complete list of variables.
diff --git a/gcc/tree.c b/gcc/tree.c
index 573d7a2aa13..d05f3cac1da 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -204,7 +204,9 @@ set_decl_assembler_name (decl)
      DECL_ASSEMBLER_NAME.  */
   if (TREE_CODE (decl) == FUNCTION_DECL
       || (TREE_CODE (decl) == VAR_DECL 
-	  && (TREE_STATIC (decl) || DECL_EXTERNAL (decl))))
+	  && (TREE_STATIC (decl) 
+	      || DECL_EXTERNAL (decl) 
+	      || TREE_PUBLIC (decl))))
     /* By default, assume the name to use in assembly code is the
        same as that used in the source language.  (That's correct
        for C, and GCC used to set DECL_ASSEMBLER_NAME to the same