Fix memory leaks

[binutils.git] / ld / ldlang.c

diff --git a/ld/ldlang.c b/ld/ldlang.c
index c3420c5434c4ebf7ca624235571ee388227a2d90..5cca71ff345564fbdd91bd8d4c75dfc90ce92588 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1,35 +1,37 @@
 /* Linker command language support.
 /* Linker command language support.

-   Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003

    Free Software Foundation, Inc.
 
    Free Software Foundation, Inc.
 

-This file is part of GLD, the Gnu Linker.
+   This file is part of GLD, the Gnu Linker.

 
 

-GLD is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   GLD is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-GLD is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GLD is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with GLD; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with GLD; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */

 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"
 
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"

+#include "safe-ctype.h"

 #include "obstack.h"
 #include "bfdlink.h"
 
 #include "ld.h"
 #include "ldmain.h"
 #include "obstack.h"
 #include "bfdlink.h"
 
 #include "ld.h"
 #include "ldmain.h"

-#include "ldgram.h"

 #include "ldexp.h"
 #include "ldlang.h"
 #include "ldexp.h"
 #include "ldlang.h"

+#include <ldgram.h>

 #include "ldlex.h"
 #include "ldmisc.h"
 #include "ldctor.h"
 #include "ldlex.h"
 #include "ldmisc.h"
 #include "ldctor.h"


@@ -38,158 +40,226 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "fnmatch.h"
 #include "demangle.h"
 
 #include "fnmatch.h"
 #include "demangle.h"
 

-#include <ctype.h>
-
-/* FORWARDS */
-static lang_statement_union_type *new_statement PARAMS ((enum statement_enum,
-                                                        size_t,
-                                                        lang_statement_list_type*));
-
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) & (((TYPE*) 0)->MEMBER))
+#endif

 
 

-/* LOCALS */
+/* Locals variables.  */

 static struct obstack stat_obstack;
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
 static struct obstack stat_obstack;
 
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free

-static CONST char *startup_file;
+static const char *startup_file;

 static lang_statement_list_type input_file_chain;
 static lang_statement_list_type input_file_chain;

-static boolean placed_commons = false;
+static bfd_boolean placed_commons = FALSE;

 static lang_output_section_statement_type *default_common_section;
 static lang_output_section_statement_type *default_common_section;

-static boolean map_option_f;
+static bfd_boolean map_option_f;

 static bfd_vma print_dot;
 static lang_input_statement_type *first_file;
 static bfd_vma print_dot;
 static lang_input_statement_type *first_file;

-static CONST char *current_target;
-static CONST char *output_target;
+static const char *current_target;
+static const char *output_target;

 static lang_statement_list_type statement_list;
 static struct lang_phdr *lang_phdr_list;
 
 static lang_statement_list_type statement_list;
 static struct lang_phdr *lang_phdr_list;
 

+/* Forward declarations.  */
+static lang_statement_union_type *new_statement
+  PARAMS ((enum statement_enum, size_t, lang_statement_list_type *));

 static void lang_for_each_statement_worker
 static void lang_for_each_statement_worker

-  PARAMS ((void (*func) (lang_statement_union_type *),
-          lang_statement_union_type *s));
+  PARAMS ((void (*) (lang_statement_union_type *),
+          lang_statement_union_type *));

 static lang_input_statement_type *new_afile
 static lang_input_statement_type *new_afile

-  PARAMS ((const char *name, lang_input_file_enum_type file_type,
-          const char *target, boolean add_to_list));
-static void init_os PARAMS ((lang_output_section_statement_type *s));
-static void exp_init_os PARAMS ((etree_type *));
-static void section_already_linked PARAMS ((bfd *, asection *, PTR));
+  PARAMS ((const char *, lang_input_file_enum_type, const char *,
+          bfd_boolean));
+static lang_memory_region_type *lang_memory_default
+  PARAMS ((asection *));
+static void lang_map_flags
+  PARAMS ((flagword));
+static void init_os
+  PARAMS ((lang_output_section_statement_type *));
+static void exp_init_os
+  PARAMS ((etree_type *));
+static void section_already_linked
+  PARAMS ((bfd *, asection *, PTR));

 static struct bfd_hash_entry *already_linked_newfunc
 static struct bfd_hash_entry *already_linked_newfunc

-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-          const char *string));
-static void already_linked_table_init PARAMS ((void));
-static void already_linked_table_free PARAMS ((void));
-static boolean wildcardp PARAMS ((const char *));
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+static void already_linked_table_init
+  PARAMS ((void));
+static void already_linked_table_free
+  PARAMS ((void));
+static bfd_boolean wildcardp
+  PARAMS ((const char *));

 static lang_statement_union_type *wild_sort
 static lang_statement_union_type *wild_sort

-  PARAMS ((lang_wild_statement_type *, lang_input_statement_type *,
-          asection *));
-static lang_input_statement_type *lookup_name PARAMS ((const char *name));
-static void load_symbols PARAMS ((lang_input_statement_type *entry,
-                                 lang_statement_list_type *));
-static void wild PARAMS ((lang_wild_statement_type *s,
-                         const char *section, const char *file,
-                         const char *target,
-                         lang_output_section_statement_type *output));
-static bfd *open_output PARAMS ((const char *name));
-static void ldlang_open_output PARAMS ((lang_statement_union_type *statement));
+  PARAMS ((lang_wild_statement_type *, struct wildcard_list *,
+          lang_input_statement_type *, asection *));
+static void output_section_callback
+  PARAMS ((lang_wild_statement_type *, struct wildcard_list *, asection *,
+          lang_input_statement_type *, PTR));
+static lang_input_statement_type *lookup_name
+  PARAMS ((const char *));
+static bfd_boolean load_symbols
+  PARAMS ((lang_input_statement_type *, lang_statement_list_type *));
+static void wild
+  PARAMS ((lang_wild_statement_type *,
+          const char *, lang_output_section_statement_type *));
+static bfd *open_output
+  PARAMS ((const char *));
+static void ldlang_open_output
+  PARAMS ((lang_statement_union_type *));

 static void open_input_bfds
 static void open_input_bfds

-  PARAMS ((lang_statement_union_type *statement, boolean));
-static void lang_reasonable_defaults PARAMS ((void));
-static void lang_place_undefineds PARAMS ((void));
+  PARAMS ((lang_statement_union_type *, bfd_boolean));
+static void lang_reasonable_defaults
+  PARAMS ((void));
+static void insert_undefined
+  PARAMS ((const char *));
+static void lang_place_undefineds
+  PARAMS ((void));

 static void map_input_to_output_sections
 static void map_input_to_output_sections

-  PARAMS ((lang_statement_union_type *s,
-          const char *target,
-          lang_output_section_statement_type *output_section_statement));
+  PARAMS ((lang_statement_union_type *, const char *,
+          lang_output_section_statement_type *));
+static void strip_excluded_output_sections
+  PARAMS ((void));

 static void print_output_section_statement
 static void print_output_section_statement

-  PARAMS ((lang_output_section_statement_type *output_section_statement));
+  PARAMS ((lang_output_section_statement_type *));

 static void print_assignment
 static void print_assignment

-  PARAMS ((lang_assignment_statement_type *assignment,
-          lang_output_section_statement_type *output_section));
-static void print_input_statement PARAMS ((lang_input_statement_type *statm));
-static boolean print_one_symbol PARAMS ((struct bfd_link_hash_entry *, PTR));
-static void print_input_section PARAMS ((lang_input_section_type *in));
-static void print_fill_statement PARAMS ((lang_fill_statement_type *fill));
-static void print_data_statement PARAMS ((lang_data_statement_type *data));
-static void print_address_statement PARAMS ((lang_address_statement_type *));
-static void print_reloc_statement PARAMS ((lang_reloc_statement_type *reloc));
-static void print_padding_statement PARAMS ((lang_padding_statement_type *s));
+  PARAMS ((lang_assignment_statement_type *,
+          lang_output_section_statement_type *));
+static void print_input_statement
+  PARAMS ((lang_input_statement_type *));
+static bfd_boolean print_one_symbol
+  PARAMS ((struct bfd_link_hash_entry *, PTR));
+static void print_input_section
+  PARAMS ((lang_input_section_type *));
+static void print_fill_statement
+  PARAMS ((lang_fill_statement_type *));
+static void print_data_statement
+  PARAMS ((lang_data_statement_type *));
+static void print_address_statement
+  PARAMS ((lang_address_statement_type *));
+static void print_reloc_statement
+  PARAMS ((lang_reloc_statement_type *));
+static void print_padding_statement
+  PARAMS ((lang_padding_statement_type *));

 static void print_wild_statement
 static void print_wild_statement

-  PARAMS ((lang_wild_statement_type *w,
-          lang_output_section_statement_type *os));
+  PARAMS ((lang_wild_statement_type *, lang_output_section_statement_type *));

 static void print_group
   PARAMS ((lang_group_statement_type *, lang_output_section_statement_type *));
 static void print_group
   PARAMS ((lang_group_statement_type *, lang_output_section_statement_type *));

-static void print_statement PARAMS ((lang_statement_union_type *s,
-                                    lang_output_section_statement_type *os));
-static void print_statement_list PARAMS ((lang_statement_union_type *s,
-                                         lang_output_section_statement_type *os));
-static void print_statements PARAMS ((void));
-static bfd_vma insert_pad PARAMS ((lang_statement_union_type **this_ptr,
-                                  fill_type fill, unsigned int power,
-                                  asection *output_section_statement,
-                                  bfd_vma dot));
+static void print_statement
+  PARAMS ((lang_statement_union_type *, lang_output_section_statement_type *));
+static void print_statement_list
+  PARAMS ((lang_statement_union_type *, lang_output_section_statement_type *));
+static void print_statements
+  PARAMS ((void));
+static void insert_pad
+  PARAMS ((lang_statement_union_type **, fill_type *,
+          unsigned int, asection *, bfd_vma));

 static bfd_vma size_input_section
 static bfd_vma size_input_section

-  PARAMS ((lang_statement_union_type **this_ptr,
-          lang_output_section_statement_type *output_section_statement,
-          fill_type fill, bfd_vma dot, boolean relax));
-static void lang_finish PARAMS ((void));
-static void ignore_bfd_errors PARAMS ((const char *, ...));
-static void lang_check PARAMS ((void));
-static void lang_common PARAMS ((void));
-static boolean lang_one_common PARAMS ((struct bfd_link_hash_entry *, PTR));
-static void lang_place_orphans PARAMS ((void));
-static int topower PARAMS ((int));
-static void lang_set_startof PARAMS ((void));
-static void reset_memory_regions PARAMS ((void));
-static void lang_record_phdrs PARAMS ((void));
+  PARAMS ((lang_statement_union_type **, lang_output_section_statement_type *,
+          fill_type *, bfd_vma));
+static void lang_finish
+  PARAMS ((void));
+static void ignore_bfd_errors
+  PARAMS ((const char *, ...));
+static void lang_check
+  PARAMS ((void));
+static void lang_common
+  PARAMS ((void));
+static bfd_boolean lang_one_common
+  PARAMS ((struct bfd_link_hash_entry *, PTR));
+static void lang_place_orphans
+  PARAMS ((void));
+static int topower
+  PARAMS ((int));
+static void lang_set_startof
+  PARAMS ((void));
+static void gc_section_callback
+  PARAMS ((lang_wild_statement_type *, struct wildcard_list *, asection *,
+          lang_input_statement_type *, PTR));
+static void lang_get_regions
+  PARAMS ((struct memory_region_struct **, struct memory_region_struct **,
+          const char *, const char *, int));
+static void lang_record_phdrs
+  PARAMS ((void));

 static void lang_gc_wild
 static void lang_gc_wild

-  PARAMS ((lang_wild_statement_type *, const char *, const char *));
-static void lang_gc_sections_1 PARAMS ((lang_statement_union_type *));
-static void lang_gc_sections PARAMS ((void));
-static void lang_do_version_exports_section PARAMS ((void));
-static void lang_check_section_addresses PARAMS ((void));
-
-typedef void (*callback_t) PARAMS ((lang_wild_statement_type *,
-                                   asection *, lang_input_statement_type *,
-                                   void *));
+  PARAMS ((lang_wild_statement_type *));
+static void lang_gc_sections_1
+  PARAMS ((lang_statement_union_type *));
+static void lang_gc_sections
+  PARAMS ((void));
+static int lang_vers_match_lang_c
+  PARAMS ((struct bfd_elf_version_expr *, const char *));
+static int lang_vers_match_lang_cplusplus
+  PARAMS ((struct bfd_elf_version_expr *, const char *));
+static int lang_vers_match_lang_java
+  PARAMS ((struct bfd_elf_version_expr *, const char *));
+static void lang_do_version_exports_section
+  PARAMS ((void));
+static void lang_check_section_addresses
+  PARAMS ((void));
+static void os_region_check
+  PARAMS ((lang_output_section_statement_type *,
+          struct memory_region_struct *, etree_type *, bfd_vma));
+static bfd_vma lang_size_sections_1
+  PARAMS ((lang_statement_union_type *, lang_output_section_statement_type *,
+          lang_statement_union_type **, fill_type *, bfd_vma, bfd_boolean *,
+          bfd_boolean));
+typedef void (*callback_t)
+  PARAMS ((lang_wild_statement_type *, struct wildcard_list *, asection *,
+          lang_input_statement_type *, PTR));
+static void walk_wild
+  PARAMS ((lang_wild_statement_type *, callback_t, PTR));

 static void walk_wild_section
 static void walk_wild_section

-  PARAMS ((lang_wild_statement_type *, const char *,
-          lang_input_statement_type *, callback_t, void *));
+  PARAMS ((lang_wild_statement_type *, lang_input_statement_type *,
+          callback_t, PTR));

 static void walk_wild_file
 static void walk_wild_file

-  PARAMS ((lang_wild_statement_type *, const char *,
-          lang_input_statement_type *, callback_t, void *));
-
-static int    get_target PARAMS ((const bfd_target *, void *));
-static void   stricpy PARAMS ((char *, char *));
-static void   strcut PARAMS ((char *, char *));
-static int    name_compare PARAMS ((char *, char *));
-static int    closest_target_match PARAMS ((const bfd_target *, void *));
-static char * get_first_input_target PARAMS ((void));
-                                       
-/* EXPORTS */
+  PARAMS ((lang_wild_statement_type *, lang_input_statement_type *,
+          callback_t, PTR));
+static int get_target
+  PARAMS ((const bfd_target *, PTR));
+static void stricpy
+  PARAMS ((char *, char *));
+static void strcut
+  PARAMS ((char *, char *));
+static int name_compare
+  PARAMS ((char *, char *));
+static int closest_target_match
+  PARAMS ((const bfd_target *, PTR));
+static char * get_first_input_target
+  PARAMS ((void));
+
+/* Exported variables.  */

 lang_output_section_statement_type *abs_output_section;
 lang_statement_list_type lang_output_section_statement;
 lang_statement_list_type *stat_ptr = &statement_list;
 lang_statement_list_type file_chain = { NULL, NULL };
 lang_output_section_statement_type *abs_output_section;
 lang_statement_list_type lang_output_section_statement;
 lang_statement_list_type *stat_ptr = &statement_list;
 lang_statement_list_type file_chain = { NULL, NULL };

-const char *entry_symbol = NULL;
-boolean entry_from_cmdline;
-boolean lang_has_input_file = false;
-boolean had_output_filename = false;
-boolean lang_float_flag = false;
-boolean delete_output_file_on_failure = false;
+struct bfd_sym_chain entry_symbol = { NULL, NULL };
+const char *entry_section = ".text";
+bfd_boolean entry_from_cmdline;
+bfd_boolean lang_has_input_file = FALSE;
+bfd_boolean had_output_filename = FALSE;
+bfd_boolean lang_float_flag = FALSE;
+bfd_boolean delete_output_file_on_failure = FALSE;

 struct lang_nocrossrefs *nocrossref_list;
 struct lang_nocrossrefs *nocrossref_list;

+struct unique_sections *unique_section_list;
+static bfd_boolean ldlang_sysrooted_script = FALSE;

 
 etree_type *base; /* Relocation base - or null */
 
 
 etree_type *base; /* Relocation base - or null */
 

-
-#if defined(__STDC__) || defined(ALMOST_STDC)
+#if defined (__STDC__) || defined (ALMOST_STDC)

 #define cat(a,b) a##b
 #else
 #define cat(a,b) a/**/b
 #endif
 
 #define cat(a,b) a##b
 #else
 #define cat(a,b) a/**/b
 #endif
 

-#define new_stat(x,y) (cat(x,_type)*) new_statement(cat(x,_enum), sizeof(cat(x,_type)),y)
+/* Don't beautify the line below with "innocent" whitespace, it breaks
+   the K&R C preprocessor!  */
+#define new_stat(x, y) \
+  (cat (x,_type)*) new_statement (cat (x,_enum), sizeof (cat (x,_type)), y)

 
 

-#define outside_section_address(q) ( (q)->output_offset + (q)->output_section->vma)
+#define outside_section_address(q) \
+  ((q)->output_offset + (q)->output_section->vma)

 
 

-#define outside_symbol_address(q) ((q)->value +   outside_section_address(q->section))
+#define outside_symbol_address(q) \
+  ((q)->value + outside_section_address (q->section))

 
 #define SECTION_NAME_MAP_LENGTH (16)
 
 
 #define SECTION_NAME_MAP_LENGTH (16)
 


@@ -200,65 +270,94 @@ stat_alloc (size)
   return obstack_alloc (&stat_obstack, size);
 }
 
   return obstack_alloc (&stat_obstack, size);
 }
 

-/*----------------------------------------------------------------------
-  Generic traversal routines for finding matching sections.
-*/
+bfd_boolean
+unique_section_p (secnam)
+     const char *secnam;
+{
+  struct unique_sections *unam;
+
+  for (unam = unique_section_list; unam; unam = unam->next)
+    if (wildcardp (unam->name)
+       ? fnmatch (unam->name, secnam, 0) == 0
+       : strcmp (unam->name, secnam) == 0)
+      {
+       return TRUE;
+      }
+
+  return FALSE;
+}
+
+/* Generic traversal routines for finding matching sections.  */

 
 static void
 
 static void

-walk_wild_section (ptr, section, file, callback, data)
+walk_wild_section (ptr, file, callback, data)

      lang_wild_statement_type *ptr;
      lang_wild_statement_type *ptr;

-     const char *section;

      lang_input_statement_type *file;
      callback_t callback;
      lang_input_statement_type *file;
      callback_t callback;

-     void *data;
+     PTR data;

 {
 {

-  /* Don't process sections from files which were excluded. */
-  if (ptr->exclude_filename_list != NULL)
-    {
-      struct name_list *list_tmp;
-      for (list_tmp = ptr->exclude_filename_list; list_tmp; list_tmp = list_tmp->next)
-        {
-         boolean match;
-
-         if (wildcardp (list_tmp->name))
-           match = fnmatch (list_tmp->name, file->filename, 0) == 0 ? true : false;
-         else
-           match = strcmp (list_tmp->name, file->filename) == 0 ? true : false;
+  asection *s;

 
 

-         if (match)
-           return;
-       }
-    }
+  if (file->just_syms_flag)
+    return;

 
 

-  if (file->just_syms_flag == false)
+  for (s = file->the_bfd->sections; s != NULL; s = s->next)

     {
     {

-      register asection *s;
-      boolean wildcard;
+      struct wildcard_list *sec;

 
 

-      if (section == NULL)
-       wildcard = false;
-      else
-       wildcard = wildcardp (section);
+      sec = ptr->section_list;
+      if (sec == NULL)
+       (*callback) (ptr, sec, s, file, data);

 
 

-      for (s = file->the_bfd->sections; s != NULL; s = s->next)
+      while (sec != NULL)

        {
        {

-         boolean match;
+         bfd_boolean skip = FALSE;
+         struct name_list *list_tmp;
+
+         /* Don't process sections from files which were
+            excluded.  */
+         for (list_tmp = sec->spec.exclude_name_list;
+              list_tmp;
+              list_tmp = list_tmp->next)
+           {
+             if (wildcardp (list_tmp->name))
+               skip = fnmatch (list_tmp->name, file->filename, 0) == 0;
+             else
+               skip = strcmp (list_tmp->name, file->filename) == 0;

 
 

-         if (section == NULL)
-           match = true;
-         else
+             /* If this file is part of an archive, and the archive is
+                excluded, exclude this file.  */
+             if (! skip && file->the_bfd != NULL
+                 && file->the_bfd->my_archive != NULL
+                 && file->the_bfd->my_archive->filename != NULL)
+               {
+                 if (wildcardp (list_tmp->name))
+                   skip = fnmatch (list_tmp->name,
+                                   file->the_bfd->my_archive->filename,
+                                   0) == 0;
+                 else
+                   skip = strcmp (list_tmp->name,
+                                  file->the_bfd->my_archive->filename) == 0;
+               }
+
+             if (skip)
+               break;
+           }
+
+         if (!skip && sec->spec.name != NULL)

            {
            {

-             const char *name;
+             const char *sname = bfd_get_section_name (file->the_bfd, s);

 
 

-             name = bfd_get_section_name (file->the_bfd, s);
-             if (wildcard)
-               match = fnmatch (section, name, 0) == 0 ? true : false;
+             if (wildcardp (sec->spec.name))
+               skip = fnmatch (sec->spec.name, sname, 0) != 0;

              else
              else

-               match = strcmp (section, name) == 0 ? true : false;
+               skip = strcmp (sec->spec.name, sname) != 0;

            }
 
            }
 

-         if (match)
-           (*callback) (ptr, s, file, data);
+         if (!skip)
+           (*callback) (ptr, sec, s, file, data);
+
+         sec = sec->next;

        }
     }
 }
        }
     }
 }


@@ -266,16 +365,15 @@ walk_wild_section (ptr, section, file, callback, data)
 /* Handle a wild statement for a single file F.  */
 
 static void
 /* Handle a wild statement for a single file F.  */
 
 static void

-walk_wild_file (s, section, f, callback, data)
+walk_wild_file (s, f, callback, data)

      lang_wild_statement_type *s;
      lang_wild_statement_type *s;

-     const char *section;

      lang_input_statement_type *f;
      callback_t callback;
      lang_input_statement_type *f;
      callback_t callback;

