Do not insert non-BookE32 instructions into the hash table if the target cpu

[deliverable/binutils-gdb.git] / bfd / linker.c

diff --git a/bfd/linker.c b/bfd/linker.c
index d3a334350c7934cb85cdde8f6c5c16170246ebf0..242f8bd7625de2a78d9e1df12b4f69117acae91a 100644 (file)
--- a/bfd/linker.c
+++ b/bfd/linker.c
@@ -1,5 +1,5 @@
 /* linker.c -- BFD linker routines
 /* linker.c -- BFD linker routines

-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

    Free Software Foundation, Inc.
    Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support
 
    Free Software Foundation, Inc.
    Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support
 


@@ -426,7 +426,7 @@ static void set_symbol_from_hash
   PARAMS ((asymbol *, struct bfd_link_hash_entry *));
 static boolean generic_add_output_symbol
   PARAMS ((bfd *, size_t *psymalloc, asymbol *));
   PARAMS ((asymbol *, struct bfd_link_hash_entry *));
 static boolean generic_add_output_symbol
   PARAMS ((bfd *, size_t *psymalloc, asymbol *));

-static boolean default_fill_link_order
+static boolean default_data_link_order

   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           struct bfd_link_order *));
 static boolean default_indirect_link_order
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           struct bfd_link_order *));
 static boolean default_indirect_link_order


@@ -445,28 +445,27 @@ _bfd_link_hash_newfunc (entry, table, string)
      struct bfd_hash_table *table;
      const char *string;
 {
      struct bfd_hash_table *table;
      const char *string;
 {

-  struct bfd_link_hash_entry *ret = (struct bfd_link_hash_entry *) entry;
-

   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */

-  if (ret == (struct bfd_link_hash_entry *) NULL)
-    ret = ((struct bfd_link_hash_entry *)
-          bfd_hash_allocate (table, sizeof (struct bfd_link_hash_entry)));
-  if (ret == (struct bfd_link_hash_entry *) NULL)
-    return NULL;
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table, sizeof (struct bfd_link_hash_entry));
+      if (entry == NULL)
+       return entry;
+    }

 
   /* Call the allocation method of the superclass.  */
 
   /* Call the allocation method of the superclass.  */

-  ret = ((struct bfd_link_hash_entry *)
-        bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  if (ret)
+  entry = bfd_hash_newfunc (entry, table, string);
+  if (entry)

     {
     {

+      struct bfd_link_hash_entry *h = (struct bfd_link_hash_entry *) entry;
+

       /* Initialize the local fields.  */
       /* Initialize the local fields.  */

-      ret->type = bfd_link_hash_new;
-      ret->next = NULL;
+      h->type = bfd_link_hash_new;
+      h->next = NULL;

     }
 
     }
 

-  return (struct bfd_hash_entry *) ret;
+  return entry;

 }
 
 /* Initialize a link hash table.  The BFD argument is the one
 }
 
 /* Initialize a link hash table.  The BFD argument is the one


@@ -528,6 +527,8 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
      boolean copy;
      boolean follow;
 {
      boolean copy;
      boolean follow;
 {

+  bfd_size_type amt;
+

   if (info->wrap_hash != NULL)
     {
       const char *l;
   if (info->wrap_hash != NULL)
     {
       const char *l;


@@ -547,7 +548,8 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
          /* This symbol is being wrapped.  We want to replace all
              references to SYM with references to __wrap_SYM.  */
 
          /* This symbol is being wrapped.  We want to replace all
              references to SYM with references to __wrap_SYM.  */
 

-         n = (char *) bfd_malloc (strlen (l) + sizeof WRAP + 1);
+         amt = strlen (l) + sizeof WRAP + 1;
+         n = (char *) bfd_malloc (amt);

          if (n == NULL)
            return NULL;
 
          if (n == NULL)
            return NULL;
 


@@ -578,7 +580,8 @@ bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
              wrapped.  We want to replace all references to __real_SYM
              with references to SYM.  */
 
              wrapped.  We want to replace all references to __real_SYM
              with references to SYM.  */
 

-         n = (char *) bfd_malloc (strlen (l + sizeof REAL - 1) + 2);
+         amt = strlen (l + sizeof REAL - 1) + 2;
+         n = (char *) bfd_malloc (amt);

          if (n == NULL)
            return NULL;
 
          if (n == NULL)
            return NULL;
 


