varasm.c (output_constant_def): Don't ENCODE_SECTION_INFO twice.

* varasm.c (output_constant_def): Don't ENCODE_SECTION_INFO
twice.  Update desc->rtl and ->label, in case ENCODE_SECTION_INFO
modifies them.

From-SVN: r38551

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dcd8be951f7af6e4412caee6ed4185ca94421525..487d5ff359da7ae79bcaa057e73c0f3a08816bd4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-29  Alexandre Oliva  <aoliva@redhat.com>
+
+       * varasm.c (output_constant_def): Don't ENCODE_SECTION_INFO
+       twice.  Update desc->rtl and ->label, in case ENCODE_SECTION_INFO
+       modifies them.
+
 2000-12-29  Bernd Schmidt  <bernds@redhat.com>
 
        * ia64.c (ia64_expand_load_address): Accept additional scratch

diff --git a/gcc/varasm.c b/gcc/varasm.c
index 8f76f45f7192eee94f3444c3362476eea4029129..0ebcbd9da2aa79623901514eff270b122272e256 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -3204,7 +3204,14 @@ output_constant_def (exp, defer)
      such as that it is a function name.  If the name is changed, the macro
      ASM_OUTPUT_LABELREF will have to know how to strip this information.  */
 #ifdef ENCODE_SECTION_INFO
-  ENCODE_SECTION_INFO (exp);
+  /* A previously-processed constant would already have section info
+     encoded in it.  */
+  if (! found)
+    {
+      ENCODE_SECTION_INFO (exp);
+      desc->rtl = TREE_CST_RTL (exp);
+      desc->label = XSTR (XEXP (desc->rtl, 0), 0);
+    }
 #endif
 
 #ifdef CONSTANT_AFTER_FUNCTION_P