dlltool.c (make_one_lib_file): Revert 2004-09-02 and 2004-09-04 patches.

[deliverable/binutils-gdb.git] / gas / write.c

diff --git a/gas/write.c b/gas/write.c
index 5acd6077844f3d3efdd31a8c28f0b2211309fe16..a713a9d3981162556b1487e2d24201a6c8c68ef3 100644 (file)
--- a/gas/write.c
+++ b/gas/write.c
@@ -1,6 +1,6 @@
 /* write.c - emit .o file
    Copyright 1986, 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2001, 2002, 2003
+   1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -616,6 +616,9 @@ cvt_frag_to_fill (object_headers *headersP, segT sec, fragS *fragP)
       BAD_CASE (fragP->fr_type);
       break;
     }
+#ifdef md_frag_check
+  md_frag_check (fragP);
+#endif
 }
 
 #endif /* defined (BFD_ASSEMBLER) || !defined (BFD)  */
@@ -2409,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;
                    }