@@ -638,30 +641,29 @@ _bfd_generic_link_hash_newfunc (entry, table, string)
      struct bfd_hash_table *table;
      const char *string;
 {
      struct bfd_hash_table *table;
      const char *string;
 {

-  struct generic_link_hash_entry *ret =
-    (struct generic_link_hash_entry *) entry;
-

   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */

-  if (ret == (struct generic_link_hash_entry *) NULL)
-    ret = ((struct generic_link_hash_entry *)
-          bfd_hash_allocate (table, sizeof (struct generic_link_hash_entry)));
-  if (ret == (struct generic_link_hash_entry *) NULL)
-    return NULL;
+  if (entry == NULL)
+    {
+      entry = bfd_hash_allocate (table,
+                                sizeof (struct generic_link_hash_entry));
+      if (entry == NULL)
+       return entry;
+    }

 
   /* Call the allocation method of the superclass.  */
 
   /* Call the allocation method of the superclass.  */

-  ret = ((struct generic_link_hash_entry *)
-        _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-                                table, string));
-
-  if (ret)
+  entry = _bfd_link_hash_newfunc (entry, table, string);
+  if (entry)

     {
     {

+      struct generic_link_hash_entry *ret;
+

       /* Set local fields.  */
       /* Set local fields.  */

+      ret = (struct generic_link_hash_entry *) entry;

       ret->written = false;
       ret->sym = NULL;
     }
 
       ret->written = false;
       ret->sym = NULL;
     }
 

-  return (struct bfd_hash_entry *) ret;
+  return entry;

 }
 
 /* Create an generic link hash table.  */
 }
 
 /* Create an generic link hash table.  */