-     void *data;
+     PTR data;

 {
   if (f->the_bfd == NULL
       || ! bfd_check_format (f->the_bfd, bfd_archive))
 {
   if (f->the_bfd == NULL
       || ! bfd_check_format (f->the_bfd, bfd_archive))

-    walk_wild_section (s, section, f, callback, data);
+    walk_wild_section (s, f, callback, data);

   else
     {
       bfd *member;
   else
     {
       bfd *member;


@@ -292,7 +390,7 @@ walk_wild_file (s, section, f, callback, data)
             lang_input_statement.  */
          if (member->usrdata != NULL)
            {
             lang_input_statement.  */
          if (member->usrdata != NULL)
            {

-             walk_wild_section (s, section,
+             walk_wild_section (s,

                                 (lang_input_statement_type *) member->usrdata,
                                 callback, data);
            }
                                 (lang_input_statement_type *) member->usrdata,
                                 callback, data);
            }


@@ -303,27 +401,27 @@ walk_wild_file (s, section, f, callback, data)
 }
 
 static void
 }
 
 static void

-walk_wild (s, section, file, callback, data)
+walk_wild (s, callback, data)

      lang_wild_statement_type *s;
      lang_wild_statement_type *s;

-     const char *section;
-     const char *file;

      callback_t callback;
      callback_t callback;

-     void *data;
+     PTR data;

 {
 {

-  if (file == (char *) NULL)
+  const char *file_spec = s->filename;
+
+  if (file_spec == NULL)

     {
       /* Perform the iteration over all files in the list.  */
       LANG_FOR_EACH_INPUT_STATEMENT (f)
        {
     {
       /* Perform the iteration over all files in the list.  */
       LANG_FOR_EACH_INPUT_STATEMENT (f)
        {

-         walk_wild_file (s, section, f, callback, data);
+         walk_wild_file (s, f, callback, data);

        }
     }
        }
     }

-  else if (wildcardp (file))
+  else if (wildcardp (file_spec))

     {
       LANG_FOR_EACH_INPUT_STATEMENT (f)
        {
     {
       LANG_FOR_EACH_INPUT_STATEMENT (f)
        {

-         if (fnmatch (file, f->filename, FNM_FILE_NAME) == 0)
-           walk_wild_file (s, section, f, callback, data);
+         if (fnmatch (file_spec, f->filename, FNM_FILE_NAME) == 0)
+           walk_wild_file (s, f, callback, data);

        }
     }
   else
        }
     }
   else


@@ -331,22 +429,21 @@ walk_wild (s, section, file, callback, data)
       lang_input_statement_type *f;
 
       /* Perform the iteration over a single file.  */
       lang_input_statement_type *f;
 
       /* Perform the iteration over a single file.  */

-      f = lookup_name (file);
-      walk_wild_file (s, section, f, callback, data);
+      f = lookup_name (file_spec);
+      if (f)
+       walk_wild_file (s, f, callback, data);

     }
     }

-}  
-     
-/*----------------------------------------------------------------------
-  lang_for_each_statement walks the parse tree and calls the provided
-  function for each node
-*/
+}
+
+/* lang_for_each_statement walks the parse tree and calls the provided
+   function for each node.  */

 
 static void
 lang_for_each_statement_worker (func, s)
      void (*func) PARAMS ((lang_statement_union_type *));
      lang_statement_union_type *s;
 {
 
 static void
 lang_for_each_statement_worker (func, s)
      void (*func) PARAMS ((lang_statement_union_type *));
      lang_statement_union_type *s;
 {

-  for (; s != (lang_statement_union_type *) NULL; s = s->next)
+  for (; s != (lang_statement_union_type *) NULL; s = s->header.next)

     {
       func (s);
 
     {
       func (s);
 


@@ -392,11 +489,11 @@ void
 lang_for_each_statement (func)
      void (*func) PARAMS ((lang_statement_union_type *));
 {
 lang_for_each_statement (func)
      void (*func) PARAMS ((lang_statement_union_type *));
 {

-  lang_for_each_statement_worker (func,
-                                 statement_list.head);
+  lang_for_each_statement_worker (func, statement_list.head);

 }
 
 /*----------------------------------------------------------------------*/
 }
 
 /*----------------------------------------------------------------------*/

+

 void
 lang_list_init (list)
      lang_statement_list_type *list;
 void
 lang_list_init (list)
      lang_statement_list_type *list;


@@ -405,18 +502,13 @@ lang_list_init (list)
   list->tail = &list->head;
 }
 
   list->tail = &list->head;
 }
 

-/*----------------------------------------------------------------------
-
-  build a new statement node for the parse tree
+/* Build a new statement node for the parse tree.  */

 
 

- */
-
-static
-lang_statement_union_type *
+static lang_statement_union_type *

 new_statement (type, size, list)
      enum statement_enum type;
      size_t size;
 new_statement (type, size, list)
      enum statement_enum type;
      size_t size;

-     lang_statement_list_type * list;
+     lang_statement_list_type *list;

 {
   lang_statement_union_type *new = (lang_statement_union_type *)
   stat_alloc (size);
 {
   lang_statement_union_type *new = (lang_statement_union_type *)
   stat_alloc (size);


@@ -427,23 +519,21 @@ new_statement (type, size, list)
   return new;
 }
 
   return new;
 }
 

-/*
-  Build a new input file node for the language. There are several ways
-  in which we treat an input file, eg, we only look at symbols, or
-  prefix it with a -l etc.
+/* Build a new input file node for the language.  There are several
+   ways in which we treat an input file, eg, we only look at symbols,
+   or prefix it with a -l etc.

 
 

-  We can be supplied with requests for input files more than once;
-  they may, for example be split over serveral lines like foo.o(.text)
-  foo.o(.data) etc, so when asked for a file we check that we havn't
-  got it already so we don't duplicate the bfd.
+   We can be supplied with requests for input files more than once;
+   they may, for example be split over several lines like foo.o(.text)
+   foo.o(.data) etc, so when asked for a file we check that we haven't
+   got it already so we don't duplicate the bfd.  */

 
 

- */

 static lang_input_statement_type *
 new_afile (name, file_type, target, add_to_list)
 static lang_input_statement_type *
 new_afile (name, file_type, target, add_to_list)

-     CONST char *name;
+     const char *name;

      lang_input_file_enum_type file_type;
      lang_input_file_enum_type file_type;

-     CONST char *target;
-     boolean add_to_list;
+     const char *target;
+     bfd_boolean add_to_list;

 {
   lang_input_statement_type *p;
 
 {
   lang_input_statement_type *p;
 


@@ -456,57 +546,59 @@ new_afile (name, file_type, target, add_to_list)
       p->header.next = NULL;
     }
 
       p->header.next = NULL;
     }
 

-  lang_has_input_file = true;
+  lang_has_input_file = TRUE;

   p->target = target;
   p->target = target;

+  p->sysrooted = FALSE;

   switch (file_type)
     {
     case lang_input_file_is_symbols_only_enum:
       p->filename = name;
   switch (file_type)
     {
     case lang_input_file_is_symbols_only_enum:
       p->filename = name;

-      p->is_archive = false;
-      p->real = true;
+      p->is_archive = FALSE;
+      p->real = TRUE;

       p->local_sym_name = name;
       p->local_sym_name = name;

-      p->just_syms_flag = true;
-      p->search_dirs_flag = false;
+      p->just_syms_flag = TRUE;
+      p->search_dirs_flag = FALSE;

       break;
     case lang_input_file_is_fake_enum:
       p->filename = name;
       break;
     case lang_input_file_is_fake_enum:
       p->filename = name;

-      p->is_archive = false;
-      p->real = false;
+      p->is_archive = FALSE;
+      p->real = FALSE;

       p->local_sym_name = name;
       p->local_sym_name = name;

-      p->just_syms_flag = false;
-      p->search_dirs_flag = false;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = FALSE;

       break;
     case lang_input_file_is_l_enum:
       break;
     case lang_input_file_is_l_enum:

-      p->is_archive = true;
+      p->is_archive = TRUE;

       p->filename = name;
       p->filename = name;

-      p->real = true;
+      p->real = TRUE;

       p->local_sym_name = concat ("-l", name, (const char *) NULL);
       p->local_sym_name = concat ("-l", name, (const char *) NULL);

-      p->just_syms_flag = false;
-      p->search_dirs_flag = true;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = TRUE;

       break;
     case lang_input_file_is_marker_enum:
       p->filename = name;
       break;
     case lang_input_file_is_marker_enum:
       p->filename = name;

-      p->is_archive = false;
-      p->real = false;
+      p->is_archive = FALSE;
+      p->real = FALSE;

       p->local_sym_name = name;
       p->local_sym_name = name;

-      p->just_syms_flag = false;
-      p->search_dirs_flag = true;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = TRUE;

       break;
     case lang_input_file_is_search_file_enum:
       break;
     case lang_input_file_is_search_file_enum:

+      p->sysrooted = ldlang_sysrooted_script;

       p->filename = name;
       p->filename = name;

-      p->is_archive = false;
-      p->real = true;
+      p->is_archive = FALSE;
+      p->real = TRUE;

       p->local_sym_name = name;
       p->local_sym_name = name;

-      p->just_syms_flag = false;
-      p->search_dirs_flag = true;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = TRUE;

       break;
     case lang_input_file_is_file_enum:
       p->filename = name;
       break;
     case lang_input_file_is_file_enum:
       p->filename = name;

-      p->is_archive = false;
-      p->real = true;
+      p->is_archive = FALSE;
+      p->real = TRUE;

       p->local_sym_name = name;
       p->local_sym_name = name;

-      p->just_syms_flag = false;
-      p->search_dirs_flag = false;
+      p->just_syms_flag = FALSE;
+      p->search_dirs_flag = FALSE;

       break;
     default:
       FAIL ();
       break;
     default:
       FAIL ();


@@ -518,7 +610,7 @@ new_afile (name, file_type, target, add_to_list)
   p->symbol_count = 0;
   p->dynamic = config.dynamic_link;
   p->whole_archive = whole_archive;
   p->symbol_count = 0;
   p->dynamic = config.dynamic_link;
   p->whole_archive = whole_archive;

-  p->loaded = false;
+  p->loaded = FALSE;

   lang_statement_append (&input_file_chain,
                         (lang_statement_union_type *) p,
                         &p->next_real_file);
   lang_statement_append (&input_file_chain,
                         (lang_statement_union_type *) p,
                         &p->next_real_file);


@@ -527,15 +619,16 @@ new_afile (name, file_type, target, add_to_list)
 
 lang_input_statement_type *
 lang_add_input_file (name, file_type, target)
 
 lang_input_statement_type *
 lang_add_input_file (name, file_type, target)

-     CONST char *name;
+     const char *name;

      lang_input_file_enum_type file_type;
      lang_input_file_enum_type file_type;

-     CONST char *target;
+     const char *target;

 {
 {

-  lang_has_input_file = true;
-  return new_afile (name, file_type, target, true);
+  lang_has_input_file = TRUE;
+  return new_afile (name, file_type, target, TRUE);

 }
 
 }
 

-/* Build enough state so that the parser can build its tree */
+/* Build enough state so that the parser can build its tree.  */
+

 void
 lang_init ()
 {
 void
 lang_init ()
 {


@@ -551,32 +644,36 @@ lang_init ()
   first_file = lang_add_input_file ((char *) NULL,
                                    lang_input_file_is_marker_enum,
                                    (char *) NULL);
   first_file = lang_add_input_file ((char *) NULL,
                                    lang_input_file_is_marker_enum,
                                    (char *) NULL);

-  abs_output_section = lang_output_section_statement_lookup (BFD_ABS_SECTION_NAME);
+  abs_output_section =
+    lang_output_section_statement_lookup (BFD_ABS_SECTION_NAME);

 
   abs_output_section->bfd_section = bfd_abs_section_ptr;
 
 }
 
 /*----------------------------------------------------------------------
 
   abs_output_section->bfd_section = bfd_abs_section_ptr;
 
 }
 
 /*----------------------------------------------------------------------

- A region is an area of memory declared with the
- MEMORY {  name:org=exp, len=exp ... }
- syntax.
+  A region is an area of memory declared with the
+  MEMORY {  name:org=exp, len=exp ... }
+  syntax.

 
 

- We maintain a list of all the regions here
+  We maintain a list of all the regions here.

 
 

- If no regions are specified in the script, then the default is used
- which is created when looked up to be the entire data space
-*/
+  If no regions are specified in the script, then the default is used
+  which is created when looked up to be the entire data space.  */

 
 static lang_memory_region_type *lang_memory_region_list;
 static lang_memory_region_type **lang_memory_region_list_tail = &lang_memory_region_list;
 
 lang_memory_region_type *
 lang_memory_region_lookup (name)
 
 static lang_memory_region_type *lang_memory_region_list;
 static lang_memory_region_type **lang_memory_region_list_tail = &lang_memory_region_list;
 
 lang_memory_region_type *
 lang_memory_region_lookup (name)

-     CONST char *CONST name;
+     const char *const name;

 {
   lang_memory_region_type *p;
 
 {
   lang_memory_region_type *p;
 

+  /* NAME is NULL for LMA memspecs if no region was specified.  */
+  if (name == NULL)
+    return NULL;
+

   for (p = lang_memory_region_list;
        p != (lang_memory_region_type *) NULL;
        p = p->next)
   for (p = lang_memory_region_list;
        p != (lang_memory_region_type *) NULL;
        p = p->next)


@@ -607,7 +704,7 @@ lang_memory_region_lookup (name)
     lang_memory_region_type *new =
     (lang_memory_region_type *) stat_alloc (sizeof (lang_memory_region_type));
 
     lang_memory_region_type *new =
     (lang_memory_region_type *) stat_alloc (sizeof (lang_memory_region_type));
 

-    new->name = buystring (name);
+    new->name = xstrdup (name);

     new->next = (lang_memory_region_type *) NULL;
 
     *lang_memory_region_list_tail = new;
     new->next = (lang_memory_region_type *) NULL;
 
     *lang_memory_region_list_tail = new;


@@ -615,16 +712,15 @@ lang_memory_region_lookup (name)
     new->origin = 0;
     new->flags = 0;
     new->not_flags = 0;
     new->origin = 0;
     new->flags = 0;
     new->not_flags = 0;

-    new->length = ~(bfd_size_type)0;
+    new->length = ~(bfd_size_type) 0;

     new->current = 0;
     new->current = 0;

-    new->had_full_message = false;
+    new->had_full_message = FALSE;

 
     return new;
   }
 }
 
 
     return new;
   }
 }
 

-
-lang_memory_region_type *
+static lang_memory_region_type *

 lang_memory_default (section)
      asection *section;
 {
 lang_memory_default (section)
      asection *section;
 {


@@ -651,7 +747,7 @@ lang_memory_default (section)
 
 lang_output_section_statement_type *
 lang_output_section_find (name)
 
 lang_output_section_statement_type *
 lang_output_section_find (name)

-     CONST char *CONST name;
+     const char *const name;

 {
   lang_statement_union_type *u;
   lang_output_section_statement_type *lookup;
 {
   lang_statement_union_type *u;
   lang_output_section_statement_type *lookup;


@@ -671,7 +767,7 @@ lang_output_section_find (name)
 
 lang_output_section_statement_type *
 lang_output_section_statement_lookup (name)
 
 lang_output_section_statement_type *
 lang_output_section_statement_lookup (name)

-     CONST char *CONST name;
+     const char *const name;

 {
   lang_output_section_statement_type *lookup;
 
 {
   lang_output_section_statement_type *lookup;
 


@@ -683,22 +779,23 @@ lang_output_section_statement_lookup (name)
        new_stat (lang_output_section_statement, stat_ptr);
       lookup->region = (lang_memory_region_type *) NULL;
       lookup->lma_region = (lang_memory_region_type *) NULL;
        new_stat (lang_output_section_statement, stat_ptr);
       lookup->region = (lang_memory_region_type *) NULL;
       lookup->lma_region = (lang_memory_region_type *) NULL;

-      lookup->fill = 0;
+      lookup->fill = (fill_type *) 0;

       lookup->block_value = 1;
       lookup->name = name;
 
       lookup->next = (lang_statement_union_type *) NULL;
       lookup->bfd_section = (asection *) NULL;
       lookup->block_value = 1;
       lookup->name = name;
 
       lookup->next = (lang_statement_union_type *) NULL;
       lookup->bfd_section = (asection *) NULL;

-      lookup->processed = false;
+      lookup->processed = FALSE;

       lookup->sectype = normal_section;
       lookup->addr_tree = (etree_type *) NULL;
       lang_list_init (&lookup->children);
 
       lookup->sectype = normal_section;
       lookup->addr_tree = (etree_type *) NULL;
       lang_list_init (&lookup->children);
 

-      lookup->memspec = (CONST char *) NULL;
+      lookup->memspec = (const char *) NULL;

       lookup->flags = 0;
       lookup->subsection_alignment = -1;
       lookup->section_alignment = -1;
       lookup->load_base = (union etree_union *) NULL;
       lookup->flags = 0;
       lookup->subsection_alignment = -1;
       lookup->section_alignment = -1;
       lookup->load_base = (union etree_union *) NULL;

+      lookup->update_dot_tree = NULL;

       lookup->phdrs = NULL;
 
       lang_statement_append (&lang_output_section_statement,
       lookup->phdrs = NULL;
 
       lang_statement_append (&lang_output_section_statement,


@@ -794,7 +891,7 @@ init_os (s)
     return;
 
   if (strcmp (s->name, DISCARD_SECTION_NAME) == 0)
     return;
 
   if (strcmp (s->name, DISCARD_SECTION_NAME) == 0)

-    einfo (_("%P%F: Illegal use of `%s' section"), DISCARD_SECTION_NAME);
+    einfo (_("%P%F: Illegal use of `%s' section\n"), DISCARD_SECTION_NAME);

 
   new = ((section_userdata_type *)
         stat_alloc (sizeof (section_userdata_type)));
 
   new = ((section_userdata_type *)
         stat_alloc (sizeof (section_userdata_type)));


@@ -809,8 +906,8 @@ init_os (s)
     }
   s->bfd_section->output_section = s->bfd_section;
 
     }
   s->bfd_section->output_section = s->bfd_section;
 

-  /* We initialize an output sections output offset to minus its own */
-  /* vma to allow us to output a section through itself */
+  /* We initialize an output sections output offset to minus its own
+     vma to allow us to output a section through itself.  */

   s->bfd_section->output_offset = 0;
   get_userdata (s->bfd_section) = (PTR) new;
 
   s->bfd_section->output_offset = 0;
   get_userdata (s->bfd_section) = (PTR) new;
 


@@ -818,6 +915,9 @@ init_os (s)
      mention are initialized.  */
   if (s->addr_tree != NULL)
     exp_init_os (s->addr_tree);
      mention are initialized.  */
   if (s->addr_tree != NULL)
     exp_init_os (s->addr_tree);

+
+  if (s->load_base != NULL)
+    exp_init_os (s->load_base);

 }
 
 /* Make sure that all output sections mentioned in an expression are
 }
 
 /* Make sure that all output sections mentioned in an expression are


@@ -883,13 +983,13 @@ exp_init_os (exp)
    the same name.  It's possible to get more than one element in a
    list if the COMDAT sections have different names.  */
 
    the same name.  It's possible to get more than one element in a
    list if the COMDAT sections have different names.  */
 

-struct already_linked_hash_entry 
+struct already_linked_hash_entry

 {
   struct bfd_hash_entry root;
   struct already_linked *entry;
 };
 
 {
   struct bfd_hash_entry root;
   struct already_linked *entry;
 };
 

-struct already_linked 
+struct already_linked

 {
   struct already_linked *next;
   asection *sec;
 {
   struct already_linked *next;
   asection *sec;


@@ -899,7 +999,6 @@ struct already_linked
 
 static struct bfd_hash_table already_linked_table;
 
 
 static struct bfd_hash_table already_linked_table;
 

-/*ARGSUSED*/

 static void
 section_already_linked (abfd, sec, data)
      bfd *abfd;
 static void
 section_already_linked (abfd, sec, data)
      bfd *abfd;


@@ -916,8 +1015,7 @@ section_already_linked (abfd, sec, data)
      discard all sections.  */
   if (entry->just_syms_flag)
     {
      discard all sections.  */
   if (entry->just_syms_flag)
     {

-      sec->output_section = bfd_abs_section_ptr;
-      sec->output_offset = sec->vma;
+      bfd_link_just_syms (sec, &link_info);

       return;
     }
 
       return;
     }
 


@@ -926,30 +1024,30 @@ section_already_linked (abfd, sec, data)
   if ((flags & SEC_LINK_ONCE) == 0)
     return;
 
   if ((flags & SEC_LINK_ONCE) == 0)
     return;
 

-  /* FIXME: When doing a relocateable link, we may have trouble
+  /* FIXME: When doing a relocatable link, we may have trouble

      copying relocations in other sections that refer to local symbols
      in the section being discarded.  Those relocations will have to
      be converted somehow; as of this writing I'm not sure that any of
      the backends handle that correctly.
 
      It is tempting to instead not discard link once sections when
      copying relocations in other sections that refer to local symbols
      in the section being discarded.  Those relocations will have to
      be converted somehow; as of this writing I'm not sure that any of
      the backends handle that correctly.
 
      It is tempting to instead not discard link once sections when

-     doing a relocateable link (technically, they should be discarded
+     doing a relocatable link (technically, they should be discarded

      whenever we are building constructors).  However, that fails,
      because the linker winds up combining all the link once sections
      into a single large link once section, which defeats the purpose
      of having link once sections in the first place.
 
      whenever we are building constructors).  However, that fails,
      because the linker winds up combining all the link once sections
      into a single large link once section, which defeats the purpose
      of having link once sections in the first place.
 

-     Also, not merging link once sections in a relocateable link
-     causes trouble for MIPS ELF, which relies in link once semantics
+     Also, not merging link once sections in a relocatable link
+     causes trouble for MIPS ELF, which relies on link once semantics

      to handle the .reginfo section correctly.  */
 
   name = bfd_get_section_name (abfd, sec);
 
      to handle the .reginfo section correctly.  */
 
   name = bfd_get_section_name (abfd, sec);
 

-  already_linked_list = 
+  already_linked_list =

     ((struct already_linked_hash_entry *)
     ((struct already_linked_hash_entry *)

-     bfd_hash_lookup (&already_linked_table, name, true, false));
+     bfd_hash_lookup (&already_linked_table, name, TRUE, FALSE));

 
 

-  for (l = already_linked_list->entry;  l != NULL; l = l->next)
+  for (l = already_linked_list->entry; l != NULL; l = l->next)

     {
       if (sec->comdat == NULL
          || l->sec->comdat == NULL
     {
       if (sec->comdat == NULL
          || l->sec->comdat == NULL


@@ -989,14 +1087,13 @@ section_already_linked (abfd, sec, data)
              break;
            }
 
              break;
            }
 

-         /* Set the output_section field so that wild_doit does not
-            create a lang_input_section structure for this section.
-            Since there might be a symbol in the section being
-            discarded, we must retain a pointer to the section which
-            we are really going to use.  */
+         /* Set the output_section field so that lang_add_section
+            does not create a lang_input_section structure for this
+            section.  */

          sec->output_section = bfd_abs_section_ptr;
          sec->output_section = bfd_abs_section_ptr;

-         if (sec->comdat != NULL)
-           sec->comdat->sec = l->sec;
+
+         if (flags & SEC_GROUP)
+           bfd_discard_group (abfd, sec);

 
          return;
        }
 
          return;
        }


@@ -1005,7 +1102,7 @@ section_already_linked (abfd, sec, data)
   /* This is the first section with this name.  Record it.  Allocate
      the memory from the same obstack as the hash table is kept in.  */
 
   /* This is the first section with this name.  Record it.  Allocate
      the memory from the same obstack as the hash table is kept in.  */
 

-  l = ((struct already_linked *) 
+  l = ((struct already_linked *)

        bfd_hash_allocate (&already_linked_table, sizeof *l));
 
   l->sec = sec;
        bfd_hash_allocate (&already_linked_table, sizeof *l));
 
   l->sec = sec;


@@ -1022,7 +1119,7 @@ already_linked_newfunc (entry, table, string)
      struct bfd_hash_table *table;
      const char *string ATTRIBUTE_UNUSED;
 {
      struct bfd_hash_table *table;
      const char *string ATTRIBUTE_UNUSED;
 {

-  struct already_linked_hash_entry *ret = 
+  struct already_linked_hash_entry *ret =

     bfd_hash_allocate (table, sizeof (struct already_linked_hash_entry));
 
   ret->entry = NULL;
     bfd_hash_allocate (table, sizeof (struct already_linked_hash_entry));
 
   ret->entry = NULL;


@@ -1051,13 +1148,13 @@ already_linked_table_free ()
    explicit actions, like foo.o(.text), bar.o(.text) and
    foo.o(.text, .data).  */
 
    explicit actions, like foo.o(.text), bar.o(.text) and
    foo.o(.text, .data).  */
 

-/* Return true if the PATTERN argument is a wildcard pattern.
+/* Return TRUE if the PATTERN argument is a wildcard pattern.

    Although backslashes are treated specially if a pattern contains
    wildcards, we do not consider the mere presence of a backslash to
    Although backslashes are treated specially if a pattern contains
    wildcards, we do not consider the mere presence of a backslash to

-   be enough to cause the the pattern to be treated as a wildcard.
+   be enough to cause the pattern to be treated as a wildcard.

    That lets us handle DOS filenames more naturally.  */
 
    That lets us handle DOS filenames more naturally.  */
 

-static boolean
+static bfd_boolean

 wildcardp (pattern)
      const char *pattern;
 {
 wildcardp (pattern)
      const char *pattern;
 {


@@ -1067,8 +1164,8 @@ wildcardp (pattern)
     if (*s == '?'
        || *s == '*'
        || *s == '[')
     if (*s == '?'
        || *s == '*'
        || *s == '[')

-      return true;
-  return false;
+      return TRUE;
+  return FALSE;

 }
 
 /* Add SECTION to the output section OUTPUT.  Do this by creating a
 }
 
 /* Add SECTION to the output section OUTPUT.  Do this by creating a


@@ -1076,35 +1173,36 @@ wildcardp (pattern)
    input file which holds SECTION.  */
 
 void
    input file which holds SECTION.  */
 
 void

-wild_doit (ptr, section, output, file)
+lang_add_section (ptr, section, output, file)

      lang_statement_list_type *ptr;
      asection *section;
      lang_output_section_statement_type *output;
      lang_input_statement_type *file;
 {
   flagword flags;
      lang_statement_list_type *ptr;
      asection *section;
      lang_output_section_statement_type *output;
      lang_input_statement_type *file;
 {
   flagword flags;

-  boolean discard;
+  bfd_boolean discard;

 
   flags = bfd_get_section_flags (section->owner, section);
 
 
   flags = bfd_get_section_flags (section->owner, section);
 

-  discard = false;
+  discard = FALSE;

 
 

-  /* If we are doing a final link, discard sections marked with
-     SEC_EXCLUDE.  */
-  if (! link_info.relocateable
-      && (flags & SEC_EXCLUDE) != 0)
-    discard = true;
+  /* Discard sections marked with SEC_EXCLUDE if we are doing a final
+     link.  Discard debugging sections marked with SEC_EXCLUDE on a
+     relocatable link too.  */
+  if ((flags & SEC_EXCLUDE) != 0
+      && ((flags & SEC_DEBUGGING) != 0 || !link_info.relocateable))
+    discard = TRUE;

 
   /* Discard input sections which are assigned to a section named
      DISCARD_SECTION_NAME.  */
   if (strcmp (output->name, DISCARD_SECTION_NAME) == 0)
 
   /* Discard input sections which are assigned to a section named
      DISCARD_SECTION_NAME.  */
   if (strcmp (output->name, DISCARD_SECTION_NAME) == 0)

-    discard = true;
+    discard = TRUE;

 
   /* Discard debugging sections if we are stripping debugging
      information.  */
   if ((link_info.strip == strip_debugger || link_info.strip == strip_all)
       && (flags & SEC_DEBUGGING) != 0)
 
   /* Discard debugging sections if we are stripping debugging
      information.  */
   if ((link_info.strip == strip_debugger || link_info.strip == strip_all)
       && (flags & SEC_DEBUGGING) != 0)

-    discard = true;
+    discard = TRUE;

 
   if (discard)
     {
 
   if (discard)
     {


@@ -1118,19 +1216,17 @@ wild_doit (ptr, section, output, file)
 
   if (section->output_section == NULL)
     {
 
   if (section->output_section == NULL)
     {

-      boolean first;
+      bfd_boolean first;

       lang_input_section_type *new;
       flagword flags;
 
       if (output->bfd_section == NULL)
       lang_input_section_type *new;
       flagword flags;
 
       if (output->bfd_section == NULL)

-       {
-         init_os (output);
-         first = true;
-       }
-      else
-       first = false;
+       init_os (output);

 
 

-      /* Add a section reference to the list */
+      first = ! output->bfd_section->linker_has_input;
+      output->bfd_section->linker_has_input = 1;
+
+      /* Add a section reference to the list.  */

       new = new_stat (lang_input_section, ptr);
 
       new->section = section;
       new = new_stat (lang_input_section, ptr);
 
       new->section = section;


@@ -1163,8 +1259,26 @@ wild_doit (ptr, section, output, file)
       if (! first && (section->output_section->flags & SEC_READONLY) == 0)
        flags &= ~ SEC_READONLY;
 
       if (! first && (section->output_section->flags & SEC_READONLY) == 0)
        flags &= ~ SEC_READONLY;
 

+      /* Keep SEC_MERGE and SEC_STRINGS only if they are the same.  */
+      if (! first
+         && ((section->output_section->flags & (SEC_MERGE | SEC_STRINGS))
+             != (flags & (SEC_MERGE | SEC_STRINGS))
+             || ((flags & SEC_MERGE)
+                 && section->output_section->entsize != section->entsize)))
+       {
+         section->output_section->flags &= ~ (SEC_MERGE | SEC_STRINGS);
+         flags &= ~ (SEC_MERGE | SEC_STRINGS);
+       }
+
+      /* For now make .tbss normal section.  */
+      if ((flags & SEC_THREAD_LOCAL) && ! link_info.relocateable)
+       flags |= SEC_LOAD;
+

       section->output_section->flags |= flags;
 
       section->output_section->flags |= flags;
 

+      if (flags & SEC_MERGE)
+       section->output_section->entsize = section->entsize;
+

       /* If SEC_READONLY is not set in the input section, then clear
          it from the output section.  */
       if ((section->flags & SEC_READONLY) == 0)
       /* If SEC_READONLY is not set in the input section, then clear
          it from the output section.  */
       if ((section->flags & SEC_READONLY) == 0)


@@ -1193,16 +1307,16 @@ wild_doit (ptr, section, output, file)
       if (section->alignment_power > output->bfd_section->alignment_power)
        output->bfd_section->alignment_power = section->alignment_power;
 
       if (section->alignment_power > output->bfd_section->alignment_power)
        output->bfd_section->alignment_power = section->alignment_power;
 

-      /* If supplied an aligment, then force it.  */
+      /* If supplied an alignment, then force it.  */

       if (output->section_alignment != -1)
        output->bfd_section->alignment_power = output->section_alignment;
 
       if (section->flags & SEC_BLOCK)
       if (output->section_alignment != -1)
        output->bfd_section->alignment_power = output->section_alignment;
 
       if (section->flags & SEC_BLOCK)

-        {
-          section->output_section->flags |= SEC_BLOCK;
-          /* FIXME: This value should really be obtained from the bfd... */
-          output->block_value = 128;
-        }
+       {
+         section->output_section->flags |= SEC_BLOCK;
+         /* FIXME: This value should really be obtained from the bfd...  */
+         output->block_value = 128;
+       }

     }
 }
 
     }
 }
 


@@ -1212,19 +1326,20 @@ wild_doit (ptr, section, output, file)
    new section should just go at the end of the current list.  */
 
 static lang_statement_union_type *
    new section should just go at the end of the current list.  */
 
 static lang_statement_union_type *

-wild_sort (wild, file, section)
+wild_sort (wild, sec, file, section)

      lang_wild_statement_type *wild;
      lang_wild_statement_type *wild;

+     struct wildcard_list *sec;

      lang_input_statement_type *file;
      asection *section;
 {
   const char *section_name;
   lang_statement_union_type *l;
 
      lang_input_statement_type *file;
      asection *section;
 {
   const char *section_name;
   lang_statement_union_type *l;
 

-  if (! wild->filenames_sorted && ! wild->sections_sorted)
+  if (!wild->filenames_sorted && (sec == NULL || !sec->spec.sorted))

     return NULL;
 
   section_name = bfd_get_section_name (file->the_bfd, section);
     return NULL;
 
   section_name = bfd_get_section_name (file->the_bfd, section);

-  for (l = wild->children.head; l != NULL; l = l->next)
+  for (l = wild->children.head; l != NULL; l = l->header.next)

     {
       lang_input_section_type *ls;
 
     {
       lang_input_section_type *ls;
 


@@ -1238,7 +1353,7 @@ wild_sort (wild, file, section)
       if (wild->filenames_sorted)
        {
          const char *fn, *ln;
       if (wild->filenames_sorted)
        {
          const char *fn, *ln;

-         boolean fa, la;
+         bfd_boolean fa, la;

          int i;
 
          /* The PE support for the .idata section as generated by
          int i;
 
          /* The PE support for the .idata section as generated by


@@ -1250,24 +1365,24 @@ wild_sort (wild, file, section)
              && bfd_my_archive (file->the_bfd) != NULL)
            {
              fn = bfd_get_filename (bfd_my_archive (file->the_bfd));
              && bfd_my_archive (file->the_bfd) != NULL)
            {
              fn = bfd_get_filename (bfd_my_archive (file->the_bfd));

-             fa = true;
+             fa = TRUE;

            }
          else
            {
              fn = file->filename;
            }
          else
            {
              fn = file->filename;

-             fa = false;
+             fa = FALSE;

            }
 
          if (ls->ifile->the_bfd != NULL
              && bfd_my_archive (ls->ifile->the_bfd) != NULL)
            {
              ln = bfd_get_filename (bfd_my_archive (ls->ifile->the_bfd));
            }
 
          if (ls->ifile->the_bfd != NULL
              && bfd_my_archive (ls->ifile->the_bfd) != NULL)
            {
              ln = bfd_get_filename (bfd_my_archive (ls->ifile->the_bfd));

-             la = true;
+             la = TRUE;

            }
          else
            {
              ln = ls->ifile->filename;
            }
          else
            {
              ln = ls->ifile->filename;

-             la = false;
+             la = FALSE;

            }
 
          i = strcmp (fn, ln);
            }
 
          i = strcmp (fn, ln);


@@ -1294,7 +1409,7 @@ wild_sort (wild, file, section)
       /* Here either the files are not sorted by name, or we are
          looking at the sections for this file.  */
 
       /* Here either the files are not sorted by name, or we are
          looking at the sections for this file.  */
 

-      if (wild->sections_sorted)
+      if (sec != NULL && sec->spec.sorted)

        {
          if (strcmp (section_name,
                      bfd_get_section_name (ls->ifile->the_bfd,
        {
          if (strcmp (section_name,
                      bfd_get_section_name (ls->ifile->the_bfd,


@@ -1311,52 +1426,57 @@ wild_sort (wild, file, section)
    NULL, in which case it is a wild card.  */
 
 static void
    NULL, in which case it is a wild card.  */
 
 static void

-output_section_callback (ptr, section, file, output)
+output_section_callback (ptr, sec, section, file, output)

      lang_wild_statement_type *ptr;
      lang_wild_statement_type *ptr;

+     struct wildcard_list *sec;

      asection *section;
      lang_input_statement_type *file;
      asection *section;
      lang_input_statement_type *file;

-     void *output;
+     PTR output;

 {
   lang_statement_union_type *before;
 {
   lang_statement_union_type *before;

-  
+
+  /* Exclude sections that match UNIQUE_SECTION_LIST.  */
+  if (unique_section_p (bfd_get_section_name (file->the_bfd, section)))
+    return;
+

   /* If the wild pattern was marked KEEP, the member sections
      should be as well.  */
   if (ptr->keep_sections)
     section->flags |= SEC_KEEP;
   /* If the wild pattern was marked KEEP, the member sections
      should be as well.  */
   if (ptr->keep_sections)
     section->flags |= SEC_KEEP;

-  
-  before = wild_sort (ptr, file, section);
-  
+
+  before = wild_sort (ptr, sec, file, section);
+

   /* Here BEFORE points to the lang_input_section which
      should follow the one we are about to add.  If BEFORE
      is NULL, then the section should just go at the end
      of the current list.  */
   /* Here BEFORE points to the lang_input_section which
      should follow the one we are about to add.  If BEFORE
      is NULL, then the section should just go at the end
      of the current list.  */

-  
+

   if (before == NULL)
   if (before == NULL)

-    wild_doit (&ptr->children, section, 
-              (lang_output_section_statement_type *) output, 
-              file);
+    lang_add_section (&ptr->children, section,
+                     (lang_output_section_statement_type *) output,
+                     file);

   else
     {
       lang_statement_list_type list;
       lang_statement_union_type **pp;
   else
     {
       lang_statement_list_type list;
       lang_statement_union_type **pp;

-      
+

       lang_list_init (&list);
       lang_list_init (&list);

-      wild_doit (&list, section, 
-                (lang_output_section_statement_type *) output, 
-                file);
-      
+      lang_add_section (&list, section,
+                       (lang_output_section_statement_type *) output,
+                       file);
+

       /* If we are discarding the section, LIST.HEAD will
         be NULL.  */
       if (list.head != NULL)
        {
       /* If we are discarding the section, LIST.HEAD will
         be NULL.  */
       if (list.head != NULL)
        {

-         ASSERT (list.head->next == NULL);
-         
+         ASSERT (list.head->header.next == NULL);
+

          for (pp = &ptr->children.head;
               *pp != before;
          for (pp = &ptr->children.head;
               *pp != before;

-              pp = &(*pp)->next)
+              pp = &(*pp)->header.next)

            ASSERT (*pp != NULL);
            ASSERT (*pp != NULL);

-         
-         list.head->next = *pp;
+
+         list.head->header.next = *pp;

          *pp = list.head;
        }
     }
          *pp = list.head;
        }
     }


@@ -1386,7 +1506,7 @@ lookup_name (name)
 
   if (search == (lang_input_statement_type *) NULL)
     search = new_afile (name, lang_input_file_is_file_enum, default_target,
 
   if (search == (lang_input_statement_type *) NULL)
     search = new_afile (name, lang_input_file_is_file_enum, default_target,

-                       false);
+                       FALSE);

 
   /* If we have already added this file, or this file is not real
      (FIXME: can that ever actually happen?) or the name is NULL
 
   /* If we have already added this file, or this file is not real
      (FIXME: can that ever actually happen?) or the name is NULL


@@ -1396,14 +1516,15 @@ lookup_name (name)
       || search->filename == (const char *) NULL)
     return search;
 
       || search->filename == (const char *) NULL)
     return search;
 

-  load_symbols (search, (lang_statement_list_type *) NULL);
+  if (! load_symbols (search, (lang_statement_list_type *) NULL))
+    return NULL;

 
   return search;
 }
 
 /* Get the symbols for an input file.  */
 
 
   return search;
 }
 
 /* Get the symbols for an input file.  */
 

-static void
+static bfd_boolean

 load_symbols (entry, place)
      lang_input_statement_type *entry;
      lang_statement_list_type *place;
 load_symbols (entry, place)
      lang_input_statement_type *entry;
      lang_statement_list_type *place;


@@ -1411,7 +1532,7 @@ load_symbols (entry, place)
   char **matching;
 
   if (entry->loaded)
   char **matching;
 
   if (entry->loaded)

-    return;
+    return TRUE;

 
   ldfile_open_file (entry);
 
 
   ldfile_open_file (entry);
 


@@ -1420,8 +1541,15 @@ load_symbols (entry, place)
     {
       bfd_error_type err;
       lang_statement_list_type *hold;
     {
       bfd_error_type err;
       lang_statement_list_type *hold;

+      bfd_boolean bad_load = TRUE;
+      bfd_boolean save_ldlang_sysrooted_script;

 
       err = bfd_get_error ();
 
       err = bfd_get_error ();

+
+      /* See if the emulation has some special knowledge.  */
+      if (ldemul_unrecognized_file (entry))
+       return TRUE;
+

       if (err == bfd_error_file_ambiguously_recognized)
        {
          char **p;
       if (err == bfd_error_file_ambiguously_recognized)
        {
          char **p;


@@ -1434,35 +1562,34 @@ load_symbols (entry, place)
        }
       else if (err != bfd_error_file_not_recognized
               || place == NULL)
        }
       else if (err != bfd_error_file_not_recognized
               || place == NULL)

-       einfo (_("%F%B: file not recognized: %E\n"), entry->the_bfd);
+         einfo (_("%F%B: file not recognized: %E\n"), entry->the_bfd);
+      else
+       bad_load = FALSE;

 
       bfd_close (entry->the_bfd);
       entry->the_bfd = NULL;
 
 
       bfd_close (entry->the_bfd);
       entry->the_bfd = NULL;
 

-      /* See if the emulation has some special knowledge.  */
-
-      if (ldemul_unrecognized_file (entry))
-       return;
-

       /* Try to interpret the file as a linker script.  */
       /* Try to interpret the file as a linker script.  */

-

       ldfile_open_command_file (entry->filename);
 
       hold = stat_ptr;
       stat_ptr = place;
       ldfile_open_command_file (entry->filename);
 
       hold = stat_ptr;
       stat_ptr = place;

+      save_ldlang_sysrooted_script = ldlang_sysrooted_script;
+      ldlang_sysrooted_script = entry->sysrooted;

 
 

-      ldfile_assumed_script = true;
+      ldfile_assumed_script = TRUE;

       parser_input = input_script;
       yyparse ();
       parser_input = input_script;
       yyparse ();

-      ldfile_assumed_script = false;
+      ldfile_assumed_script = FALSE;

 
 

+      ldlang_sysrooted_script = save_ldlang_sysrooted_script;

       stat_ptr = hold;
 
       stat_ptr = hold;
 

-      return;
+      return ! bad_load;

     }
 
   if (ldemul_recognized_file (entry))
     }
 
   if (ldemul_recognized_file (entry))

-    return;
+    return TRUE;

 
   /* We don't call ldlang_add_file for an archive.  Instead, the
      add_symbols entry point will call ldlang_add_file, via the
 
   /* We don't call ldlang_add_file for an archive.  Instead, the
      add_symbols entry point will call ldlang_add_file, via the


@@ -1482,122 +1609,137 @@ load_symbols (entry, place)
     case bfd_archive:
       if (entry->whole_archive)
        {
     case bfd_archive:
       if (entry->whole_archive)
        {

-         bfd *member = bfd_openr_next_archived_file (entry->the_bfd,
-                                                     (bfd *) NULL);
-         while (member != NULL)
+         bfd *member = NULL;
+         bfd_boolean loaded = TRUE;
+
+         for (;;)

            {
            {

+             member = bfd_openr_next_archived_file (entry->the_bfd, member);
+
+             if (member == NULL)
+               break;
+

              if (! bfd_check_format (member, bfd_object))
              if (! bfd_check_format (member, bfd_object))

-               einfo (_("%F%B: object %B in archive is not object\n"),
-                      entry->the_bfd, member);
+               {
+                 einfo (_("%F%B: member %B in archive is not an object\n"),
+                        entry->the_bfd, member);
+                 loaded = FALSE;
+               }
+

              if (! ((*link_info.callbacks->add_archive_element)
                     (&link_info, member, "--whole-archive")))
                abort ();
              if (! ((*link_info.callbacks->add_archive_element)
                     (&link_info, member, "--whole-archive")))
                abort ();

+

              if (! bfd_link_add_symbols (member, &link_info))
              if (! bfd_link_add_symbols (member, &link_info))

-               einfo (_("%F%B: could not read symbols: %E\n"), member);
-             member = bfd_openr_next_archived_file (entry->the_bfd,
-                                                    member);
+               {
+                 einfo (_("%F%B: could not read symbols: %E\n"), member);
+                 loaded = FALSE;
+               }

            }
 
            }
 

-         entry->loaded = true;
-
-         return;
+         entry->loaded = loaded;
+         return loaded;

        }
        }

+      break;

     }
 
     }
 

-  if (! bfd_link_add_symbols (entry->the_bfd, &link_info))
+  if (bfd_link_add_symbols (entry->the_bfd, &link_info))
+    entry->loaded = TRUE;
+  else

     einfo (_("%F%B: could not read symbols: %E\n"), entry->the_bfd);
 
     einfo (_("%F%B: could not read symbols: %E\n"), entry->the_bfd);
 

-  entry->loaded = true;
+  return entry->loaded;

 }
 
 }
 

-     
-
-/* Handle a wild statement.  SECTION or FILE or both may be NULL,
-   indicating that it is a wildcard.  Separate lang_input_section
-   statements are created for each part of the expansion; they are
-   added after the wild statement S.  OUTPUT is the output section.  */
+/* Handle a wild statement.  S->FILENAME or S->SECTION_LIST or both
+   may be NULL, indicating that it is a wildcard.  Separate
+   lang_input_section statements are created for each part of the
+   expansion; they are added after the wild statement S.  OUTPUT is
+   the output section.  */

 
 static void
 
 static void

-wild (s, section, file, target, output)
+wild (s, target, output)

      lang_wild_statement_type *s;
      lang_wild_statement_type *s;

-     const char *section;
-     const char *file;

      const char *target ATTRIBUTE_UNUSED;
      lang_output_section_statement_type *output;
 {
      const char *target ATTRIBUTE_UNUSED;
      lang_output_section_statement_type *output;
 {

-  walk_wild (s, section, file, output_section_callback, (void *) output);
+  struct wildcard_list *sec;
+
+  walk_wild (s, output_section_callback, (PTR) output);

 
 

-  if (section != (char *) NULL
-      && strcmp (section, "COMMON") == 0
-      && default_common_section == NULL)
+  for (sec = s->section_list; sec != NULL; sec = sec->next)

     {
     {

-      /* Remember the section that common is going to in case we later
-         get something which doesn't know where to put it.  */
-      default_common_section = output;
+      if (default_common_section != NULL)
+       break;
+      if (sec->spec.name != NULL && strcmp (sec->spec.name, "COMMON") == 0)
+       {
+         /* Remember the section that common is going to in case we
+            later get something which doesn't know where to put it.  */
+         default_common_section = output;
+       }

     }
 }
 
     }
 }
 

-/* Return true iff target is the sought target.  */
+/* Return TRUE iff target is the sought target.  */
+

 static int
 get_target (target, data)
 static int
 get_target (target, data)

-     const bfd_target * target;
-     void * data;
+     const bfd_target *target;
+     PTR data;

 {
 {

-  const char * sought = (const char *) data;
-  
+  const char *sought = (const char *) data;
+

   return strcmp (target->name, sought) == 0;
 }
 
 /* Like strcpy() but convert to lower case as well.  */
   return strcmp (target->name, sought) == 0;
 }
 
 /* Like strcpy() but convert to lower case as well.  */

+

 static void
 stricpy (dest, src)
 static void
 stricpy (dest, src)

-     char * dest;
-     char * src;
+     char *dest;
+     char *src;

 {
   char c;
 {
   char c;

-  
-  while ((c = * src ++) != 0)
-    {
-      if (isupper ((unsigned char) c))
-       c = tolower (c);

 
 

-      * dest ++ = c;
-    }
+  while ((c = *src++) != 0)
+    *dest++ = TOLOWER (c);

 
 

-  * dest = 0;
+  *dest = 0;

 }
 
 }
 

-/* Remove the first occurance of needle (if any) in haystack
+/* Remove the first occurrence of needle (if any) in haystack

    from haystack.  */
    from haystack.  */

+

 static void
 strcut (haystack, needle)
 static void
 strcut (haystack, needle)

-     char * haystack;
-     char * needle;
+     char *haystack;
+     char *needle;

 {
   haystack = strstr (haystack, needle);
 {
   haystack = strstr (haystack, needle);

-  
+

   if (haystack)
     {
   if (haystack)
     {

-      char * src;
+      char *src;
+
+      for (src = haystack + strlen (needle); *src;)
+       *haystack++ = *src++;

 
 

-      for (src = haystack + strlen (needle); * src;)
-       * haystack ++ = * src ++;
-      
-      * haystack = 0;
+      *haystack = 0;

     }
 }
 
 /* Compare two target format name strings.
    Return a value indicating how "similar" they are.  */
     }
 }
 
 /* Compare two target format name strings.
    Return a value indicating how "similar" they are.  */

+

 static int
 name_compare (first, second)
 static int
 name_compare (first, second)

-     char * first;
-     char * second;
+     char *first;
+     char *second;

 {
 {

-  char * copy1;
-  char * copy2;
-  int    result;
-  
+  char *copy1;
+  char *copy2;
+  int result;
+

   copy1 = xmalloc (strlen (first) + 1);
   copy2 = xmalloc (strlen (second) + 1);
 
   copy1 = xmalloc (strlen (first) + 1);
   copy2 = xmalloc (strlen (second) + 1);
 


@@ -1614,13 +1756,13 @@ name_compare (first, second)
   /* Return a value based on how many characters match,
      starting from the beginning.   If both strings are
      the same then return 10 * their length.  */
   /* Return a value based on how many characters match,
      starting from the beginning.   If both strings are
      the same then return 10 * their length.  */

-  for (result = 0; copy1 [result] == copy2 [result]; result ++)
-    if (copy1 [result] == 0)
+  for (result = 0; copy1[result] == copy2[result]; result++)
+    if (copy1[result] == 0)

       {
        result *= 10;
        break;
       }
       {
        result *= 10;
        break;
       }

-  
+

   free (copy1);
   free (copy2);
 
   free (copy1);
   free (copy2);
 


@@ -1628,22 +1770,25 @@ name_compare (first, second)
 }
 
 /* Set by closest_target_match() below.  */
 }
 
 /* Set by closest_target_match() below.  */

-static const bfd_target * winner;
+static const bfd_target *winner;

 
 /* Scan all the valid bfd targets looking for one that has the endianness
    requirement that was specified on the command line, and is the nearest
    match to the original output target.  */
 
 /* Scan all the valid bfd targets looking for one that has the endianness
    requirement that was specified on the command line, and is the nearest
    match to the original output target.  */

+

 static int
 closest_target_match (target, data)
 static int
 closest_target_match (target, data)

-     const bfd_target * target;
-     void * data;
+     const bfd_target *target;
+     PTR data;

 {
 {

-  const bfd_target * original = (const bfd_target *) data;
-  
-  if (command_line.endian == ENDIAN_BIG && target->byteorder != BFD_ENDIAN_BIG)
+  const bfd_target *original = (const bfd_target *) data;
+
+  if (command_line.endian == ENDIAN_BIG
+      && target->byteorder != BFD_ENDIAN_BIG)

     return 0;
     return 0;

-  
-  if (command_line.endian == ENDIAN_LITTLE && target->byteorder != BFD_ENDIAN_LITTLE)
+
+  if (command_line.endian == ENDIAN_LITTLE
+      && target->byteorder != BFD_ENDIAN_LITTLE)

     return 0;
 
   /* Must be the same flavour.  */
     return 0;
 
   /* Must be the same flavour.  */


@@ -1658,8 +1803,9 @@ closest_target_match (target, data)
     }
 
   /* Oh dear, we now have two potential candidates for a successful match.
     }
 
   /* Oh dear, we now have two potential candidates for a successful match.

-     Compare their names and choose the better one. */
-  if (name_compare (target->name, original->name) > name_compare (winner->name, original->name))
+     Compare their names and choose the better one.  */
+  if (name_compare (target->name, original->name)
+      > name_compare (winner->name, original->name))

     winner = target;
 
   /* Keep on searching until wqe have checked them all.  */
     winner = target;
 
   /* Keep on searching until wqe have checked them all.  */


@@ -1667,10 +1813,11 @@ closest_target_match (target, data)
 }
 
 /* Return the BFD target format of the first input file.  */
 }
 
 /* Return the BFD target format of the first input file.  */

+

 static char *
 get_first_input_target ()
 {
 static char *
 get_first_input_target ()
 {

-  char * target = NULL;
+  char *target = NULL;

 
   LANG_FOR_EACH_INPUT_STATEMENT (s)
     {
 
   LANG_FOR_EACH_INPUT_STATEMENT (s)
     {


@@ -1678,86 +1825,102 @@ get_first_input_target ()
          && s->real)
        {
          ldfile_open_file (s);
          && s->real)
        {
          ldfile_open_file (s);

-         
+

          if (s->the_bfd != NULL
              && bfd_check_format (s->the_bfd, bfd_object))
            {
              target = bfd_get_target (s->the_bfd);
          if (s->the_bfd != NULL
              && bfd_check_format (s->the_bfd, bfd_object))
            {
              target = bfd_get_target (s->the_bfd);

-         
+

              if (target != NULL)
                break;
            }
        }
     }
              if (target != NULL)
                break;
            }
        }
     }

-  
+

   return target;
 }
 
   return target;
 }
 

+const char *
+lang_get_output_target ()
+{
+  const char *target;
+
+  /* Has the user told us which output format to use?  */
+  if (output_target != (char *) NULL)
+    return output_target;
+
+  /* No - has the current target been set to something other than
+     the default?  */
+  if (current_target != default_target)
+    return current_target;
+
+  /* No - can we determine the format of the first input file?  */
+  target = get_first_input_target ();
+  if (target != NULL)
+    return target;
+
+  /* Failed - use the default output target.  */
+  return default_target;
+}
+

 /* Open the output file.  */
 
 static bfd *
 open_output (name)
 /* Open the output file.  */
 
 static bfd *
 open_output (name)

-     const char * name;
+     const char *name;

 {
 {

-  bfd * output;
+  bfd *output;

 
 

-  /* Has the user told us which output format to use ?  */
-  if (output_target == (char *) NULL)
-    {
-      /* No - has the current target been set to something other than the default ?  */
-      if (current_target != default_target)
-       output_target = current_target;
+  output_target = lang_get_output_target ();

 
 

-      /* No - can we determine the format of the first input file ? */
-      else
-       {
-         output_target = get_first_input_target ();
-
-         /* Failed - use the default output target.  */
-         if (output_target == NULL)
-           output_target = default_target;
-       }
-    }
-  
-  /* Has the user requested a particular endianness on the command line ?  */
+  /* Has the user requested a particular endianness on the command
+     line?  */

   if (command_line.endian != ENDIAN_UNSET)
     {
   if (command_line.endian != ENDIAN_UNSET)
     {

-      const bfd_target * target;
+      const bfd_target *target;

       enum bfd_endian desired_endian;
 
       /* Get the chosen target.  */
       enum bfd_endian desired_endian;
 
       /* Get the chosen target.  */

-      target = bfd_search_for_target (get_target, (void *) output_target);
+      target = bfd_search_for_target (get_target, (PTR) output_target);

 
 

-      if (command_line.endian == ENDIAN_BIG)
-       desired_endian = BFD_ENDIAN_BIG;
-      else
-       desired_endian = BFD_ENDIAN_LITTLE;
-      
-      /* See if the target has the wrong endianness.  This should not happen
-        if the linker script has provided big and little endian alternatives,
-        but some scrips don't do this.  */
-      if (target->byteorder != desired_endian)
+      /* If the target is not supported, we cannot do anything.  */
+      if (target != NULL)

        {
        {

-         /* If it does, then see if the target provides
-            an alternative with the correct endianness.  */
-         if (target->alternative_target != NULL
-             && (target->alternative_target->byteorder == desired_endian))
-           output_target = target->alternative_target->name;
+         if (command_line.endian == ENDIAN_BIG)
+           desired_endian = BFD_ENDIAN_BIG;

          else
          else

+           desired_endian = BFD_ENDIAN_LITTLE;
+
+         /* See if the target has the wrong endianness.  This should
+            not happen if the linker script has provided big and
+            little endian alternatives, but some scrips don't do
+            this.  */
+         if (target->byteorder != desired_endian)

            {
            {

-             /* Try to find a target as similar as possible to the default
-                target, but which has the desired endian characteristic.  */
-             (void) bfd_search_for_target (closest_target_match, (void *) target);
-             
-             /* Oh dear - we could not find any targets that satisfy our requirements.  */
-             if (winner == NULL)
-               einfo (_("%P: warning: could not find any targets that match endianness requirement\n"));
+             /* If it does, then see if the target provides
+                an alternative with the correct endianness.  */
+             if (target->alternative_target != NULL
+                 && (target->alternative_target->byteorder == desired_endian))
+               output_target = target->alternative_target->name;

              else
              else

-               output_target = winner->name;
+               {
+                 /* Try to find a target as similar as possible to
+                    the default target, but which has the desired
+                    endian characteristic.  */
+                 (void) bfd_search_for_target (closest_target_match,
+                                               (PTR) target);
+
+                 /* Oh dear - we could not find any targets that
+                    satisfy our requirements.  */
+                 if (winner == NULL)
+                   einfo (_("%P: warning: could not find any targets that match endianness requirement\n"));
+                 else
+                   output_target = winner->name;
+               }

            }
        }
     }
            }
        }
     }

-      
+

   output = bfd_openw (name, output_target);
 
   if (output == (bfd *) NULL)
   output = bfd_openw (name, output_target);
 
   if (output == (bfd *) NULL)


@@ -1768,9 +1931,11 @@ open_output (name)
       einfo (_("%P%F: cannot open output file %s: %E\n"), name);
     }
 
       einfo (_("%P%F: cannot open output file %s: %E\n"), name);
     }
 

-  delete_output_file_on_failure = true;
+  delete_output_file_on_failure = TRUE;

 
 

-  /*  output->flags |= D_PAGED;*/
+#if 0
+  output->flags |= D_PAGED;
+#endif

 
   if (! bfd_set_format (output, bfd_object))
     einfo (_("%P%F:%s: can not make object file: %E\n"), name);
 
   if (! bfd_set_format (output, bfd_object))
     einfo (_("%P%F:%s: can not make object file: %E\n"), name);


@@ -1789,7 +1954,7 @@ open_output (name)
 
 static void
 ldlang_open_output (statement)
 
 static void
 ldlang_open_output (statement)

-     lang_statement_union_type * statement;
+     lang_statement_union_type *statement;

 {
   switch (statement->header.type)
     {
 {
   switch (statement->header.type)
     {


@@ -1824,9 +1989,9 @@ ldlang_open_output (statement)
 static void
 open_input_bfds (s, force)
      lang_statement_union_type *s;
 static void
 open_input_bfds (s, force)
      lang_statement_union_type *s;

-     boolean force;
+     bfd_boolean force;

 {
 {

-  for (; s != (lang_statement_union_type *) NULL; s = s->next)
+  for (; s != (lang_statement_union_type *) NULL; s = s->header.next)

     {
       switch (s->header.type)
        {
     {
       switch (s->header.type)
        {


@@ -1837,7 +2002,7 @@ open_input_bfds (s, force)
          open_input_bfds (s->output_section_statement.children.head, force);
          break;
        case lang_wild_statement_enum:
          open_input_bfds (s->output_section_statement.children.head, force);
          break;
        case lang_wild_statement_enum:

-         /* Maybe we should load the file's symbols */
+         /* Maybe we should load the file's symbols.  */

          if (s->wild_statement.filename
              && ! wildcardp (s->wild_statement.filename))
            (void) lookup_name (s->wild_statement.filename);
          if (s->wild_statement.filename
              && ! wildcardp (s->wild_statement.filename))
            (void) lookup_name (s->wild_statement.filename);


@@ -1848,13 +2013,13 @@ open_input_bfds (s, force)
            struct bfd_link_hash_entry *undefs;
 
            /* We must continually search the entries in the group
            struct bfd_link_hash_entry *undefs;
 
            /* We must continually search the entries in the group

-               until no new symbols are added to the list of undefined
-               symbols.  */
+              until no new symbols are added to the list of undefined
+              symbols.  */

 
            do
              {
                undefs = link_info.hash->undefs_tail;
 
            do
              {
                undefs = link_info.hash->undefs_tail;

-               open_input_bfds (s->group_statement.children.head, true);
+               open_input_bfds (s->group_statement.children.head, TRUE);

              }
            while (undefs != link_info.hash->undefs_tail);
          }
              }
            while (undefs != link_info.hash->undefs_tail);
          }


@@ -1878,16 +2043,17 @@ open_input_bfds (s, force)
                  && s->input_statement.loaded
                  && bfd_check_format (s->input_statement.the_bfd,
                                       bfd_archive))
                  && s->input_statement.loaded
                  && bfd_check_format (s->input_statement.the_bfd,
                                       bfd_archive))

-               s->input_statement.loaded = false;
+               s->input_statement.loaded = FALSE;

 
              lang_list_init (&add);
 
 
              lang_list_init (&add);
 

-             load_symbols (&s->input_statement, &add);
+             if (! load_symbols (&s->input_statement, &add))
+               config.make_executable = FALSE;

 
              if (add.head != NULL)
                {
 
              if (add.head != NULL)
                {

-                 *add.tail = s->next;
-                 s->next = add.head;
+                 *add.tail = s->header.next;
+                 s->header.next = add.head;

                }
            }
          break;
                }
            }
          break;


@@ -1897,7 +2063,8 @@ open_input_bfds (s, force)
     }
 }
 
     }
 }
 

-/* If there are [COMMONS] statements, put a wild one into the bss section */
+/* If there are [COMMONS] statements, put a wild one into the bss
+   section.  */

 
 static void
 lang_reasonable_defaults ()
 
 static void
 lang_reasonable_defaults ()


@@ -1906,11 +2073,9 @@ lang_reasonable_defaults ()
   lang_output_section_statement_lookup (".text");
   lang_output_section_statement_lookup (".data");
 
   lang_output_section_statement_lookup (".text");
   lang_output_section_statement_lookup (".data");
 

-  default_common_section =
-    lang_output_section_statement_lookup (".bss");
+  default_common_section = lang_output_section_statement_lookup (".bss");

 
 

-
-  if (placed_commons == false)
+  if (!placed_commons)

     {
       lang_wild_statement_type *new =
       new_stat (lang_wild_statement,
     {
       lang_wild_statement_type *new =
       new_stat (lang_wild_statement,


@@ -1921,24 +2086,21 @@ lang_reasonable_defaults ()
       lang_list_init (&new->children);
     }
 #endif
       lang_list_init (&new->children);
     }
 #endif

-

 }
 
 }
 

-/*
- Add the supplied name to the symbol table as an undefined reference.
- Remove items from the chain as we open input bfds
- */
-typedef struct ldlang_undef_chain_list
-{
-  struct ldlang_undef_chain_list *next;
-  char *name;
-}                       ldlang_undef_chain_list_type;
+/* Add the supplied name to the symbol table as an undefined reference.
+   This is a two step process as the symbol table doesn't even exist at
+   the time the ld command line is processed.  First we put the name
+   on a list, then, once the output file has been opened, transfer the
+   name to the symbol table.  */
+
+typedef struct bfd_sym_chain ldlang_undef_chain_list_type;

 
 

-static ldlang_undef_chain_list_type *ldlang_undef_chain_list_head;
+#define ldlang_undef_chain_list_head entry_symbol.next

 
 void
 ldlang_add_undef (name)
 
 void
 ldlang_add_undef (name)

-     CONST char *CONST name;
+     const char *const name;

 {
   ldlang_undef_chain_list_type *new =
     ((ldlang_undef_chain_list_type *)
 {
   ldlang_undef_chain_list_type *new =
     ((ldlang_undef_chain_list_type *)


@@ -1947,13 +2109,35 @@ ldlang_add_undef (name)
   new->next = ldlang_undef_chain_list_head;
   ldlang_undef_chain_list_head = new;
 
   new->next = ldlang_undef_chain_list_head;
   ldlang_undef_chain_list_head = new;
 

-  new->name = buystring (name);
+  new->name = xstrdup (name);
+
+  if (output_bfd != NULL)
+    insert_undefined (new->name);
+}
+
+/* Insert NAME as undefined in the symbol table.  */
+
+static void
+insert_undefined (name)
+     const char *name;
+{
+  struct bfd_link_hash_entry *h;
+
+  h = bfd_link_hash_lookup (link_info.hash, name, TRUE, FALSE, TRUE);
+  if (h == (struct bfd_link_hash_entry *) NULL)
+    einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
+  if (h->type == bfd_link_hash_new)
+    {
+      h->type = bfd_link_hash_undefined;
+      h->u.undef.abfd = NULL;
+      bfd_link_add_undef (link_info.hash, h);
+    }

 }
 
 /* Run through the list of undefineds created above and place them
    into the linker hash table as undefined symbols belonging to the
 }
 
 /* Run through the list of undefineds created above and place them
    into the linker hash table as undefined symbols belonging to the

-   script file.
-*/
+   script file.  */
+

 static void
 lang_place_undefineds ()
 {
 static void
 lang_place_undefineds ()
 {


@@ -1963,38 +2147,24 @@ lang_place_undefineds ()
        ptr != (ldlang_undef_chain_list_type *) NULL;
        ptr = ptr->next)
     {
        ptr != (ldlang_undef_chain_list_type *) NULL;
        ptr = ptr->next)
     {

-      struct bfd_link_hash_entry *h;
-
-      h = bfd_link_hash_lookup (link_info.hash, ptr->name, true, false, true);
-      if (h == (struct bfd_link_hash_entry *) NULL)
-       einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
-      if (h->type == bfd_link_hash_new)
-       {
-         h->type = bfd_link_hash_undefined;
-         h->u.undef.abfd = NULL;
-         bfd_link_add_undef (link_info.hash, h);
-       }
+      insert_undefined (ptr->name);

     }
 }
 
     }
 }
 

-/* Open input files and attatch to output sections */
+/* Open input files and attach to output sections.  */
+

 static void
 map_input_to_output_sections (s, target, output_section_statement)
 static void
 map_input_to_output_sections (s, target, output_section_statement)

-     lang_statement_union_type * s;
-     CONST char *target;
-     lang_output_section_statement_type * output_section_statement;
+     lang_statement_union_type *s;
+     const char *target;
+     lang_output_section_statement_type *output_section_statement;

 {
 {

-  for (; s != (lang_statement_union_type *) NULL; s = s->next)
+  for (; s != (lang_statement_union_type *) NULL; s = s->header.next)

     {
       switch (s->header.type)
        {
     {
       switch (s->header.type)
        {

-
-

        case lang_wild_statement_enum:
        case lang_wild_statement_enum:

-         wild (&s->wild_statement, s->wild_statement.section_name,
-               s->wild_statement.filename, target,
-               output_section_statement);
-
+         wild (&s->wild_statement, target, output_section_statement);

          break;
        case lang_constructors_statement_enum:
          map_input_to_output_sections (constructor_list.head,
          break;
        case lang_constructors_statement_enum:
          map_input_to_output_sections (constructor_list.head,


@@ -2033,14 +2203,14 @@ map_input_to_output_sections (s, target, output_section_statement)
            init_os (output_section_statement);
 
          /* Make sure that any sections mentioned in the assignment
            init_os (output_section_statement);
 
          /* Make sure that any sections mentioned in the assignment

-             are initialized.  */
+            are initialized.  */

          exp_init_os (s->assignment_statement.exp);
          break;
        case lang_afile_asection_pair_statement_enum:
          FAIL ();
          break;
        case lang_address_statement_enum:
          exp_init_os (s->assignment_statement.exp);
          break;
        case lang_afile_asection_pair_statement_enum:
          FAIL ();
          break;
        case lang_address_statement_enum:

-         /* Mark the specified section with the supplied address */
+         /* Mark the specified section with the supplied address.  */

          {
            lang_output_section_statement_type *os =
              lang_output_section_statement_lookup
          {
            lang_output_section_statement_type *os =
              lang_output_section_statement_lookup


@@ -2055,9 +2225,44 @@ map_input_to_output_sections (s, target, output_section_statement)
     }
 }
 
     }
 }
 

+/* An output section might have been removed after its statement was
+   added.  For example, ldemul_before_allocation can remove dynamic
+   sections if they turn out to be not needed.  Clean them up here.  */
+
+static void
+strip_excluded_output_sections ()
+{
+  lang_statement_union_type *u;
+
+  for (u = lang_output_section_statement.head;
+       u != NULL;
+       u = u->output_section_statement.next)
+    {
+      lang_output_section_statement_type *os;
+      asection *s;
+
+      os = &u->output_section_statement;
+      s = os->bfd_section;
+      if (s != NULL && (s->flags & SEC_EXCLUDE) != 0)
+       {
+         asection **p;
+
+         os->bfd_section = NULL;
+
+         for (p = &output_bfd->sections; *p; p = &(*p)->next)
+           if (*p == s)
+             {
+               bfd_section_list_remove (output_bfd, p);
+               output_bfd->section_count--;
+               break;
+             }
+       }
+    }
+}
+

 static void
 print_output_section_statement (output_section_statement)
 static void
 print_output_section_statement (output_section_statement)

-     lang_output_section_statement_type * output_section_statement;
+     lang_output_section_statement_type *output_section_statement;

 {
   asection *section = output_section_statement->bfd_section;
   int len;
 {
   asection *section = output_section_statement->bfd_section;
   int len;


@@ -2103,8 +2308,8 @@ print_output_section_statement (output_section_statement)
 
 static void
 print_assignment (assignment, output_section)
 
 static void
 print_assignment (assignment, output_section)

-     lang_assignment_statement_type * assignment;
-     lang_output_section_statement_type * output_section;
+     lang_assignment_statement_type *assignment;
+     lang_output_section_statement_type *output_section;

 {
   int i;
   etree_value_type result;
 {
   int i;
   etree_value_type result;


@@ -2115,7 +2320,17 @@ print_assignment (assignment, output_section)
   result = exp_fold_tree (assignment->exp->assign.src, output_section,
                          lang_final_phase_enum, print_dot, &print_dot);
   if (result.valid_p)
   result = exp_fold_tree (assignment->exp->assign.src, output_section,
                          lang_final_phase_enum, print_dot, &print_dot);
   if (result.valid_p)

-    minfo ("0x%V", result.value + result.section->bfd_section->vma);
+    {
+      const char *dst;
+      bfd_vma value;
+
+      value = result.value + result.section->bfd_section->vma;
+      dst = assignment->exp->assign.dst;
+
+      minfo ("0x%V", value);
+      if (dst[0] == '.' && dst[1] == 0)
+       print_dot = value;
+    }

   else
     {
       minfo ("*undef*   ");
   else
     {
       minfo ("*undef*   ");


@@ -2133,7 +2348,7 @@ print_assignment (assignment, output_section)
 
 static void
 print_input_statement (statm)
 
 static void
 print_input_statement (statm)

-     lang_input_statement_type * statm;
+     lang_input_statement_type *statm;

 {
   if (statm->filename != (char *) NULL)
     {
 {
   if (statm->filename != (char *) NULL)
     {


@@ -2144,7 +2359,7 @@ print_input_statement (statm)
 /* Print all symbols defined in a particular section.  This is called
    via bfd_link_hash_traverse.  */
 
 /* Print all symbols defined in a particular section.  This is called
    via bfd_link_hash_traverse.  */
 

-static boolean 
+static bfd_boolean

 print_one_symbol (hash_entry, ptr)
      struct bfd_link_hash_entry *hash_entry;
      PTR ptr;
 print_one_symbol (hash_entry, ptr)
      struct bfd_link_hash_entry *hash_entry;
      PTR ptr;


@@ -2167,18 +2382,18 @@ print_one_symbol (hash_entry, ptr)
       minfo ("             %T\n", hash_entry->root.string);
     }
 
       minfo ("             %T\n", hash_entry->root.string);
     }
 

-  return true;
+  return TRUE;

 }
 
 /* Print information about an input section to the map file.  */
 
 static void
 print_input_section (in)
 }
 
 /* Print information about an input section to the map file.  */
 
 static void
 print_input_section (in)

-     lang_input_section_type * in;
+     lang_input_section_type *in;

 {
   asection *i = in->section;
   bfd_size_type size = i->_cooked_size != 0 ? i->_cooked_size : i->_raw_size;
 {
   asection *i = in->section;
   bfd_size_type size = i->_cooked_size != 0 ? i->_cooked_size : i->_raw_size;

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,

                                                ldfile_output_machine);
   if (size != 0)
     {
                                                ldfile_output_machine);
   if (size != 0)
     {


@@ -2232,20 +2447,25 @@ print_input_section (in)
 
 static void
 print_fill_statement (fill)
 
 static void
 print_fill_statement (fill)

-     lang_fill_statement_type * fill;
+     lang_fill_statement_type *fill;

 {
 {

-  fprintf (config.map_file, " FILL mask 0x%x\n", fill->fill);
+  size_t size;
+  unsigned char *p;
+  fputs (" FILL mask 0x", config.map_file);
+  for (p = fill->fill->data, size = fill->fill->size; size != 0; p++, size--)
+    fprintf (config.map_file, "%02x", *p);
+  fputs ("\n", config.map_file);

 }
 
 static void
 print_data_statement (data)
 }
 
 static void
 print_data_statement (data)

-     lang_data_statement_type * data;
+     lang_data_statement_type *data;

 {
   int i;
   bfd_vma addr;
   bfd_size_type size;
   const char *name;
 {
   int i;
   bfd_vma addr;
   bfd_size_type size;
   const char *name;

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,

                                                ldfile_output_machine);
 
   for (i = 0; i < SECTION_NAME_MAP_LENGTH; i++)
                                                ldfile_output_machine);
 
   for (i = 0; i < SECTION_NAME_MAP_LENGTH; i++)


@@ -2316,8 +2536,8 @@ print_reloc_statement (reloc)
   int i;
   bfd_vma addr;
   bfd_size_type size;
   int i;
   bfd_vma addr;
   bfd_size_type size;

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                               ldfile_output_machine); 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,
+                                               ldfile_output_machine);

 
   for (i = 0; i < SECTION_NAME_MAP_LENGTH; i++)
     print_space ();
 
   for (i = 0; i < SECTION_NAME_MAP_LENGTH; i++)
     print_space ();


@@ -2340,7 +2560,7 @@ print_reloc_statement (reloc)
   print_nl ();
 
   print_dot = addr + size / opb;
   print_nl ();
 
   print_dot = addr + size / opb;

-}  
+}

 
 static void
 print_padding_statement (s)
 
 static void
 print_padding_statement (s)


@@ -2348,8 +2568,8 @@ print_padding_statement (s)
 {
   int len;
   bfd_vma addr;
 {
   int len;
   bfd_vma addr;

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                               ldfile_output_machine); 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,
+                                               ldfile_output_machine);

 
   minfo (" *fill*");
 
 
   minfo (" *fill*");
 


@@ -2363,10 +2583,15 @@ print_padding_statement (s)
   addr = s->output_offset;
   if (s->output_section != NULL)
     addr += s->output_section->vma;
   addr = s->output_offset;
   if (s->output_section != NULL)
     addr += s->output_section->vma;

-  minfo ("0x%V %W", addr, s->size);
+  minfo ("0x%V %W ", addr, s->size);

 
 

-  if (s->fill != 0)
-    minfo (" %u", s->fill);
+  if (s->fill->size != 0)
+    {
+      size_t size;
+      unsigned char *p;
+      for (p = s->fill->data, size = s->fill->size; size != 0; p++, size--)
+       fprintf (config.map_file, "%02x", *p);
+    }

 
   print_nl ();
 
 
   print_nl ();
 


@@ -2375,22 +2600,16 @@ print_padding_statement (s)
 
 static void
 print_wild_statement (w, os)
 
 static void
 print_wild_statement (w, os)

-     lang_wild_statement_type * w;
-     lang_output_section_statement_type * os;
+     lang_wild_statement_type *w;
+     lang_output_section_statement_type *os;

 {
 {

+  struct wildcard_list *sec;
+

   print_space ();
 
   if (w->filenames_sorted)
     minfo ("SORT(");
   print_space ();
 
   if (w->filenames_sorted)
     minfo ("SORT(");

-  if (w->exclude_filename_list != NULL)
-    {
-      name_list *tmp;
-      minfo ("EXCLUDE_FILE ( %s", w->exclude_filename_list->name);
-      for (tmp=w->exclude_filename_list->next; tmp; tmp = tmp->next)
-        minfo (", %s", tmp->name);
-      minfo (")");
-     }
-   if (w->filename != NULL)
+  if (w->filename != NULL)

     minfo ("%s", w->filename);
   else
     minfo ("*");
     minfo ("%s", w->filename);
   else
     minfo ("*");


@@ -2398,14 +2617,27 @@ print_wild_statement (w, os)
     minfo (")");
 
   minfo ("(");
     minfo (")");
 
   minfo ("(");

-  if (w->sections_sorted)
-    minfo ("SORT(");
-  if (w->section_name != NULL)
-    minfo ("%s", w->section_name);
-  else
-    minfo ("*");
-  if (w->sections_sorted)
-    minfo (")");
+  for (sec = w->section_list; sec; sec = sec->next)
+    {
+      if (sec->spec.sorted)
+       minfo ("SORT(");
+      if (sec->spec.exclude_name_list != NULL)
+       {
+         name_list *tmp;
+         minfo ("EXCLUDE_FILE(%s", sec->spec.exclude_name_list->name);
+         for (tmp = sec->spec.exclude_name_list->next; tmp; tmp = tmp->next)
+           minfo (" %s", tmp->name);
+         minfo (") ");
+       }
+      if (sec->spec.name != NULL)
+       minfo ("%s", sec->spec.name);
+      else
+       minfo ("*");
+      if (sec->spec.sorted)
+       minfo (")");
+      if (sec->next)
+       minfo (" ");
+    }

   minfo (")");
 
   print_nl ();
   minfo (")");
 
   print_nl ();


@@ -2436,7 +2668,7 @@ print_statement_list (s, os)
   while (s != NULL)
     {
       print_statement (s, os);
   while (s != NULL)
     {
       print_statement (s, os);

-      s = s->next;
+      s = s->header.next;

     }
 }
 
     }
 }
 


@@ -2528,7 +2760,7 @@ print_statements ()
 
 void
 dprint_statement (s, n)
 
 void
 dprint_statement (s, n)

-     lang_statement_union_type * s;
+     lang_statement_union_type *s;

      int n;
 {
   FILE *map_save = config.map_file;
      int n;
 {
   FILE *map_save = config.map_file;


@@ -2542,96 +2774,100 @@ dprint_statement (s, n)
       while (s && --n >= 0)
        {
          print_statement (s, abs_output_section);
       while (s && --n >= 0)
        {
          print_statement (s, abs_output_section);

-         s = s->next;
+         s = s->header.next;

        }
     }
 
   config.map_file = map_save;
 }
 
        }
     }
 
   config.map_file = map_save;
 }
 

-static bfd_vma
-insert_pad (this_ptr, fill, power, output_section_statement, dot)
-     lang_statement_union_type ** this_ptr;
-     fill_type fill;
-     unsigned int power;
-     asection * output_section_statement;
+static void
+insert_pad (ptr, fill, alignment_needed, output_section, dot)
+     lang_statement_union_type **ptr;
+     fill_type *fill;
+     unsigned int alignment_needed;
+     asection *output_section;

      bfd_vma dot;
 {
      bfd_vma dot;
 {

-  /* Align this section first to the
-     input sections requirement, then
-     to the output section's requirement.
-     If this alignment is > than any seen before,
-     then record it too. Perform the alignment by
-     inserting a magic 'padding' statement.
-     */
-
-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                               ldfile_output_machine); 
-  unsigned int alignment_needed = align_power (dot, power) - dot;
-
-  if (alignment_needed != 0)
+  static fill_type zero_fill = { 1, { 0 } };
+  lang_statement_union_type *pad;
+
+  pad = ((lang_statement_union_type *)
+        ((char *) ptr - offsetof (lang_statement_union_type, header.next)));
+  if (ptr != &statement_list.head
+      && pad->header.type == lang_padding_statement_enum
+      && pad->padding_statement.output_section == output_section)

     {
     {

-      lang_statement_union_type *new =
-       ((lang_statement_union_type *)
-        stat_alloc (sizeof (lang_padding_statement_type)));
-
-      /* Link into existing chain */
-      new->header.next = *this_ptr;
-      *this_ptr = new;
-      new->header.type = lang_padding_statement_enum;
-      new->padding_statement.output_section = output_section_statement;
-      new->padding_statement.output_offset =
-       dot - output_section_statement->vma;
-      new->padding_statement.fill = fill;
-      new->padding_statement.size = alignment_needed * opb;
+      /* Use the existing pad statement.  The above test on output
+        section is probably redundant, but it doesn't hurt to check.  */

     }
     }

-
-
-  /* Remember the most restrictive alignment */
-  if (power > output_section_statement->alignment_power)
+  else

     {
     {

-      output_section_statement->alignment_power = power;
+      /* Make a new padding statement, linked into existing chain.  */
+      pad = ((lang_statement_union_type *)
+            stat_alloc (sizeof (lang_padding_statement_type)));
+      pad->header.next = *ptr;
+      *ptr = pad;
+      pad->header.type = lang_padding_statement_enum;
+      pad->padding_statement.output_section = output_section;
+      if (fill == (fill_type *) 0)
+       fill = &zero_fill;
+      pad->padding_statement.fill = fill;

     }
     }

-  output_section_statement->_raw_size += alignment_needed * opb;
-
-  return dot + alignment_needed;
+  pad->padding_statement.output_offset = dot - output_section->vma;
+  pad->padding_statement.size = alignment_needed;
+  output_section->_raw_size += alignment_needed;

 }
 
 }
 

-/* Work out how much this section will move the dot point */
+/* Work out how much this section will move the dot point.  */
+

 static bfd_vma
 static bfd_vma

-size_input_section (this_ptr, output_section_statement, fill, dot, relax)
-     lang_statement_union_type ** this_ptr;
-     lang_output_section_statement_type * output_section_statement;
-     fill_type fill;
+size_input_section (this_ptr, output_section_statement, fill, dot)
+     lang_statement_union_type **this_ptr;
+     lang_output_section_statement_type *output_section_statement;
+     fill_type *fill;

      bfd_vma dot;
      bfd_vma dot;

-     boolean relax ATTRIBUTE_UNUSED;

 {
   lang_input_section_type *is = &((*this_ptr)->input_section);
   asection *i = is->section;
 {
   lang_input_section_type *is = &((*this_ptr)->input_section);
   asection *i = is->section;

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                               ldfile_output_machine); 

 
 

-  if (is->ifile->just_syms_flag == false)
+  if (!is->ifile->just_syms_flag)

     {
     {

+      unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,
+                                                   ldfile_output_machine);
+      unsigned int alignment_needed;
+      asection *o;
+
+      /* Align this section first to the input sections requirement,
+        then to the output section's requirement.  If this alignment
+        is greater than any seen before, then record it too.  Perform
+        the alignment by inserting a magic 'padding' statement.  */
+

       if (output_section_statement->subsection_alignment != -1)
       if (output_section_statement->subsection_alignment != -1)

-       i->alignment_power =
-       output_section_statement->subsection_alignment;
+       i->alignment_power = output_section_statement->subsection_alignment;
+
+      o = output_section_statement->bfd_section;
+      if (o->alignment_power < i->alignment_power)
+       o->alignment_power = i->alignment_power;
+
+      alignment_needed = align_power (dot, i->alignment_power) - dot;

 
 

-      dot = insert_pad (this_ptr, fill, i->alignment_power,
-                       output_section_statement->bfd_section, dot);
+      if (alignment_needed != 0)
+       {
+         insert_pad (this_ptr, fill, alignment_needed * opb, o, dot);
+         dot += alignment_needed;
+       }

 
 

-      /* Remember where in the output section this input section goes */
+      /* Remember where in the output section this input section goes.  */

 
 

-      i->output_offset = dot - output_section_statement->bfd_section->vma;
+      i->output_offset = dot - o->vma;

 
 

-      /* Mark how big the output section must be to contain this now
-        */
+      /* Mark how big the output section must be to contain this now.  */

       if (i->_cooked_size != 0)
        dot += i->_cooked_size / opb;
       else
        dot += i->_raw_size / opb;
       if (i->_cooked_size != 0)
        dot += i->_cooked_size / opb;
       else
        dot += i->_raw_size / opb;

-      output_section_statement->bfd_section->_raw_size = 
-        (dot - output_section_statement->bfd_section->vma) * opb;
+      o->_raw_size = (dot - o->vma) * opb;

     }
   else
     {
     }
   else
     {


@@ -2642,27 +2878,29 @@ size_input_section (this_ptr, output_section_statement, fill, dot, relax)
 }
 
 #define IGNORE_SECTION(bfd, s) \
 }
 
 #define IGNORE_SECTION(bfd, s) \

-  (((bfd_get_section_flags (bfd, s) & (SEC_ALLOC | SEC_LOAD)) != (SEC_ALLOC | SEC_LOAD)) \
+  (((bfd_get_section_flags (bfd, s) & (SEC_ALLOC | SEC_LOAD))  \
+    != (SEC_ALLOC | SEC_LOAD))                                 \

    || bfd_section_size (bfd, s) == 0)
 
 /* Check to see if any allocated sections overlap with other allocated
    sections.  This can happen when the linker script specifically specifies
    the output section addresses of the two sections.  */
    || bfd_section_size (bfd, s) == 0)
 
 /* Check to see if any allocated sections overlap with other allocated
    sections.  This can happen when the linker script specifically specifies
    the output section addresses of the two sections.  */

+

 static void
 lang_check_section_addresses ()
 {
 static void
 lang_check_section_addresses ()
 {

-  asection * s;
+  asection *s;

   unsigned opb = bfd_octets_per_byte (output_bfd);
 
   /* Scan all sections in the output list.  */
   for (s = output_bfd->sections; s != NULL; s = s->next)
     {
   unsigned opb = bfd_octets_per_byte (output_bfd);
 
   /* Scan all sections in the output list.  */
   for (s = output_bfd->sections; s != NULL; s = s->next)
     {

-      asection * os;
-      
+      asection *os;
+

       /* Ignore sections which are not loaded or which have no contents.  */
       if (IGNORE_SECTION (output_bfd, s))
        continue;
       /* Ignore sections which are not loaded or which have no contents.  */
       if (IGNORE_SECTION (output_bfd, s))
        continue;

-      
+

       /* Once we reach section 's' stop our seach.  This prevents two
         warning messages from being produced, one for 'section A overlaps
         section B' and one for 'section B overlaps section A'.  */
       /* Once we reach section 's' stop our seach.  This prevents two
         warning messages from being produced, one for 'section A overlaps
         section B' and one for 'section B overlaps section A'.  */


@@ -2672,7 +2910,7 @@ lang_check_section_addresses ()
          bfd_vma s_end;
          bfd_vma os_start;
          bfd_vma os_end;
          bfd_vma s_end;
          bfd_vma os_start;
          bfd_vma os_end;

-         
+

          /* Only consider loadable sections with real contents.  */
          if (IGNORE_SECTION (output_bfd, os))
            continue;
          /* Only consider loadable sections with real contents.  */
          if (IGNORE_SECTION (output_bfd, os))
            continue;


@@ -2684,15 +2922,15 @@ lang_check_section_addresses ()
          os_start = bfd_section_lma (output_bfd, os);
          s_end    = s_start  + bfd_section_size (output_bfd, s) / opb - 1;
          os_end   = os_start + bfd_section_size (output_bfd, os) / opb - 1;
          os_start = bfd_section_lma (output_bfd, os);
          s_end    = s_start  + bfd_section_size (output_bfd, s) / opb - 1;
          os_end   = os_start + bfd_section_size (output_bfd, os) / opb - 1;

-         
+

          /* Look for an overlap.  */
          if ((s_end < os_start) || (s_start > os_end))
            continue;
          /* Look for an overlap.  */
          if ((s_end < os_start) || (s_start > os_end))
            continue;

-         
+

          einfo (
 _("%X%P: section %s [%V -> %V] overlaps section %s [%V -> %V]\n"),
                 s->name, s_start, s_end, os->name, os_start, os_end);
          einfo (
 _("%X%P: section %s [%V -> %V] overlaps section %s [%V -> %V]\n"),
                 s->name, s_start, s_end, os->name, os_start, os_end);

-         
+

          /* Once we have found one overlap for this section,
             stop looking for others.  */
          break;
          /* Once we have found one overlap for this section,
             stop looking for others.  */
          break;


@@ -2700,43 +2938,38 @@ _("%X%P: section %s [%V -> %V] overlaps section %s [%V -> %V]\n"),
     }
 }
 
     }
 }
 

-/* This variable indicates whether bfd_relax_section should be called
-   again.  */
-
-static boolean relax_again;
-

 /* Make sure the new address is within the region.  We explicitly permit the
    current address to be at the exact end of the region when the address is
    non-zero, in case the region is at the end of addressable memory and the
 /* Make sure the new address is within the region.  We explicitly permit the
    current address to be at the exact end of the region when the address is
    non-zero, in case the region is at the end of addressable memory and the

-   calculation wraps around.  */ 
+   calculation wraps around.  */

 
 static void
 os_region_check (os, region, tree, base)
 
 static void
 os_region_check (os, region, tree, base)

-  lang_output_section_statement_type *os;
-  struct memory_region_struct *region;
-  etree_type *tree;
-  bfd_vma base;
+     lang_output_section_statement_type *os;
+     struct memory_region_struct *region;
+     etree_type *tree;
+     bfd_vma base;

 {
   if ((region->current < region->origin
        || (region->current - region->origin > region->length))
       && ((region->current != region->origin + region->length)
 {
   if ((region->current < region->origin
        || (region->current - region->origin > region->length))
       && ((region->current != region->origin + region->length)

-           || base == 0))
+         || base == 0))

     {
       if (tree != (etree_type *) NULL)
     {
       if (tree != (etree_type *) NULL)

-        {
-          einfo (_("%X%P: address 0x%v of %B section %s is not within region %s\n"),
-                 region->current,
-                 os->bfd_section->owner,
-                 os->bfd_section->name,
-                 region->name);
-        }
+       {
+         einfo (_("%X%P: address 0x%v of %B section %s is not within region %s\n"),
+                region->current,
+                os->bfd_section->owner,
+                os->bfd_section->name,
+                region->name);
+       }

       else
       else

-        {
-          einfo (_("%X%P: region %s is full (%B section %s)\n"),
-                 region->name,
-                 os->bfd_section->owner,
-                 os->bfd_section->name);
-        }
+       {
+         einfo (_("%X%P: region %s is full (%B section %s)\n"),
+                region->name,
+                os->bfd_section->owner,
+                os->bfd_section->name);
+       }

       /* Reset the region pointer.  */
       region->current = region->origin;
     }
       /* Reset the region pointer.  */
       region->current = region->origin;
     }


@@ -2744,28 +2977,31 @@ os_region_check (os, region, tree, base)
 
 /* Set the sizes for all the output sections.  */
 
 
 /* Set the sizes for all the output sections.  */
 

-bfd_vma
-lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
-     lang_statement_union_type * s;
-     lang_output_section_statement_type * output_section_statement;
-     lang_statement_union_type ** prev;
-     fill_type fill;
+static bfd_vma
+lang_size_sections_1 (s, output_section_statement, prev, fill, dot, relax,
+                     check_regions)
+     lang_statement_union_type *s;
+     lang_output_section_statement_type *output_section_statement;
+     lang_statement_union_type **prev;
+     fill_type *fill;

      bfd_vma dot;
      bfd_vma dot;

-     boolean relax;
+     bfd_boolean *relax;
+     bfd_boolean check_regions;

 {
 {

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,

                                                ldfile_output_machine);
 
   /* Size up the sections from their constituent parts.  */
                                                ldfile_output_machine);
 
   /* Size up the sections from their constituent parts.  */

-  for (; s != (lang_statement_union_type *) NULL; s = s->next)
+  for (; s != (lang_statement_union_type *) NULL; s = s->header.next)

     {
       switch (s->header.type)
        {
        case lang_output_section_statement_enum:
          {
            bfd_vma after;
     {
       switch (s->header.type)
        {
        case lang_output_section_statement_enum:
          {
            bfd_vma after;

-           lang_output_section_statement_type *os = &s->output_section_statement;
+           lang_output_section_statement_type *os;

 
 

+           os = &s->output_section_statement;

            if (os->bfd_section == NULL)
              /* This section was never actually created.  */
              break;
            if (os->bfd_section == NULL)
              /* This section was never actually created.  */
              break;


@@ -2776,10 +3012,10 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
               to do this, but nothing simple comes to mind.  */
            if ((os->bfd_section->flags & SEC_COFF_SHARED_LIBRARY) != 0)
              {
               to do this, but nothing simple comes to mind.  */
            if ((os->bfd_section->flags & SEC_COFF_SHARED_LIBRARY) != 0)
              {

-               asection * input;
+               asection *input;

 
                if (os->children.head == NULL
 
                if (os->children.head == NULL

-                   || os->children.head->next != NULL
+                   || os->children.head->header.next != NULL

                    || os->children.head->header.type != lang_input_section_enum)
                  einfo (_("%P%X: Internal error on COFF shared library section %s\n"),
                         os->name);
                    || os->children.head->header.type != lang_input_section_enum)
                  einfo (_("%P%X: Internal error on COFF shared library section %s\n"),
                         os->name);


@@ -2817,22 +3053,28 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
                       defined, issue a warning.  */
                    if ((bfd_get_section_flags (output_bfd, os->bfd_section)
                         & (SEC_ALLOC | SEC_LOAD)) != 0
                       defined, issue a warning.  */
                    if ((bfd_get_section_flags (output_bfd, os->bfd_section)
                         & (SEC_ALLOC | SEC_LOAD)) != 0

+                       && (bfd_get_section_flags (output_bfd, os->bfd_section)
+                           & SEC_NEVER_LOAD) == 0

                        && ! link_info.relocateable
                        && ! link_info.relocateable

+                       && check_regions

                        && strcmp (os->region->name, "*default*") == 0
                        && lang_memory_region_list != NULL
                        && strcmp (os->region->name, "*default*") == 0
                        && lang_memory_region_list != NULL

-                       && (strcmp (lang_memory_region_list->name, "*default*") != 0
+                       && (strcmp (lang_memory_region_list->name,
+                                   "*default*") != 0

                            || lang_memory_region_list->next != NULL))
                      einfo (_("%P: warning: no memory region specified for section `%s'\n"),
                            || lang_memory_region_list->next != NULL))
                      einfo (_("%P: warning: no memory region specified for section `%s'\n"),

-                            bfd_get_section_name (output_bfd, os->bfd_section));
+                            bfd_get_section_name (output_bfd,
+                                                  os->bfd_section));

 
                    dot = os->region->current;
 
                    dot = os->region->current;

- 
+

                    if (os->section_alignment == -1)
                      {
                        bfd_vma olddot;
 
                        olddot = dot;
                    if (os->section_alignment == -1)
                      {
                        bfd_vma olddot;
 
                        olddot = dot;

-                       dot = align_power (dot, os->bfd_section->alignment_power);
+                       dot = align_power (dot,
+                                          os->bfd_section->alignment_power);

 
                        if (dot != olddot && config.warn_section_align)
                          einfo (_("%P: warning: changing start of section %s by %u bytes\n"),
 
                        if (dot != olddot && config.warn_section_align)
                          einfo (_("%P: warning: changing start of section %s by %u bytes\n"),


@@ -2847,14 +3089,13 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
                                       abs_output_section,
                                       lang_allocating_phase_enum,
                                       dot, &dot);
                                       abs_output_section,
                                       lang_allocating_phase_enum,
                                       dot, &dot);

-                   if (r.valid_p == false)
-                     {
-                       einfo (_("%F%S: non constant address expression for section %s\n"),
-                              os->name);
-                     }
+                   if (!r.valid_p)
+                     einfo (_("%F%S: non constant address expression for section %s\n"),
+                            os->name);
+

                    dot = r.value + r.section->bfd_section->vma;
                  }
                    dot = r.value + r.section->bfd_section->vma;
                  }

-               
+

                /* The section starts here.
                   First, align to what the section needs.  */
 
                /* The section starts here.
                   First, align to what the section needs.  */
 


@@ -2862,33 +3103,41 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
                  dot = align_power (dot, os->section_alignment);
 
                bfd_set_section_vma (0, os->bfd_section, dot);
                  dot = align_power (dot, os->section_alignment);
 
                bfd_set_section_vma (0, os->bfd_section, dot);

-               
+

                os->bfd_section->output_offset = 0;
              }
 
                os->bfd_section->output_offset = 0;
              }
 

-           (void) lang_size_sections (os->children.head, os, &os->children.head,
-                                      os->fill, dot, relax);
-           
-            /* put the section within the requested block size, or align at
-               the block boundary */
-           after = ALIGN_N (os->bfd_section->vma
+           lang_size_sections_1 (os->children.head, os, &os->children.head,
+                                 os->fill, dot, relax, check_regions);
+
+           /* Put the section within the requested block size, or
+              align at the block boundary.  */
+           after = align_n (os->bfd_section->vma

                             + os->bfd_section->_raw_size / opb,
                             + os->bfd_section->_raw_size / opb,

-                            /* The coercion here is important, see ld.h.  */

                             (bfd_vma) os->block_value);
 
            if (bfd_is_abs_section (os->bfd_section))
              ASSERT (after == os->bfd_section->vma);
                             (bfd_vma) os->block_value);
 
            if (bfd_is_abs_section (os->bfd_section))
              ASSERT (after == os->bfd_section->vma);

+           else if ((os->bfd_section->flags & SEC_HAS_CONTENTS) == 0
+                    && (os->bfd_section->flags & SEC_THREAD_LOCAL)
+                    && ! link_info.relocateable)
+             os->bfd_section->_raw_size = 0;

            else
            else

-             os->bfd_section->_raw_size = 
-                (after - os->bfd_section->vma) * opb;
+             os->bfd_section->_raw_size =
+               (after - os->bfd_section->vma) * opb;
+

            dot = os->bfd_section->vma + os->bfd_section->_raw_size / opb;
            dot = os->bfd_section->vma + os->bfd_section->_raw_size / opb;

-           os->processed = true;
+           os->processed = TRUE;
+
+           if (os->update_dot_tree != 0)
+             exp_fold_tree (os->update_dot_tree, abs_output_section,
+                            lang_allocating_phase_enum, dot, &dot);

 
            /* Update dot in the region ?
               We only do this if the section is going to be allocated,
               since unallocated sections do not contribute to the region's
               overall size in memory.
 
            /* Update dot in the region ?
               We only do this if the section is going to be allocated,
               since unallocated sections do not contribute to the region's
               overall size in memory.

-              
+

               If the SEC_NEVER_LOAD bit is not set, it will affect the
               addresses of sections after it. We have to update
               dot.  */
               If the SEC_NEVER_LOAD bit is not set, it will affect the
               addresses of sections after it. We have to update
               dot.  */


@@ -2899,60 +3148,51 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
                        & (SEC_ALLOC | SEC_LOAD))))
              {
                os->region->current = dot;
                        & (SEC_ALLOC | SEC_LOAD))))
              {
                os->region->current = dot;

-               
-               /* Make sure the new address is within the region.  */
-                os_region_check (os, os->region, os->addr_tree, 
-                                 os->bfd_section->vma);
-
-                /* if there's no load address specified, use the run region as
-                   the load region */
-                if (os->lma_region == NULL && os->load_base == NULL)
-                    os->lma_region = os->region;
-
-                if (os->lma_region != NULL)
-                  {
-                    if (os->load_base != NULL)
-                      {
-                        einfo (_("%X%P: use an absolute load address or a load memory region, not both\n"));
-                      }
-                    else
-                      {
-                        /* don't allocate twice */
-                        if (os->lma_region != os->region)
-                          {
-                            /* set load_base, which will be handled later */
-                            os->load_base = exp_intop (os->lma_region->current);
-                            os->lma_region->current += 
-                              os->bfd_section->_raw_size / opb;
-                            os_region_check (os, os->lma_region, NULL,
-                                             os->bfd_section->lma);
-                          }
-                      }
-                  }
+
+               if (check_regions)
+                 /* Make sure the new address is within the region.  */
+                 os_region_check (os, os->region, os->addr_tree,
+                                  os->bfd_section->vma);
+
+               /* If there's no load address specified, use the run
+                  region as the load region.  */
+               if (os->lma_region == NULL && os->load_base == NULL)
+                 os->lma_region = os->region;
+
+               if (os->lma_region != NULL && os->lma_region != os->region)
+                 {
+                   /* Set load_base, which will be handled later.  */
+                   os->load_base = exp_intop (os->lma_region->current);
+                   os->lma_region->current +=
+                     os->bfd_section->_raw_size / opb;
+                   if (check_regions)
+                     os_region_check (os, os->lma_region, NULL,
+                                      os->bfd_section->lma);
+                 }

              }
          }
          break;
 
        case lang_constructors_statement_enum:
              }
          }
          break;
 
        case lang_constructors_statement_enum:

-         dot = lang_size_sections (constructor_list.head,
-                                   output_section_statement,
-                                   &s->wild_statement.children.head,
-                                   fill,
-                                   dot, relax);
+         dot = lang_size_sections_1 (constructor_list.head,
+                                     output_section_statement,
+                                     &s->wild_statement.children.head,
+                                     fill, dot, relax, check_regions);

          break;
 
        case lang_data_statement_enum:
          {
            unsigned int size = 0;
 
          break;
 
        case lang_data_statement_enum:
          {
            unsigned int size = 0;
 

-           s->data_statement.output_vma = dot - output_section_statement->bfd_section->vma;
+           s->data_statement.output_vma =
+             dot - output_section_statement->bfd_section->vma;

            s->data_statement.output_section =
              output_section_statement->bfd_section;
 
            switch (s->data_statement.type)
              {
            s->data_statement.output_section =
              output_section_statement->bfd_section;
 
            switch (s->data_statement.type)
              {

-              default:
-                abort();
+             default:
+               abort ();

              case QUAD:
              case SQUAD:
                size = QUAD_SIZE;
              case QUAD:
              case SQUAD:
                size = QUAD_SIZE;


@@ -2967,16 +3207,18 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
                size = BYTE_SIZE;
                break;
              }
                size = BYTE_SIZE;
                break;
              }

-            if (size < opb)
-              size = opb;
+           if (size < opb)
+             size = opb;

            dot += size / opb;
            output_section_statement->bfd_section->_raw_size += size;
            /* The output section gets contents, and then we inspect for
               any flags set in the input script which override any ALLOC.  */
            output_section_statement->bfd_section->flags |= SEC_HAS_CONTENTS;
            dot += size / opb;
            output_section_statement->bfd_section->_raw_size += size;
            /* The output section gets contents, and then we inspect for
               any flags set in the input script which override any ALLOC.  */
            output_section_statement->bfd_section->flags |= SEC_HAS_CONTENTS;

-           if (!(output_section_statement->flags & SEC_NEVER_LOAD)) {
-             output_section_statement->bfd_section->flags |= SEC_ALLOC | SEC_LOAD;
-           }
+           if (!(output_section_statement->flags & SEC_NEVER_LOAD))
+             {
+               output_section_statement->bfd_section->flags |=
+                 SEC_ALLOC | SEC_LOAD;
+             }

          }
          break;
 
          }
          break;
 


@@ -2993,14 +3235,13 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
            output_section_statement->bfd_section->_raw_size += size;
          }
          break;
            output_section_statement->bfd_section->_raw_size += size;
          }
          break;

-     
-       case lang_wild_statement_enum:

 
 

-         dot = lang_size_sections (s->wild_statement.children.head,
-                                   output_section_statement,
-                                   &s->wild_statement.children.head,
+       case lang_wild_statement_enum:

 
 

-                                   fill, dot, relax);
+         dot = lang_size_sections_1 (s->wild_statement.children.head,
+                                     output_section_statement,
+                                     &s->wild_statement.children.head,
+                                     fill, dot, relax, check_regions);

 
          break;
 
 
          break;
 


@@ -3023,23 +3264,22 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
              }
            else
              {
              }
            else
              {

-               boolean again;
+               bfd_boolean again;

 
                if (! bfd_relax_section (i->owner, i, &link_info, &again))
                  einfo (_("%P%F: can't relax section: %E\n"));
                if (again)
 
                if (! bfd_relax_section (i->owner, i, &link_info, &again))
                  einfo (_("%P%F: can't relax section: %E\n"));
                if (again)

-                 relax_again = true;
+                 *relax = TRUE;

              }
              }

-           dot = size_input_section (prev,
-                                     output_section_statement,
-                                     output_section_statement->fill,
-                                     dot, relax);
+           dot = size_input_section (prev, output_section_statement,
+                                     output_section_statement->fill, dot);

          }
          break;
        case lang_input_statement_enum:
          break;
        case lang_fill_statement_enum:
          }
          break;
        case lang_input_statement_enum:
          break;
        case lang_fill_statement_enum:

-         s->fill_statement.output_section = output_section_statement->bfd_section;
+         s->fill_statement.output_section =
+           output_section_statement->bfd_section;

 
          fill = s->fill_statement.fill;
          break;
 
          fill = s->fill_statement.fill;
          break;


@@ -3055,31 +3295,22 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
 
            if (newdot != dot)
              {
 
            if (newdot != dot)
              {

-               /* The assignment changed dot.  Insert a pad.  */

                if (output_section_statement == abs_output_section)
                  {
                    /* If we don't have an output section, then just adjust
                       the default memory address.  */
                    lang_memory_region_lookup ("*default*")->current = newdot;
                  }
                if (output_section_statement == abs_output_section)
                  {
                    /* If we don't have an output section, then just adjust
                       the default memory address.  */
                    lang_memory_region_lookup ("*default*")->current = newdot;
                  }

-               else if (!relax)
+               else

                  {
                  {

-                   lang_statement_union_type *new =
-                     ((lang_statement_union_type *)
-                      stat_alloc (sizeof (lang_padding_statement_type)));
-
-                   /* Link into existing chain.  */
-                   new->header.next = *prev;
-                   *prev = new;
-                   new->header.type = lang_padding_statement_enum;
-                   new->padding_statement.output_section =
-                     output_section_statement->bfd_section;
-                   new->padding_statement.output_offset =
-                     dot - output_section_statement->bfd_section->vma;
-                   new->padding_statement.fill = fill;
-                   new->padding_statement.size = (newdot - dot) * opb;
-                   output_section_statement->bfd_section->_raw_size +=
-                     new->padding_statement.size;
+                   /* Insert a pad after this statement.  We can't
+                      put the pad before when relaxing, in case the
+                      assignment references dot.  */
+                   insert_pad (&s->header.next, fill, (newdot - dot) * opb,
+                               output_section_statement->bfd_section, dot);
+
+                   /* Don't neuter the pad below when relaxing.  */
+                   s = s->header.next;

                  }
 
                dot = newdot;
                  }
 
                dot = newdot;


@@ -3088,31 +3319,34 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
          break;
 
        case lang_padding_statement_enum:
          break;
 
        case lang_padding_statement_enum:

-         /* If we are relaxing, and this is not the first pass, some
-            padding statements may have been inserted during previous
-            passes.  We may have to move the padding statement to a new
-            location if dot has a different value at this point in this
-            pass than it did at this point in the previous pass.  */
-         s->padding_statement.output_offset =
-           dot - output_section_statement->bfd_section->vma;
-         dot += s->padding_statement.size / opb;
-         output_section_statement->bfd_section->_raw_size +=
-           s->padding_statement.size;
+         /* If this is the first time lang_size_sections is called,
+            we won't have any padding statements.  If this is the
+            second or later passes when relaxing, we should allow
+            padding to shrink.  If padding is needed on this pass, it
+            will be added back in.  */
+         s->padding_statement.size = 0;
+
+         /* Make sure output_offset is valid.  If relaxation shrinks
+            the section and this pad isn't needed, it's possible to
+            have output_offset larger than the final size of the
+            section.  bfd_set_section_contents will complain even for
+            a pad size of zero.  */
+         s->padding_statement.output_offset
+           = dot - output_section_statement->bfd_section->vma;

          break;
 
        case lang_group_statement_enum:
          break;
 
        case lang_group_statement_enum:

-         dot = lang_size_sections (s->group_statement.children.head,
-                                   output_section_statement,
-                                   &s->group_statement.children.head,
-                                   fill, dot, relax);
+         dot = lang_size_sections_1 (s->group_statement.children.head,
+                                     output_section_statement,
+                                     &s->group_statement.children.head,
+                                     fill, dot, relax, check_regions);

          break;
 
        default:
          FAIL ();
          break;
 
          break;
 
        default:
          FAIL ();
          break;
 

-         /* This can only get here when relaxing is turned on.  */
-
+         /* We can only get here when relaxing is turned on.  */

        case lang_address_statement_enum:
          break;
        }
        case lang_address_statement_enum:
          break;
        }


@@ -3121,17 +3355,55 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
   return dot;
 }
 
   return dot;
 }
 

+bfd_vma
+lang_size_sections (s, output_section_statement, prev, fill, dot, relax,
+                   check_regions)
+     lang_statement_union_type *s;
+     lang_output_section_statement_type *output_section_statement;
+     lang_statement_union_type **prev;
+     fill_type *fill;
+     bfd_vma dot;
+     bfd_boolean *relax;
+     bfd_boolean check_regions;
+{
+  bfd_vma result;
+
+  exp_data_seg.phase = exp_dataseg_none;
+  result = lang_size_sections_1 (s, output_section_statement, prev, fill,
+                                dot, relax, check_regions);
+  if (exp_data_seg.phase == exp_dataseg_end_seen)
+    {
+      /* If DATA_SEGMENT_ALIGN DATA_SEGMENT_END pair was seen, check whether
+        a page could be saved in the data segment.  */
+      bfd_vma first, last;
+
+      first = -exp_data_seg.base & (exp_data_seg.pagesize - 1);
+      last = exp_data_seg.end & (exp_data_seg.pagesize - 1);
+      if (first && last
+         && ((exp_data_seg.base & ~(exp_data_seg.pagesize - 1))
+             != (exp_data_seg.end & ~(exp_data_seg.pagesize - 1)))
+         && first + last <= exp_data_seg.pagesize)
+       {
+         exp_data_seg.phase = exp_dataseg_adjust;
+         result = lang_size_sections_1 (s, output_section_statement, prev,
+                                        fill, dot, relax, check_regions);
+       }
+    }
+
+  return result;
+}
+

 bfd_vma
 lang_do_assignments (s, output_section_statement, fill, dot)
 bfd_vma
 lang_do_assignments (s, output_section_statement, fill, dot)

-     lang_statement_union_type * s;
-     lang_output_section_statement_type * output_section_statement;
-     fill_type fill;
+     lang_statement_union_type *s;
+     lang_output_section_statement_type *output_section_statement;
+     fill_type *fill;

      bfd_vma dot;
 {
      bfd_vma dot;
 {

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                               ldfile_output_machine); 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,
+                                               ldfile_output_machine);

 
 

-  for (; s != (lang_statement_union_type *) NULL; s = s->next)
+  for (; s != (lang_statement_union_type *) NULL; s = s->header.next)

     {
       switch (s->header.type)
        {
     {
       switch (s->header.type)
        {


@@ -3144,9 +3416,9 @@ lang_do_assignments (s, output_section_statement, fill, dot)
 
        case lang_output_section_statement_enum:
          {
 
        case lang_output_section_statement_enum:
          {

-           lang_output_section_statement_type *os =
-             &(s->output_section_statement);
+           lang_output_section_statement_type *os;

 
 

+           os = &(s->output_section_statement);

            if (os->bfd_section != NULL)
              {
                dot = os->bfd_section->vma;
            if (os->bfd_section != NULL)
              {
                dot = os->bfd_section->vma;


@@ -3155,14 +3427,15 @@ lang_do_assignments (s, output_section_statement, fill, dot)
                dot = os->bfd_section->vma + os->bfd_section->_raw_size / opb;
 
              }
                dot = os->bfd_section->vma + os->bfd_section->_raw_size / opb;
 
              }

-           if (os->load_base) 
+           if (os->load_base)

              {
                /* If nothing has been placed into the output section then
              {
                /* If nothing has been placed into the output section then

-                  it won't have a bfd_section. */
-               if (os->bfd_section) 
+                  it won't have a bfd_section.  */
+               if (os->bfd_section)

                  {
                  {

-                   os->bfd_section->lma 
-                     = exp_get_abs_int(os->load_base, 0,"load base", lang_final_phase_enum);
+                   os->bfd_section->lma
+                     = exp_get_abs_int (os->load_base, 0, "load base",
+                                        lang_final_phase_enum);

                  }
              }
          }
                  }
              }
          }


@@ -3190,33 +3463,33 @@ lang_do_assignments (s, output_section_statement, fill, dot)
                                   abs_output_section,
                                   lang_final_phase_enum, dot, &dot);
            s->data_statement.value = value.value;
                                   abs_output_section,
                                   lang_final_phase_enum, dot, &dot);
            s->data_statement.value = value.value;

-           if (value.valid_p == false)
+           if (!value.valid_p)

              einfo (_("%F%P: invalid data statement\n"));
          }
              einfo (_("%F%P: invalid data statement\n"));
          }

-          {
-            unsigned int size;
-            switch (s->data_statement.type)
-              {
-              default:
-                abort();
-              case QUAD:
-              case SQUAD:
-                size = QUAD_SIZE;
-                break;
-              case LONG:
-                size = LONG_SIZE;
-                break;
-              case SHORT:
-                size = SHORT_SIZE;
-                break;
-              case BYTE:
-                size = BYTE_SIZE;
-                break;
-              }
-            if (size < opb)
-              size = opb;
-            dot += size / opb;
-          }
+         {
+           unsigned int size;
+           switch (s->data_statement.type)
+             {
+             default:
+               abort ();
+             case QUAD:
+             case SQUAD:
+               size = QUAD_SIZE;
+               break;
+             case LONG:
+               size = LONG_SIZE;
+               break;
+             case SHORT:
+               size = SHORT_SIZE;
+               break;
+             case BYTE:
+               size = BYTE_SIZE;
+               break;
+             }
+           if (size < opb)
+             size = opb;
+           dot += size / opb;
+         }

          break;
 
        case lang_reloc_statement_enum:
          break;
 
        case lang_reloc_statement_enum:


@@ -3227,7 +3500,7 @@ lang_do_assignments (s, output_section_statement, fill, dot)
                                   abs_output_section,
                                   lang_final_phase_enum, dot, &dot);
            s->reloc_statement.addend_value = value.value;
                                   abs_output_section,
                                   lang_final_phase_enum, dot, &dot);
            s->reloc_statement.addend_value = value.value;

-           if (value.valid_p == false)
+           if (!value.valid_p)

              einfo (_("%F%P: invalid reloc statement\n"));
          }
          dot += bfd_get_reloc_size (s->reloc_statement.howto) / opb;
              einfo (_("%F%P: invalid reloc statement\n"));
          }
          dot += bfd_get_reloc_size (s->reloc_statement.howto) / opb;


@@ -3306,7 +3579,7 @@ lang_set_startof ()
       buf = xmalloc (10 + strlen (secname));
 
       sprintf (buf, ".startof.%s", secname);
       buf = xmalloc (10 + strlen (secname));
 
       sprintf (buf, ".startof.%s", secname);

-      h = bfd_link_hash_lookup (link_info.hash, buf, false, false, true);
+      h = bfd_link_hash_lookup (link_info.hash, buf, FALSE, FALSE, TRUE);

       if (h != NULL && h->type == bfd_link_hash_undefined)
        {
          h->type = bfd_link_hash_defined;
       if (h != NULL && h->type == bfd_link_hash_undefined)
        {
          h->type = bfd_link_hash_defined;


@@ -3315,11 +3588,13 @@ lang_set_startof ()
        }
 
       sprintf (buf, ".sizeof.%s", secname);
        }
 
       sprintf (buf, ".sizeof.%s", secname);

-      h = bfd_link_hash_lookup (link_info.hash, buf, false, false, true);
+      h = bfd_link_hash_lookup (link_info.hash, buf, FALSE, FALSE, TRUE);

       if (h != NULL && h->type == bfd_link_hash_undefined)
        {
       if (h != NULL && h->type == bfd_link_hash_undefined)
        {

-          unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                                       ldfile_output_machine);
+         unsigned opb;
+
+         opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,
+                                              ldfile_output_machine);

          h->type = bfd_link_hash_defined;
          if (s->_cooked_size != 0)
            h->u.def.value = s->_cooked_size / opb;
          h->type = bfd_link_hash_defined;
          if (s->_cooked_size != 0)
            h->u.def.value = s->_cooked_size / opb;


@@ -3336,22 +3611,23 @@ static void
 lang_finish ()
 {
   struct bfd_link_hash_entry *h;
 lang_finish ()
 {
   struct bfd_link_hash_entry *h;

-  boolean warn;
+  bfd_boolean warn;

 
   if (link_info.relocateable || link_info.shared)
 
   if (link_info.relocateable || link_info.shared)

-    warn = false;
+    warn = FALSE;

   else
   else

-    warn = true;
+    warn = TRUE;

 
 

-  if (entry_symbol == (char *) NULL)
+  if (entry_symbol.name == (const char *) NULL)

     {
       /* No entry has been specified.  Look for start, but don't warn
         if we don't find it.  */
     {
       /* No entry has been specified.  Look for start, but don't warn
         if we don't find it.  */

-      entry_symbol = "start";
-      warn = false;
+      entry_symbol.name = "start";
+      warn = FALSE;

     }
 
     }
 

-  h = bfd_link_hash_lookup (link_info.hash, entry_symbol, false, false, true);
+  h = bfd_link_hash_lookup (link_info.hash, entry_symbol.name,
+                           FALSE, FALSE, TRUE);

   if (h != (struct bfd_link_hash_entry *) NULL
       && (h->type == bfd_link_hash_defined
          || h->type == bfd_link_hash_defweak)
   if (h != (struct bfd_link_hash_entry *) NULL
       && (h->type == bfd_link_hash_defined
          || h->type == bfd_link_hash_defweak)


@@ -3364,16 +3640,16 @@ lang_finish ()
                                    h->u.def.section->output_section)
             + h->u.def.section->output_offset);
       if (! bfd_set_start_address (output_bfd, val))
                                    h->u.def.section->output_section)
             + h->u.def.section->output_offset);
       if (! bfd_set_start_address (output_bfd, val))

-       einfo (_("%P%F:%s: can't set start address\n"), entry_symbol);
+       einfo (_("%P%F:%s: can't set start address\n"), entry_symbol.name);

     }
   else
     {
       bfd_vma val;
     }
   else
     {
       bfd_vma val;

-      CONST char *send;
+      const char *send;

 
       /* We couldn't find the entry symbol.  Try parsing it as a
          number.  */
 
       /* We couldn't find the entry symbol.  Try parsing it as a
          number.  */

-      val = bfd_scan_vma (entry_symbol, &send, 0);
+      val = bfd_scan_vma (entry_symbol.name, &send, 0);

       if (*send == '\0')
        {
          if (! bfd_set_start_address (output_bfd, val))
       if (*send == '\0')
        {
          if (! bfd_set_start_address (output_bfd, val))


@@ -3385,12 +3661,13 @@ lang_finish ()
 
          /* Can't find the entry symbol, and it's not a number.  Use
             the first address in the text section.  */
 
          /* Can't find the entry symbol, and it's not a number.  Use
             the first address in the text section.  */

-         ts = bfd_get_section_by_name (output_bfd, ".text");
+         ts = bfd_get_section_by_name (output_bfd, entry_section);

          if (ts != (asection *) NULL)
            {
              if (warn)
                einfo (_("%P: warning: cannot find entry symbol %s; defaulting to %V\n"),
          if (ts != (asection *) NULL)
            {
              if (warn)
                einfo (_("%P: warning: cannot find entry symbol %s; defaulting to %V\n"),

-                      entry_symbol, bfd_get_section_vma (output_bfd, ts));
+                      entry_symbol.name,
+                      bfd_get_section_vma (output_bfd, ts));

              if (! bfd_set_start_address (output_bfd,
                                           bfd_get_section_vma (output_bfd,
                                                                ts)))
              if (! bfd_set_start_address (output_bfd,
                                           bfd_get_section_vma (output_bfd,
                                                                ts)))


@@ -3400,7 +3677,7 @@ lang_finish ()
            {
              if (warn)
                einfo (_("%P: warning: cannot find entry symbol %s; not setting start address\n"),
            {
              if (warn)
                einfo (_("%P: warning: cannot find entry symbol %s; not setting start address\n"),

-                      entry_symbol);
+                      entry_symbol.name);

            }
        }
     }
            }
        }
     }


@@ -3429,15 +3706,33 @@ lang_check ()
 {
   lang_statement_union_type *file;
   bfd *input_bfd;
 {
   lang_statement_union_type *file;
   bfd *input_bfd;

-  CONST bfd_arch_info_type *compatible;
+  const bfd_arch_info_type *compatible;

 
   for (file = file_chain.head;
        file != (lang_statement_union_type *) NULL;
        file = file->input_statement.next)
     {
       input_bfd = file->input_statement.the_bfd;
 
   for (file = file_chain.head;
        file != (lang_statement_union_type *) NULL;
        file = file->input_statement.next)
     {
       input_bfd = file->input_statement.the_bfd;

-      compatible = bfd_arch_get_compatible (input_bfd,
-                                           output_bfd);
+      compatible = bfd_arch_get_compatible (input_bfd, output_bfd,
+                                           command_line.accept_unknown_input_arch);
+
+      /* In general it is not possible to perform a relocatable
+        link between differing object formats when the input
+        file has relocations, because the relocations in the
+        input format may not have equivalent representations in
+        the output format (and besides BFD does not translate
+        relocs for other link purposes than a final link).  */
+      if ((link_info.relocateable || link_info.emitrelocations)
+         && (compatible == NULL
+             || bfd_get_flavour (input_bfd) != bfd_get_flavour (output_bfd))
+         && (bfd_get_file_flags (input_bfd) & HAS_RELOC) != 0)
+       {
+         einfo (_("%P%F: Relocatable linking with relocations from format %s (%B) to format %s (%B) is not supported\n"),
+                bfd_get_target (input_bfd), input_bfd,
+                bfd_get_target (output_bfd), output_bfd);
+         /* einfo with %F exits.  */
+       }
+

       if (compatible == NULL)
        {
          if (command_line.warn_mismatch)
       if (compatible == NULL)
        {
          if (command_line.warn_mismatch)


@@ -3445,8 +3740,11 @@ lang_check ()
                   bfd_printable_name (input_bfd), input_bfd,
                   bfd_printable_name (output_bfd));
        }
                   bfd_printable_name (input_bfd), input_bfd,
                   bfd_printable_name (output_bfd));
        }

-      else
+      else if (bfd_count_sections (input_bfd))

        {
        {

+         /* If the input bfd has no contents, it shouldn't set the
+            private data of the output bfd.  */
+

          bfd_error_handler_type pfn = NULL;
 
          /* If we aren't supposed to warn about mismatched input
          bfd_error_handler_type pfn = NULL;
 
          /* If we aren't supposed to warn about mismatched input


@@ -3475,6 +3773,8 @@ lang_check ()
 static void
 lang_common ()
 {
 static void
 lang_common ()
 {

+  if (command_line.inhibit_common_definition)
+    return;

   if (link_info.relocateable
       && ! command_line.force_common_definition)
     return;
   if (link_info.relocateable
       && ! command_line.force_common_definition)
     return;


@@ -3493,7 +3793,7 @@ lang_common ()
 
 /* Place one common symbol in the correct section.  */
 
 
 /* Place one common symbol in the correct section.  */
 

-static boolean
+static bfd_boolean

 lang_one_common (h, info)
      struct bfd_link_hash_entry *h;
      PTR info;
 lang_one_common (h, info)
      struct bfd_link_hash_entry *h;
      PTR info;


@@ -3501,24 +3801,24 @@ lang_one_common (h, info)
   unsigned int power_of_two;
   bfd_vma size;
   asection *section;
   unsigned int power_of_two;
   bfd_vma size;
   asection *section;

-  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, 
-                                               ldfile_output_machine); 
+  unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture,
+                                               ldfile_output_machine);

 
   if (h->type != bfd_link_hash_common)
 
   if (h->type != bfd_link_hash_common)

-    return true;
+    return TRUE;

 
   size = h->u.c.size;
   power_of_two = h->u.c.p->alignment_power;
 
   if (config.sort_common
       && power_of_two < (unsigned int) *(int *) info)
 
   size = h->u.c.size;
   power_of_two = h->u.c.p->alignment_power;
 
   if (config.sort_common
       && power_of_two < (unsigned int) *(int *) info)

-    return true;
+    return TRUE;

 
   section = h->u.c.p->section;
 
   /* Increase the size of the section.  */
 
   section = h->u.c.p->section;
 
   /* Increase the size of the section.  */

-  section->_cooked_size = ALIGN_N ((section->_cooked_size + opb - 1) / opb,
-                                  (bfd_size_type) (1 << power_of_two)) * opb;
+  section->_cooked_size = align_n ((section->_cooked_size + opb - 1) / opb,
+                                  (bfd_vma) 1 << power_of_two) * opb;

 
   /* Adjust the alignment if necessary.  */
   if (power_of_two > section->alignment_power)
 
   /* Adjust the alignment if necessary.  */
   if (power_of_two > section->alignment_power)


@@ -3535,11 +3835,11 @@ lang_one_common (h, info)
   /* Make sure the section is allocated in memory, and make sure that
      it is no longer a common section.  */
   section->flags |= SEC_ALLOC;
   /* Make sure the section is allocated in memory, and make sure that
      it is no longer a common section.  */
   section->flags |= SEC_ALLOC;

-  section->flags &= ~ SEC_IS_COMMON;
+  section->flags &= ~SEC_IS_COMMON;

 
   if (config.map_file != NULL)
     {
 
   if (config.map_file != NULL)
     {

-      static boolean header_printed;
+      static bfd_boolean header_printed;

       int len;
       char *name;
       char buf[50];
       int len;
       char *name;
       char buf[50];


@@ -3548,7 +3848,7 @@ lang_one_common (h, info)
        {
          minfo (_("\nAllocating common symbols\n"));
          minfo (_("Common symbol       size              file\n\n"));
        {
          minfo (_("\nAllocating common symbols\n"));
          minfo (_("Common symbol       size              file\n\n"));

-         header_printed = true;
+         header_printed = TRUE;

        }
 
       name = demangle (h->root.string);
        }
 
       name = demangle (h->root.string);


@@ -3584,15 +3884,12 @@ lang_one_common (h, info)
       minfo ("%B\n", section->owner);
     }
 
       minfo ("%B\n", section->owner);
     }
 

-  return true;
+  return TRUE;

 }
 
 }
 

-/*
-run through the input files and ensure that every input
-section has somewhere to go. If one is found without
-a destination then create an input request and place it
-into the statement tree.
-*/
+/* Run through the input files and ensure that every input section has
+   somewhere to go.  If one is found without a destination then create
+   an input request and place it into the statement tree.  */

 
 static void
 lang_place_orphans ()
 
 static void
 lang_place_orphans ()


@@ -3607,16 +3904,12 @@ lang_place_orphans ()
        {
          if (s->output_section == (asection *) NULL)
            {
        {
          if (s->output_section == (asection *) NULL)
            {

-             /* This section of the file is not attatched, root
-                around for a sensible place for it to go */
+             /* This section of the file is not attached, root
+                around for a sensible place for it to go.  */

 
              if (file->just_syms_flag)
                {
 
              if (file->just_syms_flag)
                {

-                 /* We are only retrieving symbol values from this
-                     file.  We want the symbols to act as though the
-                     values in the file are absolute.  */
-                 s->output_section = bfd_abs_section_ptr;
-                 s->output_offset = s->vma;
+                 abort ();

                }
              else if (strcmp (s->name, "COMMON") == 0)
                {
                }
              else if (strcmp (s->name, "COMMON") == 0)
                {


@@ -3638,29 +3931,28 @@ lang_place_orphans ()
                            lang_output_section_statement_lookup (".bss");
 
                        }
                            lang_output_section_statement_lookup (".bss");
 
                        }

-                     wild_doit (&default_common_section->children, s,
-                                default_common_section, file);
+                     lang_add_section (&default_common_section->children, s,
+                                       default_common_section, file);

                    }
                }
              else if (ldemul_place_orphan (file, s))
                ;
              else
                {
                    }
                }
              else if (ldemul_place_orphan (file, s))
                ;
              else
                {

-                 lang_output_section_statement_type *os =
-                 lang_output_section_statement_lookup (s->name);
+                 lang_output_section_statement_type *os;

 
 

-                 wild_doit (&os->children, s, os, file);
+                 os = lang_output_section_statement_lookup (s->name);
+                 lang_add_section (&os->children, s, os, file);

                }
            }
        }
     }
 }
 
                }
            }
        }
     }
 }
 

-

 void
 lang_set_flags (ptr, flags, invert)
      lang_memory_region_type *ptr;
 void
 lang_set_flags (ptr, flags, invert)
      lang_memory_region_type *ptr;

-     CONST char *flags;
+     const char *flags;

      int invert;
 {
   flagword *ptr_flags;
      int invert;
 {
   flagword *ptr_flags;


@@ -3734,11 +4026,11 @@ lang_for_each_file (func)
 
 void
 lang_for_each_input_section (func)
 
 void
 lang_for_each_input_section (func)

-     void (*func) PARAMS ((bfd * ab, asection * as));
+     void (*func) PARAMS ((bfd *ab, asection *as));

 {
   LANG_FOR_EACH_INPUT_STATEMENT (f)
     {
 {
   LANG_FOR_EACH_INPUT_STATEMENT (f)
     {

-      asection * s;
+      asection *s;

 
       for (s = f->the_bfd->sections;
           s != (asection *) NULL;
 
       for (s = f->the_bfd->sections;
           s != (asection *) NULL;


@@ -3753,7 +4045,7 @@ lang_for_each_input_section (func)
 
 void
 ldlang_add_file (entry)
 
 void
 ldlang_add_file (entry)

-     lang_input_statement_type * entry;
+     lang_input_statement_type *entry;

 {
   bfd **pp;
 
 {
   bfd **pp;
 


@@ -3788,18 +4080,17 @@ ldlang_add_file (entry)
 
 void
 lang_add_output (name, from_script)
 
 void
 lang_add_output (name, from_script)

-     CONST char *name;
+     const char *name;

      int from_script;
 {
   /* Make -o on command line override OUTPUT in script.  */
      int from_script;
 {
   /* Make -o on command line override OUTPUT in script.  */

-  if (had_output_filename == false || !from_script)
+  if (!had_output_filename || !from_script)

     {
       output_filename = name;
     {
       output_filename = name;

-      had_output_filename = true;
+      had_output_filename = TRUE;

     }
 }
 
     }
 }
 

-

 static lang_output_section_statement_type *current_section;
 
 static int
 static lang_output_section_statement_type *current_section;
 
 static int


@@ -3812,7 +4103,7 @@ topower (x)
   if (x < 0)
     return -1;
 
   if (x < 0)
     return -1;
 

-  for (l = 0; l < 32; l++) 
+  for (l = 0; l < 32; l++)

     {
       if (i >= (unsigned int) x)
        return l;
     {
       if (i >= (unsigned int) x)
        return l;


@@ -3827,7 +4118,7 @@ lang_enter_output_section_statement (output_section_statement_name,
                                     address_exp, sectype, block_value,
                                     align, subalign, ebase)
      const char *output_section_statement_name;
                                     address_exp, sectype, block_value,
                                     align, subalign, ebase)
      const char *output_section_statement_name;

-     etree_type * address_exp;
+     etree_type *address_exp;

      enum section_type sectype;
      bfd_vma block_value;
      etree_type *align;
      enum section_type sectype;
      bfd_vma block_value;
      etree_type *align;


@@ -3840,19 +4131,17 @@ lang_enter_output_section_statement (output_section_statement_name,
    os =
     lang_output_section_statement_lookup (output_section_statement_name);
 
    os =
     lang_output_section_statement_lookup (output_section_statement_name);
 

+  /* Add this statement to tree.  */
+#if 0
+  add_statement (lang_output_section_statement_enum,
+                output_section_statement);
+#endif
+  /* Make next things chain into subchain of this.  */

 
 

-
-  /* Add this statement to tree */
-  /*  add_statement(lang_output_section_statement_enum,
-      output_section_statement);*/
-  /* Make next things chain into subchain of this */
-
-  if (os->addr_tree ==
-      (etree_type *) NULL)
-  {
-    os->addr_tree =
-     address_exp;
-  }
+  if (os->addr_tree == (etree_type *) NULL)
+    {
+      os->addr_tree = address_exp;
+    }

   os->sectype = sectype;
   if (sectype != noload_section)
     os->flags = SEC_NO_FLAGS;
   os->sectype = sectype;
   if (sectype != noload_section)
     os->flags = SEC_NO_FLAGS;


@@ -3861,19 +4150,15 @@ lang_enter_output_section_statement (output_section_statement_name,
   os->block_value = block_value ? block_value : 1;
   stat_ptr = &os->children;
 
   os->block_value = block_value ? block_value : 1;
   stat_ptr = &os->children;
 

-  os->subsection_alignment = topower(
-   exp_get_value_int(subalign, -1,
-                    "subsection alignment",
-                    0));
-  os->section_alignment = topower(
-   exp_get_value_int(align, -1,
-                    "section alignment", 0));
+  os->subsection_alignment =
+    topower (exp_get_value_int (subalign, -1, "subsection alignment", 0));
+  os->section_alignment =
+    topower (exp_get_value_int (align, -1, "section alignment", 0));

 
   os->load_base = ebase;
   return os;
 }
 
 
   os->load_base = ebase;
   return os;
 }
 

-

 void
 lang_final ()
 {
 void
 lang_final ()
 {


@@ -3883,11 +4168,13 @@ lang_final ()
   new->name = output_filename;
 }
 
   new->name = output_filename;
 }
 

-/* Reset the current counters in the regions */
-static void
-reset_memory_regions ()
+/* Reset the current counters in the regions.  */
+
+void
+lang_reset_memory_regions ()

 {
   lang_memory_region_type *p = lang_memory_region_list;
 {
   lang_memory_region_type *p = lang_memory_region_list;

+  asection *o;

 
   for (p = lang_memory_region_list;
        p != (lang_memory_region_type *) NULL;
 
   for (p = lang_memory_region_list;
        p != (lang_memory_region_type *) NULL;


@@ -3896,50 +4183,47 @@ reset_memory_regions ()
       p->old_length = (bfd_size_type) (p->current - p->origin);
       p->current = p->origin;
     }
       p->old_length = (bfd_size_type) (p->current - p->origin);
       p->current = p->origin;
     }

+
+  for (o = output_bfd->sections; o != NULL; o = o->next)
+    o->_raw_size = 0;

 }
 
 }
 

-/* Expand a wild statement for a particular FILE, marking its sections KEEP
-   as needed.  SECTION may be NULL, in which case it is a wild card.  */
+/* If the wild pattern was marked KEEP, the member sections
+   should be as well.  */

 
 static void
 
 static void

-gc_section_callback (ptr, section, file, data)
+gc_section_callback (ptr, sec, section, file, data)

      lang_wild_statement_type *ptr;
      lang_wild_statement_type *ptr;

+     struct wildcard_list *sec ATTRIBUTE_UNUSED;

      asection *section;
      lang_input_statement_type *file ATTRIBUTE_UNUSED;
      asection *section;
      lang_input_statement_type *file ATTRIBUTE_UNUSED;

-     void *data ATTRIBUTE_UNUSED;
+     PTR data ATTRIBUTE_UNUSED;

 {
 {

-  /* If the wild pattern was marked KEEP, the member sections
-     should be as well.  */

   if (ptr->keep_sections)
     section->flags |= SEC_KEEP;
 }
 
   if (ptr->keep_sections)
     section->flags |= SEC_KEEP;
 }
 

-/* Handle a wild statement, marking it against GC.  SECTION or FILE or both
-   may be NULL, indicating that it is a wildcard.  */
+/* Handle a wild statement, marking it against GC.  */

 
 static void
 
 static void

-lang_gc_wild (s, section, file)
+lang_gc_wild (s)

      lang_wild_statement_type *s;
      lang_wild_statement_type *s;

-     const char *section;
-     const char *file;

 {
 {

-  walk_wild (s, section, file, gc_section_callback, NULL);
+  walk_wild (s, gc_section_callback, NULL);

 }
 
 /* Iterate over sections marking them against GC.  */
 
 static void
 lang_gc_sections_1 (s)
 }
 
 /* Iterate over sections marking them against GC.  */
 
 static void
 lang_gc_sections_1 (s)

-     lang_statement_union_type * s;
+     lang_statement_union_type *s;

 {
 {

-  for (; s != (lang_statement_union_type *) NULL; s = s->next)
+  for (; s != (lang_statement_union_type *) NULL; s = s->header.next)

     {
       switch (s->header.type)
        {
        case lang_wild_statement_enum:
     {
       switch (s->header.type)
        {
        case lang_wild_statement_enum:

-         lang_gc_wild (&s->wild_statement,
-                       s->wild_statement.section_name,
-                       s->wild_statement.filename);
+         lang_gc_wild (&s->wild_statement);

          break;
        case lang_constructors_statement_enum:
          lang_gc_sections_1 (constructor_list.head);
          break;
        case lang_constructors_statement_enum:
          lang_gc_sections_1 (constructor_list.head);


@@ -3960,32 +4244,23 @@ static void
 lang_gc_sections ()
 {
   struct bfd_link_hash_entry *h;
 lang_gc_sections ()
 {
   struct bfd_link_hash_entry *h;

-  ldlang_undef_chain_list_type *ulist, fake_list_start;
+  ldlang_undef_chain_list_type *ulist;

 
   /* Keep all sections so marked in the link script.  */
 
   lang_gc_sections_1 (statement_list.head);
 
 
   /* Keep all sections so marked in the link script.  */
 
   lang_gc_sections_1 (statement_list.head);
 

-  /* Keep all sections containing symbols undefined on the command-line.
-     Handle the entry symbol at the same time.  */
-  
-  if (entry_symbol != NULL)
-    {
-      fake_list_start.next = ldlang_undef_chain_list_head;
-      fake_list_start.name = (char *) entry_symbol;
-      ulist = &fake_list_start;
-    }
-  else
-    ulist = ldlang_undef_chain_list_head;
+  /* Keep all sections containing symbols undefined on the command-line,
+     and the section containing the entry symbol.  */

 
 

-  for (; ulist; ulist = ulist->next)
+  for (ulist = link_info.gc_sym_list; ulist; ulist = ulist->next)

     {
     {

-      h = bfd_link_hash_lookup (link_info.hash, ulist->name, 
-                               false, false, false);
+      h = bfd_link_hash_lookup (link_info.hash, ulist->name,
+                               FALSE, FALSE, FALSE);

 
       if (h != (struct bfd_link_hash_entry *) NULL
 
       if (h != (struct bfd_link_hash_entry *) NULL

-          && (h->type == bfd_link_hash_defined
-              || h->type == bfd_link_hash_defweak)
+         && (h->type == bfd_link_hash_defined
+             || h->type == bfd_link_hash_defweak)

          && ! bfd_is_abs_section (h->u.def.section))
        {
          h->u.def.section->flags |= SEC_KEEP;
          && ! bfd_is_abs_section (h->u.def.section))
        {
          h->u.def.section->flags |= SEC_KEEP;


@@ -4001,18 +4276,23 @@ lang_process ()
   lang_reasonable_defaults ();
   current_target = default_target;
 
   lang_reasonable_defaults ();
   current_target = default_target;
 

-  lang_for_each_statement (ldlang_open_output);        /* Open the output file */
+  /* Open the output file.  */
+  lang_for_each_statement (ldlang_open_output);

 
   ldemul_create_output_section_statements ();
 
 
   ldemul_create_output_section_statements ();
 

-  /* Add to the hash table all undefineds on the command line */
+  /* Add to the hash table all undefineds on the command line.  */

   lang_place_undefineds ();
 
   already_linked_table_init ();
 
   lang_place_undefineds ();
 
   already_linked_table_init ();
 

-  /* Create a bfd for each input file */
+  /* Create a bfd for each input file.  */

   current_target = default_target;
   current_target = default_target;

-  open_input_bfds (statement_list.head, false);
+  open_input_bfds (statement_list.head, FALSE);
+
+  link_info.gc_sym_list = &entry_symbol;
+  if (entry_symbol.name == NULL)
+    link_info.gc_sym_list = ldlang_undef_chain_list_head;

 
   ldemul_after_open ();
 
 
   ldemul_after_open ();
 


@@ -4037,65 +4317,94 @@ lang_process ()
   if (command_line.gc_sections)
     lang_gc_sections ();
 
   if (command_line.gc_sections)
     lang_gc_sections ();
 

-  /* Size up the common data */
+  /* If there were any SEC_MERGE sections, finish their merging, so that
+     section sizes can be computed.  This has to be done after GC of sections,
+     so that GCed sections are not merged, but before assigning output
+     sections, since removing whole input sections is hard then.  */
+  bfd_merge_sections (output_bfd, &link_info);
+
+  /* Size up the common data.  */

   lang_common ();
 
   /* Run through the contours of the script and attach input sections
   lang_common ();
 
   /* Run through the contours of the script and attach input sections

-     to the correct output sections
-     */
+     to the correct output sections.  */

   map_input_to_output_sections (statement_list.head, (char *) NULL,
                                (lang_output_section_statement_type *) NULL);
 
   map_input_to_output_sections (statement_list.head, (char *) NULL,
                                (lang_output_section_statement_type *) NULL);
 

-
-  /* Find any sections not attached explicitly and handle them */
+  /* Find any sections not attached explicitly and handle them.  */

   lang_place_orphans ();
 
   lang_place_orphans ();
 

+  if (! link_info.relocateable)
+    {
+      /* Look for a text section and set the readonly attribute in it.  */
+      asection *found = bfd_get_section_by_name (output_bfd, ".text");
+
+      if (found != (asection *) NULL)
+       {
+         if (config.text_read_only)
+           found->flags |= SEC_READONLY;
+         else
+           found->flags &= ~SEC_READONLY;
+       }
+    }
+
+  /* Do anything special before sizing sections.  This is where ELF
+     and other back-ends size dynamic sections.  */

   ldemul_before_allocation ();
 
   ldemul_before_allocation ();
 

+  if (!link_info.relocateable)
+    strip_excluded_output_sections ();
+

   /* We must record the program headers before we try to fix the
      section positions, since they will affect SIZEOF_HEADERS.  */
   lang_record_phdrs ();
 
   /* We must record the program headers before we try to fix the
      section positions, since they will affect SIZEOF_HEADERS.  */
   lang_record_phdrs ();
 

-  /* Now run around and relax if we can */
+  /* Size up the sections.  */
+  lang_size_sections (statement_list.head,
+                     abs_output_section,
+                     &statement_list.head, 0, (bfd_vma) 0, NULL,
+                     command_line.relax ? FALSE : TRUE);
+
+  /* Now run around and relax if we can.  */

   if (command_line.relax)
     {
   if (command_line.relax)
     {

-      /* First time round is a trial run to get the 'worst case'
-        addresses of the objects if there was no relaxing.  */
-      lang_size_sections (statement_list.head,
-                         abs_output_section,
-                         &(statement_list.head), 0, (bfd_vma) 0, false);
-

       /* Keep relaxing until bfd_relax_section gives up.  */
       /* Keep relaxing until bfd_relax_section gives up.  */

+      bfd_boolean relax_again;
+

       do
        {
       do
        {

-         reset_memory_regions ();
+         lang_reset_memory_regions ();

 
 

-         relax_again = false;
+         relax_again = FALSE;

 
          /* Note: pe-dll.c does something like this also.  If you find
             you need to change this code, you probably need to change
 
          /* Note: pe-dll.c does something like this also.  If you find
             you need to change this code, you probably need to change

-            pe-dll.c also.  DJ */
+            pe-dll.c also.  DJ  */

 
          /* Do all the assignments with our current guesses as to
             section sizes.  */
          lang_do_assignments (statement_list.head,
                               abs_output_section,
 
          /* Do all the assignments with our current guesses as to
             section sizes.  */
          lang_do_assignments (statement_list.head,
                               abs_output_section,

-                              (fill_type) 0, (bfd_vma) 0);
+                              (fill_type *) 0, (bfd_vma) 0);

 
          /* Perform another relax pass - this time we know where the
 
          /* Perform another relax pass - this time we know where the

-            globals are, so can make better guess.  */
+            globals are, so can make a better guess.  */

          lang_size_sections (statement_list.head,
                              abs_output_section,
          lang_size_sections (statement_list.head,
                              abs_output_section,

-                             &(statement_list.head), 0, (bfd_vma) 0, true);
+                             &statement_list.head, 0, (bfd_vma) 0,
+                             &relax_again, FALSE);

        }
       while (relax_again);
        }
       while (relax_again);

-    }
-  else
-    {
-      /* Size up the sections.  */
+
+      /* Final extra sizing to report errors.  */
+      lang_reset_memory_regions ();
+      lang_do_assignments (statement_list.head,
+                          abs_output_section,
+                          (fill_type *) 0, (bfd_vma) 0);

       lang_size_sections (statement_list.head,
                          abs_output_section,
       lang_size_sections (statement_list.head,
                          abs_output_section,

-                         &(statement_list.head), 0, (bfd_vma) 0, false);
+                         & statement_list.head, 0, (bfd_vma) 0, 
+                         NULL, TRUE);

     }
 
   /* See if anything special should be done now we know how big
     }
 
   /* See if anything special should be done now we know how big


@@ -4105,19 +4414,19 @@ lang_process ()
   /* Fix any .startof. or .sizeof. symbols.  */
   lang_set_startof ();
 
   /* Fix any .startof. or .sizeof. symbols.  */
   lang_set_startof ();
 

-  /* Do all the assignments, now that we know the final restingplaces
-     of all the symbols */
+  /* Do all the assignments, now that we know the final resting places
+     of all the symbols.  */

 
   lang_do_assignments (statement_list.head,
                       abs_output_section,
 
   lang_do_assignments (statement_list.head,
                       abs_output_section,

-                      (fill_type) 0, (bfd_vma) 0);
+                      (fill_type *) 0, (bfd_vma) 0);

 
   /* Make sure that the section addresses make sense.  */
   if (! link_info.relocateable
       && command_line.check_section_addresses)
     lang_check_section_addresses ();
 
   /* Make sure that the section addresses make sense.  */
   if (! link_info.relocateable
       && command_line.check_section_addresses)
     lang_check_section_addresses ();

-  
-  /* Final stuffs */
+
+  /* Final stuffs.  */

 
   ldemul_finish ();
   lang_finish ();
 
   ldemul_finish ();
   lang_finish ();


@@ -4126,42 +4435,55 @@ lang_process ()
 /* EXPORTED TO YACC */
 
 void
 /* EXPORTED TO YACC */
 
 void

-lang_add_wild (section_name, sections_sorted, filename, filenames_sorted,
-              keep_sections, exclude_filename_list)
-     const char *const section_name;
-     boolean sections_sorted;
-     const char *const filename;
-     boolean filenames_sorted;
-     boolean keep_sections;
-     struct name_list *exclude_filename_list;
-{
-  lang_wild_statement_type *new = new_stat (lang_wild_statement,
-                                           stat_ptr);
+lang_add_wild (filespec, section_list, keep_sections)
+     struct wildcard_spec *filespec;
+     struct wildcard_list *section_list;
+     bfd_boolean keep_sections;
+{
+  struct wildcard_list *curr, *next;
+  lang_wild_statement_type *new;
+
+  /* Reverse the list as the parser puts it back to front.  */
+  for (curr = section_list, section_list = NULL;
+       curr != NULL;
+       section_list = curr, curr = next)
+    {
+      if (curr->spec.name != NULL && strcmp (curr->spec.name, "COMMON") == 0)
+       placed_commons = TRUE;

 
 

-  if (section_name != (char *) NULL && strcmp (section_name, "COMMON") == 0)
+      next = curr->next;
+      curr->next = section_list;
+    }
+
+  if (filespec != NULL && filespec->name != NULL)

     {
     {

-      placed_commons = true;
+      if (strcmp (filespec->name, "*") == 0)
+       filespec->name = NULL;
+      else if (! wildcardp (filespec->name))
+       lang_has_input_file = TRUE;

     }
     }

-  if (filename != NULL && ! wildcardp (filename))
+
+  new = new_stat (lang_wild_statement, stat_ptr);
+  new->filename = NULL;
+  new->filenames_sorted = FALSE;
+  if (filespec != NULL)

     {
     {

-      lang_has_input_file = true;
+      new->filename = filespec->name;
+      new->filenames_sorted = filespec->sorted;

     }
     }

-  new->section_name = section_name;
-  new->sections_sorted = sections_sorted;
-  new->filename = filename;
-  new->filenames_sorted = filenames_sorted;
+  new->section_list = section_list;

   new->keep_sections = keep_sections;
   new->keep_sections = keep_sections;

-  new->exclude_filename_list = exclude_filename_list;

   lang_list_init (&new->children);
 }
 
 void
 lang_section_start (name, address)
   lang_list_init (&new->children);
 }
 
 void
 lang_section_start (name, address)

-     CONST char *name;
-     etree_type * address;
+     const char *name;
+     etree_type *address;

 {
 {

-  lang_address_statement_type *ad = new_stat (lang_address_statement, stat_ptr);
+  lang_address_statement_type *ad;

 
 

+  ad = new_stat (lang_address_statement, stat_ptr);

   ad->section_name = name;
   ad->address = address;
 }
   ad->section_name = name;
   ad->address = address;
 }


@@ -4173,21 +4495,21 @@ lang_section_start (name, address)
 
 void
 lang_add_entry (name, cmdline)
 
 void
 lang_add_entry (name, cmdline)

-     CONST char *name;
-     boolean cmdline;
+     const char *name;
+     bfd_boolean cmdline;

 {
 {

-  if (entry_symbol == NULL
+  if (entry_symbol.name == NULL

       || cmdline
       || ! entry_from_cmdline)
     {
       || cmdline
       || ! entry_from_cmdline)
     {

-      entry_symbol = name;
+      entry_symbol.name = name;

       entry_from_cmdline = cmdline;
     }
 }
 
 void
 lang_add_target (name)
       entry_from_cmdline = cmdline;
     }
 }
 
 void
 lang_add_target (name)

-     CONST char *name;
+     const char *name;

 {
   lang_target_statement_type *new = new_stat (lang_target_statement,
                                              stat_ptr);
 {
   lang_target_statement_type *new = new_stat (lang_target_statement,
                                              stat_ptr);


@@ -4198,14 +4520,14 @@ lang_add_target (name)
 
 void
 lang_add_map (name)
 
 void
 lang_add_map (name)

-     CONST char *name;
+     const char *name;

 {
   while (*name)
     {
       switch (*name)
        {
 {
   while (*name)
     {
       switch (*name)
        {

-         case 'F':
-         map_option_f = true;
+       case 'F':
+         map_option_f = TRUE;

          break;
        }
       name++;
          break;
        }
       name++;


@@ -4213,13 +4535,13 @@ lang_add_map (name)
 }
 
 void
 }
 
 void

-lang_add_fill (exp)
-     int exp;
+lang_add_fill (fill)
+     fill_type *fill;

 {
   lang_fill_statement_type *new = new_stat (lang_fill_statement,
                                            stat_ptr);
 
 {
   lang_fill_statement_type *new = new_stat (lang_fill_statement,
                                            stat_ptr);
 

-  new->fill = exp;
+  new->fill = fill;

 }
 
 void
 }
 
 void


@@ -4252,7 +4574,7 @@ lang_add_reloc (reloc, howto, section, name, addend)
      union etree_union *addend;
 {
   lang_reloc_statement_type *p = new_stat (lang_reloc_statement, stat_ptr);
      union etree_union *addend;
 {
   lang_reloc_statement_type *p = new_stat (lang_reloc_statement, stat_ptr);

-  
+

   p->reloc = reloc;
   p->howto = howto;
   p->section = section;
   p->reloc = reloc;
   p->howto = howto;
   p->section = section;


@@ -4266,7 +4588,7 @@ lang_add_reloc (reloc, howto, section, name, addend)
 
 lang_assignment_statement_type *
 lang_add_assignment (exp)
 
 lang_assignment_statement_type *
 lang_add_assignment (exp)

-     etree_type * exp;
+     etree_type *exp;

 {
   lang_assignment_statement_type *new = new_stat (lang_assignment_statement,
                                                  stat_ptr);
 {
   lang_assignment_statement_type *new = new_stat (lang_assignment_statement,
                                                  stat_ptr);


@@ -4284,7 +4606,7 @@ lang_add_attribute (attribute)
 
 void
 lang_startup (name)
 
 void
 lang_startup (name)

-     CONST char *name;
+     const char *name;

 {
   if (startup_file != (char *) NULL)
     {
 {
   if (startup_file != (char *) NULL)
     {


@@ -4292,45 +4614,69 @@ lang_startup (name)
     }
   first_file->filename = name;
   first_file->local_sym_name = name;
     }
   first_file->filename = name;
   first_file->local_sym_name = name;

-  first_file->real = true;
+  first_file->real = TRUE;

 
   startup_file = name;
 }
 
 void
 lang_float (maybe)
 
   startup_file = name;
 }
 
 void
 lang_float (maybe)

-     boolean maybe;
+     bfd_boolean maybe;

 {
   lang_float_flag = maybe;
 }
 
 {
   lang_float_flag = maybe;
 }
 

+
+/* Work out the load- and run-time regions from a script statement, and
+   store them in *LMA_REGION and *REGION respectively.
+
+   MEMSPEC is the name of the run-time region, or "*default*" if the
+   statement didn't specify one.  LMA_MEMSPEC is the name of the
+   load-time region, or null if the statement didn't specify one.
+   HAVE_LMA_P is TRUE if the statement had an explicit load address.
+
+   It is an error to specify both a load region and a load address.  */
+
+static void
+lang_get_regions (region, lma_region, memspec, lma_memspec, have_lma_p)
+     struct memory_region_struct **region, **lma_region;
+     const char *memspec, *lma_memspec;
+     int have_lma_p;
+{
+  *lma_region = lang_memory_region_lookup (lma_memspec);
+
+  /* If no runtime region has been given, but the load region has
+     been, use the load region.  */
+  if (lma_memspec != 0 && strcmp (memspec, "*default*") == 0)
+    *region = *lma_region;
+  else
+    *region = lang_memory_region_lookup (memspec);
+
+  if (have_lma_p && lma_memspec != 0)
+    einfo (_("%X%P:%S: section has both a load address and a load region\n"));
+}
+

 void
 lang_leave_output_section_statement (fill, memspec, phdrs, lma_memspec)
 void
 lang_leave_output_section_statement (fill, memspec, phdrs, lma_memspec)

-     bfd_vma fill;
+     fill_type *fill;

      const char *memspec;
      struct lang_output_section_phdr_list *phdrs;
      const char *lma_memspec;
 {
      const char *memspec;
      struct lang_output_section_phdr_list *phdrs;
      const char *lma_memspec;
 {

+  lang_get_regions (&current_section->region,
+                   &current_section->lma_region,
+                   memspec, lma_memspec,
+                   current_section->load_base != 0);

   current_section->fill = fill;
   current_section->fill = fill;

-  current_section->region = lang_memory_region_lookup (memspec);
-  if (strcmp (lma_memspec, "*default*") != 0)
-    {
-      current_section->lma_region = lang_memory_region_lookup (lma_memspec);
-      /* if no runtime region has been given, but the load region has been,
-         use the load region */
-      if (strcmp (memspec, "*default*") == 0)
-        current_section->region = lang_memory_region_lookup (lma_memspec);
-    }

   current_section->phdrs = phdrs;
   stat_ptr = &statement_list;
 }
 
   current_section->phdrs = phdrs;
   stat_ptr = &statement_list;
 }
 

-/*
- Create an absolute symbol with the given name with the value of the
- address of first byte of the section named.
+/* Create an absolute symbol with the given name with the value of the
+   address of first byte of the section named.
+
+   If the symbol already exists, then do nothing.  */

 
 

- If the symbol already exists, then do nothing.
-*/

 void
 lang_abs_symbol_at_beginning_of (secname, name)
      const char *secname;
 void
 lang_abs_symbol_at_beginning_of (secname, name)
      const char *secname;


@@ -4338,7 +4684,7 @@ lang_abs_symbol_at_beginning_of (secname, name)
 {
   struct bfd_link_hash_entry *h;
 
 {
   struct bfd_link_hash_entry *h;
 

-  h = bfd_link_hash_lookup (link_info.hash, name, true, true, true);
+  h = bfd_link_hash_lookup (link_info.hash, name, TRUE, TRUE, TRUE);

   if (h == (struct bfd_link_hash_entry *) NULL)
     einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
 
   if (h == (struct bfd_link_hash_entry *) NULL)
     einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
 


@@ -4359,12 +4705,11 @@ lang_abs_symbol_at_beginning_of (secname, name)
     }
 }
 
     }
 }
 

-/*
- Create an absolute symbol with the given name with the value of the
- address of the first byte after the end of the section named.
+/* Create an absolute symbol with the given name with the value of the
+   address of the first byte after the end of the section named.
+
+   If the symbol already exists, then do nothing.  */

 
 

- If the symbol already exists, then do nothing.
-*/

 void
 lang_abs_symbol_at_end_of (secname, name)
      const char *secname;
 void
 lang_abs_symbol_at_end_of (secname, name)
      const char *secname;


@@ -4372,7 +4717,7 @@ lang_abs_symbol_at_end_of (secname, name)
 {
   struct bfd_link_hash_entry *h;
 
 {
   struct bfd_link_hash_entry *h;
 

-  h = bfd_link_hash_lookup (link_info.hash, name, true, true, true);
+  h = bfd_link_hash_lookup (link_info.hash, name, TRUE, TRUE, TRUE);

   if (h == (struct bfd_link_hash_entry *) NULL)
     einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
 
   if (h == (struct bfd_link_hash_entry *) NULL)
     einfo (_("%P%F: bfd_link_hash_lookup failed: %E\n"));
 


@@ -4397,9 +4742,9 @@ lang_abs_symbol_at_end_of (secname, name)
 
 void
 lang_statement_append (list, element, field)
 
 void
 lang_statement_append (list, element, field)

-     lang_statement_list_type * list;
-     lang_statement_union_type * element;
-     lang_statement_union_type ** field;
+     lang_statement_list_type *list;
+     lang_statement_union_type *element;
+     lang_statement_union_type **field;

 {
   *(list->tail) = element;
   list->tail = field;
 {
   *(list->tail) = element;
   list->tail = field;


@@ -4458,8 +4803,8 @@ void
 lang_new_phdr (name, type, filehdr, phdrs, at, flags)
      const char *name;
      etree_type *type;
 lang_new_phdr (name, type, filehdr, phdrs, at, flags)
      const char *name;
      etree_type *type;

-     boolean filehdr;
-     boolean phdrs;
+     bfd_boolean filehdr;
+     bfd_boolean phdrs;

      etree_type *at;
      etree_type *flags;
 {
      etree_type *at;
      etree_type *flags;
 {


@@ -4538,7 +4883,7 @@ lang_record_phdrs ()
                    }
                  secs[c] = os->bfd_section;
                  ++c;
                    }
                  secs[c] = os->bfd_section;
                  ++c;

-                 pl->used = true;
+                 pl->used = TRUE;

                }
            }
        }
                }
            }
        }


@@ -4556,9 +4901,7 @@ lang_record_phdrs ()
                          lang_final_phase_enum);
 
       if (! bfd_record_phdr (output_bfd, l->type,
                          lang_final_phase_enum);
 
       if (! bfd_record_phdr (output_bfd, l->type,

-                            l->flags == NULL ? false : true,
-                            flags,
-                            l->at == NULL ? false : true,
+                            l->flags != NULL, flags, l->at != NULL,

                             at, l->filehdr, l->phdrs, c, secs))
        einfo (_("%F%P: bfd_record_phdr failed: %E\n"));
     }
                             at, l->filehdr, l->phdrs, c, secs))
        einfo (_("%F%P: bfd_record_phdr failed: %E\n"));
     }


@@ -4598,7 +4941,7 @@ lang_add_nocrossref (l)
   nocrossref_list = n;
 
   /* Set notice_all so that we get informed about all symbols.  */
   nocrossref_list = n;
 
   /* Set notice_all so that we get informed about all symbols.  */

-  link_info.notice_all = true;
+  link_info.notice_all = TRUE;

 }
 \f
 /* Overlay handling.  We handle overlays with some static variables.  */
 }
 \f
 /* Overlay handling.  We handle overlays with some static variables.  */


@@ -4606,19 +4949,12 @@ lang_add_nocrossref (l)
 /* The overlay virtual address.  */
 static etree_type *overlay_vma;
 
 /* The overlay virtual address.  */
 static etree_type *overlay_vma;
 

-/* The overlay load address.  */
-static etree_type *overlay_lma;
-
-/* Whether nocrossrefs is set for this overlay.  */
-static int overlay_nocrossrefs;
-

 /* An expression for the maximum section size seen so far.  */
 static etree_type *overlay_max;
 
 /* A list of all the sections in this overlay.  */
 
 /* An expression for the maximum section size seen so far.  */
 static etree_type *overlay_max;
 
 /* A list of all the sections in this overlay.  */
 

-struct overlay_list
-{
+struct overlay_list {

   struct overlay_list *next;
   lang_output_section_statement_type *os;
 };
   struct overlay_list *next;
   lang_output_section_statement_type *os;
 };


@@ -4628,24 +4964,18 @@ static struct overlay_list *overlay_list;
 /* Start handling an overlay.  */
 
 void
 /* Start handling an overlay.  */
 
 void

-lang_enter_overlay (vma_expr, lma_expr, nocrossrefs)
+lang_enter_overlay (vma_expr)

      etree_type *vma_expr;
      etree_type *vma_expr;

-     etree_type *lma_expr;
-     int nocrossrefs;

 {
   /* The grammar should prevent nested overlays from occurring.  */
 {
   /* The grammar should prevent nested overlays from occurring.  */

-  ASSERT (overlay_vma == NULL
-         && overlay_lma == NULL
-         && overlay_list == NULL
-         && overlay_max == NULL);
+  ASSERT (overlay_vma == NULL && overlay_max == NULL);

 
   overlay_vma = vma_expr;
 
   overlay_vma = vma_expr;

-  overlay_lma = lma_expr;
-  overlay_nocrossrefs = nocrossrefs;

 }
 
 /* Start a section in an overlay.  We handle this by calling
 }
 
 /* Start a section in an overlay.  We handle this by calling

-   lang_enter_output_section_statement with the correct VMA and LMA.  */
+   lang_enter_output_section_statement with the correct VMA.
+   lang_leave_overlay sets up the LMA and memory regions.  */

 
 void
 lang_enter_overlay_section (name)
 
 void
 lang_enter_overlay_section (name)


@@ -4655,16 +4985,13 @@ lang_enter_overlay_section (name)
   etree_type *size;
 
   lang_enter_output_section_statement (name, overlay_vma, normal_section,
   etree_type *size;
 
   lang_enter_output_section_statement (name, overlay_vma, normal_section,

-                                      0, 0, 0, overlay_lma);
+                                      0, 0, 0, 0);

 
 

-  /* If this is the first section, then base the VMA and LMA of future
+  /* If this is the first section, then base the VMA of future

      sections on this one.  This will work correctly even if `.' is
      used in the addresses.  */
   if (overlay_list == NULL)
      sections on this one.  This will work correctly even if `.' is
      used in the addresses.  */
   if (overlay_list == NULL)

-    {
-      overlay_vma = exp_nameop (ADDR, name);
-      overlay_lma = exp_nameop (LOADADDR, name);
-    }
+    overlay_vma = exp_nameop (ADDR, name);

 
   /* Remember the section.  */
   n = (struct overlay_list *) xmalloc (sizeof *n);
 
   /* Remember the section.  */
   n = (struct overlay_list *) xmalloc (sizeof *n);


@@ -4674,9 +5001,6 @@ lang_enter_overlay_section (name)
 
   size = exp_nameop (SIZEOF, name);
 
 
   size = exp_nameop (SIZEOF, name);
 

-  /* Adjust the LMA for the next section.  */
-  overlay_lma = exp_binop ('+', overlay_lma, size);
-

   /* Arrange to work out the maximum section end address.  */
   if (overlay_max == NULL)
     overlay_max = size;
   /* Arrange to work out the maximum section end address.  */
   if (overlay_max == NULL)
     overlay_max = size;


@@ -4689,7 +5013,7 @@ lang_enter_overlay_section (name)
 
 void
 lang_leave_overlay_section (fill, phdrs)
 
 void
 lang_leave_overlay_section (fill, phdrs)

-     bfd_vma fill;
+     fill_type *fill;

      struct lang_output_section_phdr_list *phdrs;
 {
   const char *name;
      struct lang_output_section_phdr_list *phdrs;
 {
   const char *name;


@@ -4699,15 +5023,17 @@ lang_leave_overlay_section (fill, phdrs)
 
   name = current_section->name;
 
 
   name = current_section->name;
 

-  lang_leave_output_section_statement (fill, "*default*", 
-                                       phdrs, "*default*");
+  /* For now, assume that "*default*" is the run-time memory region and
+     that no load-time region has been specified.  It doesn't really
+     matter what we say here, since lang_leave_overlay will override it.  */
+  lang_leave_output_section_statement (fill, "*default*", phdrs, 0);

 
   /* Define the magic symbols.  */
 
   clean = xmalloc (strlen (name) + 1);
   s2 = clean;
   for (s1 = name; *s1 != '\0'; s1++)
 
   /* Define the magic symbols.  */
 
   clean = xmalloc (strlen (name) + 1);
   s2 = clean;
   for (s1 = name; *s1 != '\0'; s1++)

-    if (isalnum ((unsigned char) *s1) || *s1 == '_')
+    if (ISALNUM (*s1) || *s1 == '_')

       *s2++ = *s1;
   *s2 = '\0';
 
       *s2++ = *s1;
   *s2 = '\0';
 


@@ -4730,8 +5056,10 @@ lang_leave_overlay_section (fill, phdrs)
    looks through all the sections in the overlay and sets them.  */
 
 void
    looks through all the sections in the overlay and sets them.  */
 
 void

-lang_leave_overlay (fill, memspec, phdrs, lma_memspec)
-     bfd_vma fill;
+lang_leave_overlay (lma_expr, nocrossrefs, fill, memspec, phdrs, lma_memspec)
+     etree_type *lma_expr;
+     int nocrossrefs;
+     fill_type *fill;

      const char *memspec;
      struct lang_output_section_phdr_list *phdrs;
      const char *lma_memspec;
      const char *memspec;
      struct lang_output_section_phdr_list *phdrs;
      const char *lma_memspec;


@@ -4741,33 +5069,44 @@ lang_leave_overlay (fill, memspec, phdrs, lma_memspec)
   struct overlay_list *l;
   struct lang_nocrossref *nocrossref;
 
   struct overlay_list *l;
   struct lang_nocrossref *nocrossref;
 

-  if (memspec == NULL)
-    region = NULL;
-  else
-    region = lang_memory_region_lookup (memspec);
-
-  if (lma_memspec == NULL)
-    lma_region = NULL;
-  else
-    lma_region = lang_memory_region_lookup (lma_memspec);
+  lang_get_regions (&region, &lma_region,
+                   memspec, lma_memspec,
+                   lma_expr != 0);

 
   nocrossref = NULL;
 
 
   nocrossref = NULL;
 

+  /* After setting the size of the last section, set '.' to end of the
+     overlay region.  */
+  if (overlay_list != NULL)
+    overlay_list->os->update_dot_tree
+      = exp_assop ('=', ".", exp_binop ('+', overlay_vma, overlay_max));
+

   l = overlay_list;
   while (l != NULL)
     {
       struct overlay_list *next;
 
   l = overlay_list;
   while (l != NULL)
     {
       struct overlay_list *next;
 

-      if (fill != 0 && l->os->fill == 0)
+      if (fill != (fill_type *) 0 && l->os->fill == (fill_type *) 0)

        l->os->fill = fill;
        l->os->fill = fill;

-      if (region != NULL && l->os->region == NULL)
-       l->os->region = region;
-      if (lma_region != NULL && l->os->lma_region == NULL)
-        l->os->lma_region = lma_region;
+
+      l->os->region = region;
+      l->os->lma_region = lma_region;
+
+      /* The first section has the load address specified in the
+        OVERLAY statement.  The rest are worked out from that.
+        The base address is not needed (and should be null) if
+        an LMA region was specified.  */
+      if (l->next == 0)
+       l->os->load_base = lma_expr;
+      else if (lma_region == 0)
+       l->os->load_base = exp_binop ('+',
+                                     exp_nameop (LOADADDR, l->next->os->name),
+                                     exp_nameop (SIZEOF, l->next->os->name));
+

       if (phdrs != NULL && l->os->phdrs == NULL)
        l->os->phdrs = phdrs;
 
       if (phdrs != NULL && l->os->phdrs == NULL)
        l->os->phdrs = phdrs;
 

-      if (overlay_nocrossrefs)
+      if (nocrossrefs)

        {
          struct lang_nocrossref *nc;
 
        {
          struct lang_nocrossref *nc;
 


@@ -4785,13 +5124,7 @@ lang_leave_overlay (fill, memspec, phdrs, lma_memspec)
   if (nocrossref != NULL)
     lang_add_nocrossref (nocrossref);
 
   if (nocrossref != NULL)
     lang_add_nocrossref (nocrossref);
 

-  /* Update . for the end of the overlay.  */
-  lang_add_assignment (exp_assop ('=', ".",
-                                 exp_binop ('+', overlay_vma, overlay_max)));
-

   overlay_vma = NULL;
   overlay_vma = NULL;

-  overlay_lma = NULL;
-  overlay_nocrossrefs = 0;

   overlay_list = NULL;
   overlay_max = NULL;
 }
   overlay_list = NULL;
   overlay_max = NULL;
 }


@@ -4823,11 +5156,11 @@ lang_vers_match_lang_cplusplus (expr, sym)
   if (expr->pattern[0] == '*' && expr->pattern[1] == '\0')
     return 1;
 
   if (expr->pattern[0] == '*' && expr->pattern[1] == '\0')
     return 1;
 

-  alt_sym = cplus_demangle(sym, /* DMGL_NO_TPARAMS */ 0);
+  alt_sym = cplus_demangle (sym, /* DMGL_NO_TPARAMS */ 0);

   if (!alt_sym)
     {
       /* cplus_demangle (also) returns NULL when it is not a C++ symbol.
   if (!alt_sym)
     {
       /* cplus_demangle (also) returns NULL when it is not a C++ symbol.

-        Should we early out false in this case?  */
+        Should we early out FALSE in this case?  */

       result = fnmatch (expr->pattern, sym, 0) == 0;
     }
   else
       result = fnmatch (expr->pattern, sym, 0) == 0;
     }
   else


@@ -4850,11 +5183,11 @@ lang_vers_match_lang_java (expr, sym)
   if (expr->pattern[0] == '*' && expr->pattern[1] == '\0')
     return 1;
 
   if (expr->pattern[0] == '*' && expr->pattern[1] == '\0')
     return 1;
 

-  alt_sym = cplus_demangle(sym, DMGL_JAVA);
+  alt_sym = cplus_demangle (sym, DMGL_JAVA);

   if (!alt_sym)
     {
       /* cplus_demangle (also) returns NULL when it is not a Java symbol.
   if (!alt_sym)
     {
       /* cplus_demangle (also) returns NULL when it is not a Java symbol.

-        Should we early out false in this case?  */
+        Should we early out FALSE in this case?  */

       result = fnmatch (expr->pattern, sym, 0) == 0;
     }
   else
       result = fnmatch (expr->pattern, sym, 0) == 0;
     }
   else


@@ -4869,7 +5202,7 @@ lang_vers_match_lang_java (expr, sym)
 /* This is called for each variable name or match expression.  */
 
 struct bfd_elf_version_expr *
 /* This is called for each variable name or match expression.  */
 
 struct bfd_elf_version_expr *

-lang_new_vers_regex (orig, new, lang)
+lang_new_vers_pattern (orig, new, lang)

      struct bfd_elf_version_expr *orig;
      const char *new;
      const char *lang;
      struct bfd_elf_version_expr *orig;
      const char *new;
      const char *lang;


@@ -4879,6 +5212,8 @@ lang_new_vers_regex (orig, new, lang)
   ret = (struct bfd_elf_version_expr *) xmalloc (sizeof *ret);
   ret->next = orig;
   ret->pattern = new;
   ret = (struct bfd_elf_version_expr *) xmalloc (sizeof *ret);
   ret->next = orig;
   ret->pattern = new;

+  ret->symver = 0;
+  ret->script = 0;

 
   if (lang == NULL || strcasecmp (lang, "C") == 0)
     ret->match = lang_vers_match_lang_c;
 
   if (lang == NULL || strcasecmp (lang, "C") == 0)
     ret->match = lang_vers_match_lang_c;


@@ -4893,7 +5228,7 @@ lang_new_vers_regex (orig, new, lang)
       ret->match = lang_vers_match_lang_c;
     }
 
       ret->match = lang_vers_match_lang_c;
     }
 

-  return ret;
+  return ldemul_new_vers_pattern (ret);

 }
 
 /* This is called for each set of variable names and match
 }
 
 /* This is called for each set of variable names and match


@@ -4934,6 +5269,17 @@ lang_register_vers_node (name, version, deps)
   struct bfd_elf_version_tree *t, **pp;
   struct bfd_elf_version_expr *e1;
 
   struct bfd_elf_version_tree *t, **pp;
   struct bfd_elf_version_expr *e1;
 

+  if (name == NULL)
+    name = "";
+
+  if ((name[0] == '\0' && lang_elf_version_info != NULL)
+      || (lang_elf_version_info && lang_elf_version_info->name[0] == '\0'))
+    {
+      einfo (_("%X%P: anonymous version tag cannot be combined with other version tags\n"));
+      free (version);
+      return;
+    }
+

   /* Make sure this node has a unique name.  */
   for (t = lang_elf_version_info; t != NULL; t = t->next)
     if (strcmp (t->name, name) == 0)
   /* Make sure this node has a unique name.  */
   for (t = lang_elf_version_info; t != NULL; t = t->next)
     if (strcmp (t->name, name) == 0)


@@ -4970,8 +5316,13 @@ lang_register_vers_node (name, version, deps)
 
   version->deps = deps;
   version->name = name;
 
   version->deps = deps;
   version->name = name;

-  ++version_index;
-  version->vernum = version_index;
+  if (name[0] != '\0')
+    {
+      ++version_index;
+      version->vernum = version_index;
+    }
+  else
+    version->vernum = 0;

 
   for (pp = &lang_elf_version_info; *pp != NULL; pp = &(*pp)->next)
     ;
 
   for (pp = &lang_elf_version_info; *pp != NULL; pp = &(*pp)->next)
     ;


@@ -5017,17 +5368,17 @@ lang_do_version_exports_section ()
       bfd_size_type len;
 
       if (sec == NULL)
       bfd_size_type len;
 
       if (sec == NULL)

-        continue;
+       continue;

 
       len = bfd_section_size (is->the_bfd, sec);
       contents = xmalloc (len);
       if (!bfd_get_section_contents (is->the_bfd, sec, contents, 0, len))
 
       len = bfd_section_size (is->the_bfd, sec);
       contents = xmalloc (len);
       if (!bfd_get_section_contents (is->the_bfd, sec, contents, 0, len))

-       einfo (_("%X%P: unable to read .exports section contents"), sec);
+       einfo (_("%X%P: unable to read .exports section contents\n"), sec);

 
       p = contents;
 
       p = contents;

-      while (p < contents+len)
+      while (p < contents + len)

        {
        {

-         greg = lang_new_vers_regex (greg, p, NULL);
+         greg = lang_new_vers_pattern (greg, p, NULL);

          p = strchr (p, '\0') + 1;
        }
 
          p = strchr (p, '\0') + 1;
        }
 


@@ -5038,7 +5389,23 @@ lang_do_version_exports_section ()
        bfd_get_section_flags (is->the_bfd, sec) | SEC_EXCLUDE);
     }
 
        bfd_get_section_flags (is->the_bfd, sec) | SEC_EXCLUDE);
     }
 

-  lreg = lang_new_vers_regex (NULL, "*", NULL);
+  lreg = lang_new_vers_pattern (NULL, "*", NULL);

   lang_register_vers_node (command_line.version_exports_section,
                           lang_new_vers_node (greg, lreg), NULL);
 }
   lang_register_vers_node (command_line.version_exports_section,
                           lang_new_vers_node (greg, lreg), NULL);
 }

+
+void
+lang_add_unique (name)
+     const char *name;
+{
+  struct unique_sections *ent;
+
+  for (ent = unique_section_list; ent; ent = ent->next)
+    if (strcmp (ent->name, name) == 0)
+      return;
+
+  ent = (struct unique_sections *) xmalloc (sizeof *ent);
+  ent->name = xstrdup (name);
+  ent->next = unique_section_list;
+  unique_section_list = ent;
+}