aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2003-06-03 20:45:01 +0000
committerAlan Modra <amodra@gcc.gnu.org>2003-06-04 06:15:01 +0930
commitb0c242c02902036570dc8c65f76361cc27f2f119 (patch)
treedce3e07e2b70a2d683eee64990c15bab9c7a1363
parent1358ccea48811762b367a44b4058e5435db7dc98 (diff)
downloadgcc-b0c242c02902036570dc8c65f76361cc27f2f119.zip
gcc-b0c242c02902036570dc8c65f76361cc27f2f119.tar.gz
gcc-b0c242c02902036570dc8c65f76361cc27f2f119.tar.bz2
* dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Heed flag_merge_constants.
From-SVN: r67403
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/dwarf2out.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 000a95e..89583f3 100644
--- 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 aa65780..3d908e4 100644
--- 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