@@ -671,9 +673,9 @@ _bfd_generic_link_hash_table_create (abfd)
      bfd *abfd;
 {
   struct generic_link_hash_table *ret;
      bfd *abfd;
 {
   struct generic_link_hash_table *ret;

+  bfd_size_type amt = sizeof (struct generic_link_hash_table);

 
 

-  ret = ((struct generic_link_hash_table *)
-        bfd_alloc (abfd, sizeof (struct generic_link_hash_table)));
+  ret = (struct generic_link_hash_table *) bfd_malloc (amt);

   if (ret == NULL)
     return (struct bfd_link_hash_table *) NULL;
   if (! _bfd_link_hash_table_init (&ret->root, abfd,
   if (ret == NULL)
     return (struct bfd_link_hash_table *) NULL;
   if (! _bfd_link_hash_table_init (&ret->root, abfd,


@@ -685,6 +687,17 @@ _bfd_generic_link_hash_table_create (abfd)
   return &ret->root;
 }
 
   return &ret->root;
 }
 

+void
+_bfd_generic_link_hash_table_free (hash)
+     struct bfd_link_hash_table *hash;
+{
+  struct generic_link_hash_table *ret
+    = (struct generic_link_hash_table *) hash;
+
+  bfd_hash_table_free (&ret->root.table);
+  free (ret);
+}
+

 /* Grab the symbols for an object file when doing a generic link.  We
    store the symbols in the outsymbols field.  We need to keep them
    around for the entire link to ensure that we only read them once.
 /* Grab the symbols for an object file when doing a generic link.  We
    store the symbols in the outsymbols field.  We need to keep them
    around for the entire link to ensure that we only read them once.


@@ -704,7 +717,8 @@ generic_link_read_symbols (abfd)
       symsize = bfd_get_symtab_upper_bound (abfd);
       if (symsize < 0)
        return false;
       symsize = bfd_get_symtab_upper_bound (abfd);
       if (symsize < 0)
        return false;

-      bfd_get_outsymbols (abfd) = (asymbol **) bfd_alloc (abfd, symsize);
+      bfd_get_outsymbols (abfd) =
+       (asymbol **) bfd_alloc (abfd, (bfd_size_type) symsize);

       if (bfd_get_outsymbols (abfd) == NULL && symsize != 0)
        return false;
       symcount = bfd_canonicalize_symtab (abfd, bfd_get_outsymbols (abfd));
       if (bfd_get_outsymbols (abfd) == NULL && symsize != 0)
        return false;
       symcount = bfd_canonicalize_symtab (abfd, bfd_get_outsymbols (abfd));


@@ -743,6 +757,19 @@ _bfd_generic_link_add_symbols_collect (abfd, info)
   return generic_link_add_symbols (abfd, info, true);
 }
 
   return generic_link_add_symbols (abfd, info, true);
 }
 

+/* Indicate that we are only retrieving symbol values from this
+   section.  We want the symbols to act as though the values in the
+   file are absolute.  */
+
+void
+_bfd_generic_link_just_syms (sec, info)
+     asection *sec;
+     struct bfd_link_info *info ATTRIBUTE_UNUSED;
+{
+  sec->output_section = bfd_abs_section_ptr;
+  sec->output_offset = sec->vma;
+}
+

 /* Add symbols from an object file to the global hash table.  */
 
 static boolean
 /* Add symbols from an object file to the global hash table.  */
 
 static boolean


@@ -781,12 +808,14 @@ generic_link_add_object_symbols (abfd, info, collect)
      struct bfd_link_info *info;
      boolean collect;
 {
      struct bfd_link_info *info;
      boolean collect;
 {

+  bfd_size_type symcount;
+  struct symbol_cache_entry **outsyms;
+

   if (! generic_link_read_symbols (abfd))
     return false;
   if (! generic_link_read_symbols (abfd))
     return false;

-  return generic_link_add_symbol_list (abfd, info,
-                                      _bfd_generic_link_get_symcount (abfd),
-                                      _bfd_generic_link_get_symbols (abfd),
-                                      collect);
+  symcount = _bfd_generic_link_get_symcount (abfd);
+  outsyms = _bfd_generic_link_get_symbols (abfd);
+  return generic_link_add_symbol_list (abfd, info, symcount, outsyms, collect);

 }
 \f
 /* We build a hash table of all symbols defined in an archive.  */
 }
 \f
 /* We build a hash table of all symbols defined in an archive.  */


@@ -797,7 +826,7 @@ generic_link_add_object_symbols (abfd, info, collect)
 struct archive_list
 {
   struct archive_list *next;
 struct archive_list
 {
   struct archive_list *next;

-  int indx;
+  unsigned int indx;

 };
 
 /* An entry in an archive hash table.  */
 };
 
 /* An entry in an archive hash table.  */


@@ -926,7 +955,7 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
   register carsym *arsym;
   int pass;
   struct archive_hash_table arsym_hash;
   register carsym *arsym;
   int pass;
   struct archive_hash_table arsym_hash;

-  int indx;
+  unsigned int indx;

   struct bfd_link_hash_entry **pundef;
 
   if (! bfd_has_map (abfd))
   struct bfd_link_hash_entry **pundef;
 
   if (! bfd_has_map (abfd))


@@ -1005,11 +1034,12 @@ _bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
       arh = archive_hash_lookup (&arsym_hash, h->root.string, false, false);
       if (arh == (struct archive_hash_entry *) NULL)
        {
       arh = archive_hash_lookup (&arsym_hash, h->root.string, false, false);
       if (arh == (struct archive_hash_entry *) NULL)
        {

-         /* If we haven't found the exact symbol we're looking for, 
+         /* If we haven't found the exact symbol we're looking for,

             let's look for its import thunk */
          if (info->pei386_auto_import)
            {
             let's look for its import thunk */
          if (info->pei386_auto_import)
            {

-             char *buf = (char *) bfd_malloc (strlen (h->root.string) + 10);
+             bfd_size_type amt = strlen (h->root.string) + 10;
+             char *buf = (char *) bfd_malloc (amt);

              if (buf == NULL)
                return false;
 
              if (buf == NULL)
                return false;
 


@@ -1411,9 +1441,9 @@ static const enum link_action link_action[8][8] =
   /* UNDEFW_ROW        */  {WEAK,  NOACT, NOACT, REF,   REF,   NOACT, REFC,  WARNC },
   /* DEF_ROW   */  {DEF,   DEF,   DEF,   MDEF,  DEF,   CDEF,  MDEF,  CYCLE },
   /* DEFW_ROW  */  {DEFW,  DEFW,  DEFW,  NOACT, NOACT, NOACT, NOACT, CYCLE },
   /* UNDEFW_ROW        */  {WEAK,  NOACT, NOACT, REF,   REF,   NOACT, REFC,  WARNC },
   /* DEF_ROW   */  {DEF,   DEF,   DEF,   MDEF,  DEF,   CDEF,  MDEF,  CYCLE },
   /* DEFW_ROW  */  {DEFW,  DEFW,  DEFW,  NOACT, NOACT, NOACT, NOACT, CYCLE },

-  /* COMMON_ROW        */  {COM,   COM,   COM,   CREF,  CREF,  BIG,   REFC,  WARNC },
+  /* COMMON_ROW        */  {COM,   COM,   COM,   CREF,  COM,   BIG,   REFC,  WARNC },

   /* INDR_ROW  */  {IND,   IND,   IND,   MDEF,  IND,   CIND,  MIND,  CYCLE },
   /* INDR_ROW  */  {IND,   IND,   IND,   MDEF,  IND,   CIND,  MIND,  CYCLE },

-  /* WARN_ROW   */  {MWARN, WARN,  WARN,  CWARN, CWARN, WARN,  CWARN, MWARN },
+  /* WARN_ROW   */  {MWARN, WARN,  WARN,  CWARN, CWARN, WARN,  CWARN, NOACT },

   /* SET_ROW   */  {SET,   SET,   SET,   SET,   SET,   SET,   CYCLE, CYCLE }
 };
 
   /* SET_ROW   */  {SET,   SET,   SET,   SET,   SET,   SET,   CYCLE, CYCLE }
 };
 


@@ -1644,8 +1674,7 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
                          abort ();
 
                        if (! ((*info->callbacks->constructor)
                          abort ();
 
                        if (! ((*info->callbacks->constructor)

-                              (info,
-                               c == 'I' ? true : false,
+                              (info, c == 'I',

                                h->root.string, abfd, section, value)))
                          return false;
                      }
                                h->root.string, abfd, section, value)))
                          return false;
                      }


@@ -1783,37 +1812,38 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
          /* Fall through.  */
        case MDEF:
          /* Handle a multiple definition.  */
          /* Fall through.  */
        case MDEF:
          /* Handle a multiple definition.  */

-         {
-           asection *msec = NULL;
-           bfd_vma mval = 0;
+         if (!info->allow_multiple_definition)
+           {
+             asection *msec = NULL;
+             bfd_vma mval = 0;

 
 

-           switch (h->type)
-             {
-             case bfd_link_hash_defined:
-               msec = h->u.def.section;
-               mval = h->u.def.value;
-               break;
-             case bfd_link_hash_indirect:
-               msec = bfd_ind_section_ptr;
-               mval = 0;
-               break;
-             default:
-               abort ();
-             }
+             switch (h->type)
+               {
+               case bfd_link_hash_defined:
+                 msec = h->u.def.section;
+                 mval = h->u.def.value;
+                 break;
+               case bfd_link_hash_indirect:
+                 msec = bfd_ind_section_ptr;
+                 mval = 0;
+                 break;
+               default:
+                 abort ();
+               }

 
 

-           /* Ignore a redefinition of an absolute symbol to the same
-               value; it's harmless.  */
-           if (h->type == bfd_link_hash_defined
-               && bfd_is_abs_section (msec)
-               && bfd_is_abs_section (section)
-               && value == mval)
-             break;
+             /* Ignore a redefinition of an absolute symbol to the
+                same value; it's harmless.  */
+             if (h->type == bfd_link_hash_defined
+                 && bfd_is_abs_section (msec)
+                 && bfd_is_abs_section (section)
+                 && value == mval)
+               break;

 
 

-           if (! ((*info->callbacks->multiple_definition)
-                  (info, h->root.string, msec->owner, msec, mval, abfd,
-                   section, value)))
-             return false;
-         }
+             if (! ((*info->callbacks->multiple_definition)
+                    (info, h->root.string, msec->owner, msec, mval,
+                     abfd, section, value)))
+               return false;
+           }

          break;
 
        case CIND:
          break;
 
        case CIND:


@@ -1840,8 +1870,8 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
                && inh->u.i.link == h)
              {
                (*_bfd_error_handler)
                && inh->u.i.link == h)
              {
                (*_bfd_error_handler)

-                 (_("%s: indirect symbol `%s' to `%s' is a loop"),  
-                  bfd_get_filename (abfd), name, string);
+                 (_("%s: indirect symbol `%s' to `%s' is a loop"),
+                  bfd_archive_filename (abfd), name, string);

                bfd_set_error (bfd_error_invalid_operation);
                return false;
              }
                bfd_set_error (bfd_error_invalid_operation);
                return false;
              }


@@ -1944,12 +1974,12 @@ _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
            else
              {
                char *w;
            else
              {
                char *w;

+               size_t len = strlen (string) + 1;

 
 

-               w = bfd_hash_allocate (&info->hash->table,
-                                      strlen (string) + 1);
+               w = bfd_hash_allocate (&info->hash->table, len);

                if (w == NULL)
                  return false;
                if (w == NULL)
                  return false;

-               strcpy (w, string);
+               memcpy (w, string, len);

                sub->u.i.warning = w;
              }
 
                sub->u.i.warning = w;
              }
 


@@ -2039,7 +2069,7 @@ _bfd_generic_final_link (abfd, info)
                                                       input_section);
                  if (relsize < 0)
                    return false;
                                                       input_section);
                  if (relsize < 0)
                    return false;

