* config/tc-xtensa.c (xtensa_create_xproperty_segments): Skip

	SEC_MERGE sections.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1b8dda64749513fbecafa7b4dd5de62ce40cd7c7..9e8a6c47dbeec062c8d5b84c1187789a93d05b15 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-08  Bob Wilson  <bob.wilson@acm.org>
+
+       * config/tc-xtensa.c (xtensa_create_xproperty_segments): Skip
+       SEC_MERGE sections.
+
 2005-04-06  H.J. Lu  <hongjiu.lu@intel.com>
 
        * config/tc-i386.c (tc_gen_reloc): Don't turn

diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index c621a8c832e59cf2e2b7a386945c0d76d3f2972c..188987df5f9e116f98732ca7e8fae0ec97ff83e9 100644 (file)
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -10393,9 +10393,9 @@ xtensa_create_xproperty_segments (frag_flags_fn flag_fn,
       flagword flags;
 
       flags = bfd_get_section_flags (stdoutput, sec);
-      if (flags & SEC_DEBUGGING)
-       continue;
-      if (!(flags & SEC_ALLOC))
+      if ((flags & SEC_DEBUGGING)
+         || !(flags & SEC_ALLOC)
+         || (flags & SEC_MERGE))
        continue;
 
       if (section_has_xproperty (sec, flag_fn))