From: bwilson <bwilson>
Date: Thu, 5 Aug 2004 16:55:00 +0000 (+0000)
Subject: 	* write.c (relax_segment): Use was_address instead of address when
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9509de4b3db4ccb89e76799f571764a289bb5973;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* write.c (relax_segment): Use was_address instead of address when
	setting fr_fix field for align frag due to backwards .org.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ac1eaeb815..f221a15804 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-05  Bob Wilson  <bob.wilson@acm.org>
+
+	* write.c (relax_segment): Use was_address instead of address when
+	setting fr_fix field for align frag due to backwards .org.
+
 2004-07-29  Alexandre Oliva  <aoliva@redhat.com>
 
 	Introduce SH2a support.
diff --git a/gas/write.c b/gas/write.c
index 509596fbdd..a713a9d398 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2412,7 +2412,7 @@ relax_segment (struct frag *segment_frag_root, segT segment)
 		      fragP->fr_type = rs_align;
 		      fragP->fr_subtype = 0;
 		      fragP->fr_offset = 0;
-		      fragP->fr_fix = after - address;
+		      fragP->fr_fix = after - was_address;
 		      growth = stretch;
 		    }