-                 relocs = (arelent **) bfd_malloc ((size_t) relsize);
+                 relocs = (arelent **) bfd_malloc ((bfd_size_type) relsize);

                  if (!relocs && relsize != 0)
                    return false;
                  symbols = _bfd_generic_link_get_symbols (input_bfd);
                  if (!relocs && relsize != 0)
                    return false;
                  symbols = _bfd_generic_link_get_symbols (input_bfd);


@@ -2057,10 +2087,11 @@ _bfd_generic_final_link (abfd, info)
            }
          if (o->reloc_count > 0)
            {
            }
          if (o->reloc_count > 0)
            {

-             o->orelocation = ((arelent **)
-                               bfd_alloc (abfd,
-                                          (o->reloc_count
-                                           * sizeof (arelent *))));
+             bfd_size_type amt;
+
+             amt = o->reloc_count;
+             amt *= sizeof (arelent *);
+             o->orelocation = (arelent **) bfd_alloc (abfd, amt);

              if (!o->orelocation)
                return false;
              o->flags |= SEC_RELOC;
              if (!o->orelocation)
                return false;
              o->flags |= SEC_RELOC;


@@ -2113,13 +2144,15 @@ generic_add_output_symbol (output_bfd, psymalloc, sym)
   if (bfd_get_symcount (output_bfd) >= *psymalloc)
     {
       asymbol **newsyms;
   if (bfd_get_symcount (output_bfd) >= *psymalloc)
     {
       asymbol **newsyms;

+      bfd_size_type amt;

 
       if (*psymalloc == 0)
        *psymalloc = 124;
       else
        *psymalloc *= 2;
 
       if (*psymalloc == 0)
        *psymalloc = 124;
       else
        *psymalloc *= 2;

-      newsyms = (asymbol **) bfd_realloc (bfd_get_outsymbols (output_bfd),
-                                         *psymalloc * sizeof (asymbol *));
+      amt = *psymalloc;
+      amt *= sizeof (asymbol *);
+      newsyms = (asymbol **) bfd_realloc (bfd_get_outsymbols (output_bfd), amt);

       if (newsyms == (asymbol **) NULL)
        return false;
       bfd_get_outsymbols (output_bfd) = newsyms;
       if (newsyms == (asymbol **) NULL)
        return false;
       bfd_get_outsymbols (output_bfd) = newsyms;


@@ -2357,7 +2390,7 @@ _bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
         Gross.  .bss and similar sections won't have the linker_mark
         field set.  */
       if ((sym->section->flags & SEC_HAS_CONTENTS) != 0
         Gross.  .bss and similar sections won't have the linker_mark
         field set.  */
       if ((sym->section->flags & SEC_HAS_CONTENTS) != 0

-         && sym->section->linker_mark == false)
+         && ! sym->section->linker_mark)

        output = false;
 
       if (output)
        output = false;
 
       if (output)


@@ -2447,6 +2480,9 @@ _bfd_generic_link_write_global_symbol (h, data)
     (struct generic_write_global_symbol_info *) data;
   asymbol *sym;
 
     (struct generic_write_global_symbol_info *) data;
   asymbol *sym;
 

+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct generic_link_hash_entry *) h->root.u.i.link;
+

   if (h->written)
     return true;
 
   if (h->written)
     return true;
 


@@ -2499,7 +2535,7 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
   if (sec->orelocation == (arelent **) NULL)
     abort ();
 
   if (sec->orelocation == (arelent **) NULL)
     abort ();
 

-  r = (arelent *) bfd_alloc (abfd, sizeof (arelent));
+  r = (arelent *) bfd_alloc (abfd, (bfd_size_type) sizeof (arelent));

   if (r == (arelent *) NULL)
     return false;
 
   if (r == (arelent *) NULL)
     return false;
 


@@ -2545,13 +2581,15 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
       bfd_reloc_status_type rstat;
       bfd_byte *buf;
       boolean ok;
       bfd_reloc_status_type rstat;
       bfd_byte *buf;
       boolean ok;

+      file_ptr loc;

 
       size = bfd_get_reloc_size (r->howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == (bfd_byte *) NULL)
        return false;
       rstat = _bfd_relocate_contents (r->howto, abfd,
 
       size = bfd_get_reloc_size (r->howto);
       buf = (bfd_byte *) bfd_zmalloc (size);
       if (buf == (bfd_byte *) NULL)
        return false;
       rstat = _bfd_relocate_contents (r->howto, abfd,

-                                     link_order->u.reloc.p->addend, buf);
+                                     (bfd_vma) link_order->u.reloc.p->addend,
+                                     buf);

       switch (rstat)
        {
        case bfd_reloc_ok:
       switch (rstat)
        {
        case bfd_reloc_ok:


@@ -2573,10 +2611,9 @@ _bfd_generic_reloc_link_order (abfd, info, sec, link_order)
            }
          break;
        }
            }
          break;
        }

