From: Alan Modra <amodra@gmail.com>
Date: Tue, 24 Jun 2008 01:49:36 +0000 (+0000)
Subject: 	* write.c (relax_segment <rs_org>): Include current stretch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6afe8e98a664;p=binutils-gdb.git

	* write.c (relax_segment <rs_org>): Include current stretch
	value when calculating whether .org is backwards.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b4e0e98a9d6..ef7819db9ee 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-24  Bob Wilson  <bob.wilson@acm.org>
+	    Alan Modra  <amodra@bigpond.net.au>
+
+	* write.c (relax_segment <rs_org>): Include current stretch
+	value when calculating whether .org is backwards.
+
 2008-06-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure: Regenerate.
diff --git a/gas/write.c b/gas/write.c
index 9875f7f6872..2ba44b9173d 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2305,7 +2305,7 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass)
 		    }
 
 		  know (fragP->fr_next);
-		  after = fragP->fr_next->fr_address;
+		  after = fragP->fr_next->fr_address + stretch;
 		  growth = target - after;
 		  if (growth < 0)
 		    {
@@ -2340,14 +2340,10 @@ relax_segment (struct frag *segment_frag_root, segT segment, int pass)
 		      fragP->fr_type = rs_align;
 		      fragP->fr_subtype = 0;
 		      fragP->fr_offset = 0;
-		      fragP->fr_fix = after - was_address;
-		      break;
+		      fragP->fr_fix = after - address;
 		    }
-
-		  /* This is an absolute growth factor  */
-		  growth -= stretch;
-		  break;
 		}
+		break;
 
 	      case rs_space:
 		growth = 0;