* 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 ac1eaeb8152dd7163d328716cbeecf7ea6880b4c..f221a1580429be9795f12a68f4255fb00dc79951 100644 (file)
--- 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 509596fbddaa5574ba75b7006fdc996dff1e3905..a713a9d3981162556b1487e2d24201a6c8c68ef3 100644 (file)
--- 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;
                    }