* dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.

From-SVN: r67403

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 000a95e82e060925166d34213fbd6451c9d88264..89583f30a6921049c5dfc1f76553907d91cef760 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-03  Alan Modra  <amodra@bigpond.net.au>
+
+       * dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.
+
 2003-06-03  Jason Thorpe  <thorpej@wasabisystems.com>
 
        * config.gcc (default_use_cxa_atexit): New variable, defaults to no.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index aa657802e3fb33289cf8a435291caec3fa5d7a46..3d908e4732526fce60d4c33d71ddc690e2add07f 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3908,7 +3908,9 @@ static int maybe_emit_file              PARAMS ((int));
 /* Section flags for .debug_str section.  */
 #ifdef HAVE_GAS_SHF_MERGE
 #define DEBUG_STR_SECTION_FLAGS \
-  (SECTION_DEBUG | SECTION_MERGE | SECTION_STRINGS | 1)
+  (flag_merge_constants                                                \
+   ? SECTION_DEBUG | SECTION_MERGE | SECTION_STRINGS | 1       \
+   : SECTION_DEBUG)
 #else
 #define DEBUG_STR_SECTION_FLAGS        SECTION_DEBUG
 #endif