-      ok = bfd_set_section_contents (abfd, sec, (PTR) buf,
-                                    (file_ptr)
-                                     (link_order->offset *
-                                      bfd_octets_per_byte (abfd)), size);
+      loc = link_order->offset * bfd_octets_per_byte (abfd);
+      ok = bfd_set_section_contents (abfd, sec, (PTR) buf, loc,
+                                    (bfd_size_type) size);

       free (buf);
       if (! ok)
        return false;
       free (buf);
       if (! ok)
        return false;


@@ -2597,17 +2634,14 @@ bfd_new_link_order (abfd, section)
      bfd *abfd;
      asection *section;
 {
      bfd *abfd;
      asection *section;
 {

+  bfd_size_type amt = sizeof (struct bfd_link_order);

   struct bfd_link_order *new;
 
   struct bfd_link_order *new;
 

-  new = ((struct bfd_link_order *)
-        bfd_alloc (abfd, sizeof (struct bfd_link_order)));
+  new = (struct bfd_link_order *) bfd_zalloc (abfd, amt);

   if (!new)
     return NULL;
 
   new->type = bfd_undefined_link_order;
   if (!new)
     return NULL;
 
   new->type = bfd_undefined_link_order;

-  new->offset = 0;
-  new->size = 0;
-  new->next = (struct bfd_link_order *) NULL;

 
   if (section->link_order_tail != (struct bfd_link_order *) NULL)
     section->link_order_tail->next = new;
 
   if (section->link_order_tail != (struct bfd_link_order *) NULL)
     section->link_order_tail->next = new;


@@ -2639,58 +2673,63 @@ _bfd_default_link_order (abfd, info, sec, link_order)
     case bfd_indirect_link_order:
       return default_indirect_link_order (abfd, info, sec, link_order,
                                          false);
     case bfd_indirect_link_order:
       return default_indirect_link_order (abfd, info, sec, link_order,
                                          false);

-    case bfd_fill_link_order:
-      return default_fill_link_order (abfd, info, sec, link_order);

     case bfd_data_link_order:
     case bfd_data_link_order:

-      return bfd_set_section_contents (abfd, sec,
-                                      (PTR) link_order->u.data.contents,
-                                      (file_ptr)
-                                       (link_order->offset *
-                                        bfd_octets_per_byte (abfd)),
-                                      link_order->size);
+      return default_data_link_order (abfd, info, sec, link_order);

     }
 }
 
     }
 }
 

