varasm.c (make_decl_rtl): Don't append var_labelno discriminator to variable…

varasm.c (make_decl_rtl): Don't append var_labelno discriminator to variable names where DECL_NAME is...

	* varasm.c (make_decl_rtl): Don't append var_labelno discriminator
	to variable names where DECL_NAME is different from
	DECL_ASSEMBLER_NAME.

From-SVN: r40794

gcc/ChangeLog

+2001-03-23  Jakub Jelinek  <jakub@redhat.com>
+
+	* varasm.c (make_decl_rtl): Don't append var_labelno discriminator
+	to variable names where DECL_NAME is different from
+	DECL_ASSEMBLER_NAME.
+
 2001-03-23  Jim Wilson  <wilson@redhat.com>
 
 	* varasm.c (make_decl_rtl): Add TREE_PUBLIC check to abort test.

gcc/varasm.c

@@ -708,7 +708,8 @@ make_decl_rtl (decl, asmspec)
      Concatenate a distinguishing number.  */
   if (!top_level && !TREE_PUBLIC (decl)
       && ! (DECL_CONTEXT (decl) && TYPE_P (DECL_CONTEXT (decl)))
-      && asmspec == 0)
+      && asmspec == 0
+      && name == IDENTIFIER_POINTER (DECL_NAME (decl)))
     {
       char *label;
       ASM_FORMAT_PRIVATE_NAME (label, name, var_labelno);