diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2003-09-23 19:47:00 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2003-09-23 19:47:00 +0000 |
| commit | 5d4856a01196f9eeffd2e60b202c758a4a1533a2 (patch) | |
| tree | 1b5adfba1c480ee9b007b73919394a27f59857ec /gcc/varasm.c | |
| parent | 5748beec64a32b576377d871f6c33918e47c7651 (diff) | |
| download | gcc-5d4856a01196f9eeffd2e60b202c758a4a1533a2.zip gcc-5d4856a01196f9eeffd2e60b202c758a4a1533a2.tar.gz gcc-5d4856a01196f9eeffd2e60b202c758a4a1533a2.tar.bz2 | |
configure.in (HAVE_GAS_SHF_MERGE): Always define to test result.
* configure.in (HAVE_GAS_SHF_MERGE): Always define to test result.
Update description.
* configure: Regenerate.
* config.in: Likewise.
* dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Test for
HAVE_GAS_SHF_MERGE value.
* varasm.c (mergeable_string_section): Likewise.
(mergeable_constant_section): Likewise.
From-SVN: r71691
Diffstat (limited to 'gcc/varasm.c')
| -rw-r--r-- | gcc/varasm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gcc/varasm.c b/gcc/varasm.c index 059ba50..aea0414 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -561,8 +561,7 @@ mergeable_string_section (tree decl ATTRIBUTE_UNUSED, unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED, unsigned int flags ATTRIBUTE_UNUSED) { -#ifdef HAVE_GAS_SHF_MERGE - if (flag_merge_constants + if (HAVE_GAS_SHF_MERGE && flag_merge_constants && TREE_CODE (decl) == STRING_CST && TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE && align <= 256 @@ -624,7 +623,7 @@ mergeable_string_section (tree decl ATTRIBUTE_UNUSED, } } } -#endif + readonly_data_section (); } @@ -635,10 +634,9 @@ mergeable_constant_section (enum machine_mode mode ATTRIBUTE_UNUSED, unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED, unsigned int flags ATTRIBUTE_UNUSED) { -#ifdef HAVE_GAS_SHF_MERGE unsigned int modesize = GET_MODE_BITSIZE (mode); - if (flag_merge_constants + if (HAVE_GAS_SHF_MERGE && flag_merge_constants && mode != VOIDmode && mode != BLKmode && modesize <= align @@ -653,7 +651,7 @@ mergeable_constant_section (enum machine_mode mode ATTRIBUTE_UNUSED, named_section_flags (name, flags); return; } -#endif + readonly_data_section (); } |