aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/write.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index ece67c0..187dcee 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-17 Hans-Peter Nilsson <hp@bitrange.com>
+
+ * write.c (fixup_segment): Handle fixups for SEC_MERGE sections as
+ for undefined symbols.
+
2001-10-17 Chris Demetriou <cgd@broadcom.com>
* doc/as.texinfo (MIPS ISA options): Added accidentally
diff --git a/gas/write.c b/gas/write.c
index 280fedc..171ad63 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2810,6 +2810,9 @@ fixup_segment (fixP, this_segment_type)
else if (add_symbol_segment == undefined_section
#ifdef BFD_ASSEMBLER
|| bfd_is_com_section (add_symbol_segment)
+ || (bfd_get_section_flags (stdoutput,
+ add_symbol_segment)
+ & SEC_MERGE) != 0
#endif
)
{