From: Alan Modra <amodra@bigpond.net.au>
Date: Thu, 1 Apr 2004 01:41:58 +0000 (+0000)
Subject: * dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.
X-Git-Tag: releases/gcc-3.3.4~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c99af9390741e080793345d9d59bf5eab327d01;p=thirdparty%2Fgcc.git

* dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.

From-SVN: r80279
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 274a79acf138..5f0017c34ac2 100644
--- 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 7fa7692c43c5..af76e0c348af 100644
--- 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