-/* Default routine to handle a bfd_fill_link_order.  */
+/* Default routine to handle a bfd_data_link_order.  */

 
 static boolean
 
 static boolean

-default_fill_link_order (abfd, info, sec, link_order)
+default_data_link_order (abfd, info, sec, link_order)

      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      asection *sec;
      struct bfd_link_order *link_order;
 {
      bfd *abfd;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
      asection *sec;
      struct bfd_link_order *link_order;
 {

-  size_t size;
-  unsigned char *space;
-  size_t i;
-  unsigned int fill;
+  bfd_size_type size;
+  size_t fill_size;
+  bfd_byte *fill;

   file_ptr loc;
   boolean result;
 
   BFD_ASSERT ((sec->flags & SEC_HAS_CONTENTS) != 0);
 
   file_ptr loc;
   boolean result;
 
   BFD_ASSERT ((sec->flags & SEC_HAS_CONTENTS) != 0);
 

-  size = (size_t) link_order->size;
+  size = link_order->size;

   if (size == 0)
     return true;
 
   if (size == 0)
     return true;
 

-  space = (unsigned char *) bfd_malloc (size);
-  if (space == NULL)
-    return false;
-
-  fill = link_order->u.fill.value;
-  for (i = 0; i < size; i += 4)
-    space[i] = fill >> 24;
-  for (i = 1; i < size; i += 4)
-    space[i] = fill >> 16;
-  for (i = 2; i < size; i += 4)
-    space[i] = fill >> 8;
-  for (i = 3; i < size; i += 4)
-    space[i] = fill;
+  fill = link_order->u.data.contents;
+  fill_size = link_order->u.data.size;
+  if (fill_size != 0 && fill_size < size)
+    {
+      bfd_byte *p;
+      fill = (bfd_byte *) bfd_malloc (size);
+      if (fill == NULL)
+       return false;
+      p = fill;
+      if (fill_size == 1)
+       memset (p, (int) link_order->u.data.contents[0], (size_t) size);
+      else
+       {
+         do
+           {
+             memcpy (p, link_order->u.data.contents, fill_size);
+             p += fill_size;
+             size -= fill_size;
+           }
+         while (size >= fill_size);
+         if (size != 0)
+           memcpy (p, link_order->u.data.contents, (size_t) size);
+         size = link_order->size;
+       }
+    }

 
 

-  loc = (file_ptr) (link_order->offset * bfd_octets_per_byte (abfd));
-  result = bfd_set_section_contents (abfd, sec, space, loc, link_order->size);
+  loc = link_order->offset * bfd_octets_per_byte (abfd);
+  result = bfd_set_section_contents (abfd, sec, fill, loc, size);

 
 

-  free (space);
+  if (fill != link_order->u.data.contents)
+    free (fill);

   return result;
 }
 
   return result;
 }
 


