From: Bob Wilson <bob.wilson@acm.org>
Date: Fri, 8 Apr 2005 17:36:38 +0000 (+0000)
Subject: 	* config/tc-xtensa.c (xtensa_create_xproperty_segments): Skip
X-Git-Tag: binutils-2_16~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c0e0bb01affeba5ea5354ca897d6bd7120fa2d;p=thirdparty%2Fbinutils-gdb.git

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 46e03e6691f..91ca2f72a1f 100644
--- 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-05  Sterling Augustine  <sterling@tensilica.com>
 	    Bob Wilson  <bob.wilson@acm.org>
 
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index c621a8c832e..188987df5f9 100644
--- 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))