5.2 released.

[deliverable/binutils-gdb.git] / ld / ldwrite.c

diff --git a/ld/ldwrite.c b/ld/ldwrite.c
index 589b91012ca8393e685f1ba00346831d0eef06fe..1296a7dfe701b0cc2aaafc5f626cbe777045b4f2 100644 (file)
--- a/ld/ldwrite.c
+++ b/ld/ldwrite.c
@@ -1,5 +1,5 @@
 /* ldwrite.c -- write out the linked file
-   Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002
    Free Software Foundation, Inc.
    Written by Steve Chamberlain sac@cygnus.com
 
@@ -243,9 +243,10 @@ build_link_order (statement)
                {
                  /* We've got a never load section inside one which
                     is going to be output, we'll change it into a
-                    fill link_order */
-                 link_order->type = bfd_fill_link_order;
-                 link_order->u.fill.value = 0;
+                    fill.  */
+                 link_order->type = bfd_data_link_order;
+                 link_order->u.data.contents = "";
+                 link_order->u.data.size = 1;
                }
              else
                {
@@ -274,10 +275,11 @@ build_link_order (statement)
        if ((output_section->flags & SEC_HAS_CONTENTS) != 0)
          {
            link_order = bfd_new_link_order (output_bfd, output_section);
-           link_order->type = bfd_fill_link_order;
+           link_order->type = bfd_data_link_order;
            link_order->size = statement->padding_statement.size;
            link_order->offset = statement->padding_statement.output_offset;
-           link_order->u.fill.value = statement->padding_statement.fill;
+           link_order->u.data.contents = statement->padding_statement.fill->data;
+           link_order->u.data.size = statement->padding_statement.fill->size;
          }
       }
       break;
@@ -290,10 +292,8 @@ build_link_order (statement)
 
 /* Call BFD to write out the linked file.  */
 
-
 /**********************************************************************/
 
-
 /* Wander around the input sections, make sure that
    we'll never try and create an output section with more relocs
    than will fit.. Do this by always assuming the worst case, and
@@ -345,7 +345,7 @@ clone_section (abfd, s, name, count)
 }
 
 #if TESTING
-static void 
+static void
 ds (s)
      asection *s;
 {
@@ -365,6 +365,7 @@ ds (s)
     }
   printf ("\n");
 }
+
 dump (s, a1, a2)
      char *s;
      asection *a1;
@@ -375,7 +376,7 @@ dump (s, a1, a2)
   ds (a2);
 }
 
-static void 
+static void
 sanity_check (abfd)
      bfd *abfd;
 {
@@ -399,7 +400,7 @@ sanity_check (abfd)
 #define dump(a, b, c)
 #endif
 
-static void 
+static void
 split_sections (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -520,7 +521,9 @@ split_sections (abfd, info)
     }
   sanity_check (abfd);
 }
+
 /**********************************************************************/
+
 void
 ldwrite ()
 {
@@ -541,6 +544,6 @@ ldwrite ()
       if (bfd_get_error () != bfd_error_no_error)
        einfo (_("%F%P: final link failed: %E\n"));
       else
-       xexit(1);
+       xexit (1);
     }
 }