From 5667c33d018a6f97ce58985a46c6f4e6e545f034 Mon Sep 17 00:00:00 2001 From: David Billinghurst Date: Mon, 11 Feb 2002 22:53:09 +0000 Subject: [PATCH] class.c (build_utf8_ref): Move declaration of decl_size 2002-02-12 David Billinghurst * class.c(build_utf8_ref): Move declaration of decl_size From-SVN: r49688 --- gcc/java/ChangeLog | 4 ++++ gcc/java/class.c | 29 ++++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a7410b6d371..e82fda9f1d5 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2002-02-12 David Billinghurst + + * class.c(build_utf8_ref): Move declaration of decl_size + 2002-02-07 Tom Tromey * gcj.texi (Input Options): --CLASSPATH does not suppress system diff --git a/gcc/java/class.c b/gcc/java/class.c index 367a448c72a..5a799feda96 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -967,7 +967,7 @@ build_utf8_ref (name) char buf[60]; tree ctype, field = NULL_TREE, str_type, cinit, string; static int utf8_count = 0; - int name_hash, decl_size; + int name_hash; tree ref = IDENTIFIER_UTF8_REF (name); tree decl; if (ref != NULL_TREE) @@ -1001,18 +1001,21 @@ build_utf8_ref (name) TREE_THIS_VOLATILE (decl) = 0; DECL_INITIAL (decl) = cinit; #ifdef HAVE_GAS_SHF_MERGE - /* 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); - } + { + 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 TREE_CHAIN (decl) = utf8_decl_list; layout_decl (decl, 0); -- 2.30.2