@@ -2709,6 +2748,8 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
   bfd *input_bfd;
   bfd_byte *contents = NULL;
   bfd_byte *new_contents;
   bfd *input_bfd;
   bfd_byte *contents = NULL;
   bfd_byte *new_contents;

+  bfd_size_type sec_size;
+  file_ptr loc;

 
   BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
 
 
   BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
 


@@ -2792,9 +2833,9 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
     }
 
   /* Get and relocate the section contents.  */
     }
 
   /* Get and relocate the section contents.  */

-  contents = ((bfd_byte *)
-             bfd_malloc (bfd_section_size (input_bfd, input_section)));
-  if (contents == NULL && bfd_section_size (input_bfd, input_section) != 0)
+  sec_size = bfd_section_size (input_bfd, input_section);
+  contents = ((bfd_byte *) bfd_malloc (sec_size));
+  if (contents == NULL && sec_size != 0)

     goto error_return;
   new_contents = (bfd_get_relocated_section_contents
                  (output_bfd, info, link_order, contents, info->relocateable,
     goto error_return;
   new_contents = (bfd_get_relocated_section_contents
                  (output_bfd, info, link_order, contents, info->relocateable,


@@ -2803,12 +2844,9 @@ default_indirect_link_order (output_bfd, info, output_section, link_order,
     goto error_return;
 
   /* Output the section contents.  */
     goto error_return;
 
   /* Output the section contents.  */

+  loc = link_order->offset * bfd_octets_per_byte (output_bfd);

   if (! bfd_set_section_contents (output_bfd, output_section,
   if (! bfd_set_section_contents (output_bfd, output_section,

-                                 (PTR) new_contents,
-                                 (file_ptr)
-                                  (link_order->offset *
-                                   bfd_octets_per_byte (output_bfd)),
-                                  link_order->size))
+                                 (PTR) new_contents, loc, link_order->size))

     goto error_return;
 
   if (contents != NULL)
     goto error_return;
 
   if (contents != NULL)