* dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.

From-SVN: r80279

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 274a79acf13803e87f8ed0a23e3c788d879d7e8f..5f0017c34ac2763d47b8efe0260d4e863d4364c6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-01  Alan Modra  <amodra@bigpond.net.au>
+
+       * dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.
+
 2004-03-30  Matthias Klose  <doko@debian.org>
 
        Backport:

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 7fa7692c43c5edf29c418c584453d04cc079d2cc..af76e0c348afb2ab9f0052cc778218549a91f0ee 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3796,7 +3796,9 @@ static void mark_limbo_die_list           PARAMS ((void *));
 /* 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