* class.c (build_utf8_ref): Test for HAVE_GAS_SHF_MERGE value.

From-SVN: r71733

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6f127f3df009a7020d2625ae7ba6cbc665bf6fd6..9d2cc8ca71e2caf15ed52ee36d96572a1c06543f 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-24  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * class.c (build_utf8_ref): Test for HAVE_GAS_SHF_MERGE value.
+
 2003-09-23  Roger Sayle  <roger@eyesopen.com>
 
        * jcf-write.c (generate_bytecode_insns): Optimize binary operations

diff --git a/gcc/java/class.c b/gcc/java/class.c
index e3e6cc36e586b5f6b65a3cf5d0b45c8496e08a50..552a4f458620f4bd86e17341b521f6dbde32c763 100644 (file)
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -779,23 +779,24 @@ build_utf8_ref (tree name)
   TREE_READONLY (decl) = 1;
   TREE_THIS_VOLATILE (decl) = 0;
   DECL_INITIAL (decl) = cinit;
-#ifdef HAVE_GAS_SHF_MERGE
-  {
-    int decl_size;
-    /* Ensure decl_size is a multiple of utf8const_type's alignment. */
-    decl_size = (name_len + 5 + TYPE_ALIGN_UNIT (utf8const_type) - 1)
-                & ~(TYPE_ALIGN_UNIT (utf8const_type) - 1);
-    if (flag_merge_constants && decl_size < 256)
-      {
-        char buf[32];
-        int flags = (SECTION_OVERRIDE
-                  | SECTION_MERGE | (SECTION_ENTSIZE & decl_size));
-        sprintf (buf, ".rodata.jutf8.%d", decl_size);
-        named_section_flags (buf, flags);
-        DECL_SECTION_NAME (decl) = build_string (strlen (buf), buf);
-      }
-  }
-#endif
+
+  if (HAVE_GAS_SHF_MERGE)
+    {
+      int decl_size;
+      /* Ensure decl_size is a multiple of utf8const_type's alignment. */
+      decl_size = (name_len + 5 + TYPE_ALIGN_UNIT (utf8const_type) - 1)
+       & ~(TYPE_ALIGN_UNIT (utf8const_type) - 1);
+      if (flag_merge_constants && decl_size < 256)
+       {
+         char buf[32];
+         int flags = (SECTION_OVERRIDE
+                      | SECTION_MERGE | (SECTION_ENTSIZE & decl_size));
+         sprintf (buf, ".rodata.jutf8.%d", decl_size);
+         named_section_flags (buf, flags);
+         DECL_SECTION_NAME (decl) = build_string (strlen (buf), buf);
+       }
+    }
+
   TREE_CHAIN (decl) = utf8_decl_list;
   layout_decl (decl, 0);
   pushdecl (decl);