* write.c (fixup_segment): Handle fixups for SEC_MERGE sections as

	for undefined symbols.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ece67c0e328ec0c34df673cf7657db8eab95c181..187dceefcde3175552872421a215f85a98a75f50 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-17  Hans-Peter Nilsson  <[email protected]>
+
+       * write.c (fixup_segment): Handle fixups for SEC_MERGE sections as
+       for undefined symbols.
+
 2001-10-17  Chris Demetriou  <[email protected]>
 
        * doc/as.texinfo (MIPS ISA options):  Added accidentally

diff --git a/gas/write.c b/gas/write.c
index 280fedc92a301cd553874373b8374fc5ecf1a6b5..171ad63460b79fd1b076c917757f0d37457b5f08 100644 (file)
--- 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
                       )
                {