From: Sterling Augustine <saugustine@google.com>
Date: Fri, 3 Apr 2009 16:06:40 +0000 (+0000)
Subject: 2009-04-02  Sterling Augustine  <sterling@jaw.hq.tensilica.com>
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3df502ae79fe0bcd297d3462d1a1666b8c89ce3d;p=deliverable%2Fbinutils-gdb.git

2009-04-02  Sterling Augustine  <sterling@jaw.hq.tensilica.com>

	* elf32-xtensa.c (relax_property_section): Always set r_offset
	to zero.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ba220010e7..ea46be6b02 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02  Sterling Augustine  <sterling@jaw.hq.tensilica.com>
+
+	* elf32-xtensa.c (relax_property_section): Always set r_offset 
+	to zero.
+
 2009-04-02  Christophe Lyon  <christophe.lyon@st.com>
 
 	* elf32-arm.c (elf32_arm_stub_long_branch_v4t_thumb_thumb,
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index 856d8a91c4..0315c2ff4f 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -10015,12 +10015,7 @@ relax_property_section (bfd *abfd,
 	  if (remove_this_rel)
 	    {
 	      offset_rel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
-	      /* In case this is the last entry, move the relocation offset
-		 to the previous entry, if there is one.  */
-	      if (offset_rel->r_offset >= bytes_to_remove)
-		offset_rel->r_offset -= bytes_to_remove;
-	      else
-		offset_rel->r_offset = 0;
+	      offset_rel->r_offset = 0;
 	    }
 
 	  if (bytes_to_remove != 0)