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

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a6ff3aa8a1d4281e963e10d86864d100c225269f..08bdfae2dd01f67a467c5f398eee0cfc474d3332 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 3a6d61dfa412ebd14b53971a5d51fb2299d57746..8b14dc88e39276e7140b7bd98c2891e5a577327c 100644 (file)
--- a/gcc/varasm.c
+++ b/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);