Add some shell variables and shell code to elf32.em

to allow elf32.em to be used by ports that require
some minor variations or a few extra functions.
Implement for hppaelf and armelf.
Fix header file include order in m68kcoff.em

10 files changed, 282 insertions, 1666 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e6759ce..9bf466b 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,53 @@
 2000-07-28  Alan Modra  <alan@linuxcare.com.au>
 
+	* emultempl/armelf.em: Elide functions common to elf32.em,
+	ie. most of the file.
+	(arm_elf_after_open): New.  Do arm specific things then call
+	gld${EMULATION_NAME}_after_open.
+	(arm_elf_before_allocation): New.  Call
+	gld${EMULATION_NAME}_before_allocation then do arm specifics.
+	(PARSE_AND_LIST_PROLOGUE): Define.
+	(PARSE_AND_LIST_SHORTOPTS): Define.
+	(PARSE_AND_LIST_LONGOPTS): Define.
+	(PARSE_AND_LIST_OPTIONS): Define.
+	(PARSE_AND_LIST_ARGS_CASES): Define.
+	(LDEMUL_AFTER_OPEN): Define.
+	(LDEMUL_BEFORE_ALLOCATION): Define.
+	(LDEMUL_BEFORE_PARSE): Define.
+	(LDEMUL_FINISH): Define.
+
+	* emultempl/hppaelf.em: Similarly zap most of this file.
+	(hppaelf_add_stub_section): Prototype.
+	(hppaelf_layaout_sections_again): Prototype.
+	(hook_in_stub): Prototype.
+	(LDEMUL_SET_OUTPUT_ARCH): Define.
+	(LDEMUL_FINISH): Define.
+	(LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS): Define.
+
+	* emulparams/armelf.sh (TEMPLATE_NAME): Use elf32.
+	(EXTRA_EM_FILE): New.
+	* emulparams/armelf_linux.sh: Likewise.
+	* emulparams/armelf_linux26.sh: Likewise.
+	* emulparams/hppalinux.sh: Likewise.
+	* emulparams/hppaelf.sh: Likewise.
+	(NOP): Define.
+
+	* emultempl/elf32.em: Fix formatting.
+	(EXTRA_EM_FILE): Source it.
+	(LDEMUL_BEFORE_PARSE, LDEMUL_SYSLIB, LDEMUL_HLL,
+	LDEMUL_AFTER_PARSE, LDEMUL_AFTER_OPEN, LDEMUL_AFTER_ALLOCATION,
+	LDEMUL_SET_OUTPUT_ARCH, LDEMUL_CHOOSE_TARGET,
+	LDEMUL_BEFORE_ALLOCATION, LDEMUL_GET_SCRIPT, LDEMUL_FINISH,
+	LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS,
+	LDEMUL_OPEN_DYNAMIC_ARCHIVE, LDEMUL_PLACE_ORPHAN,
+	LDEMUL_SET_SYMBOLS, LDEMUL_PARSE_ARGS, LDEMUL_UNRECOGNIZED_FILE,
+	LDEMUL_LIST_OPTIONS, LDEMUL_RECOGNIZED_FILE,
+	LDEMUL_FIND_POTENTIAL_LIBRARIES): New shell vars.  Add code to
+	allow functions in this file to be overridden.
+	(PARSE_AND_LIST_SHORTOPTS): Handle it.
+
+	* emultempl/m68kcoff.em: Include ldfile.h before ldemul.h.
+
 	* emultempl/elf32.em: Reorganize file.
 
 2000-07-27  Ivan Kokshaysky  <ink@jurassic.park.msu.ru>
diff --git a/ld/emulparams/armelf.sh b/ld/emulparams/armelf.sh
index 8c79b64..338b9ce 100644
--- a/ld/emulparams/armelf.sh
+++ b/ld/emulparams/armelf.sh
@@ -4,7 +4,8 @@ OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 TEXT_START_ADDR=0x8000
-TEMPLATE_NAME=armelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=armelf
 OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
 OTHER_BSS_SYMBOLS='__bss_start__ = .;'
 OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
diff --git a/ld/emulparams/armelf_linux.sh b/ld/emulparams/armelf_linux.sh
index a85e8bd..c5b963f 100644
--- a/ld/emulparams/armelf_linux.sh
+++ b/ld/emulparams/armelf_linux.sh
@@ -4,7 +4,8 @@ OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 MAXPAGESIZE=0x8000
-TEMPLATE_NAME=armelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=armelf
 GENERATE_SHLIB_SCRIPT=yes
 
 DATA_START_SYMBOLS='__data_start = . ;';
diff --git a/ld/emulparams/armelf_linux26.sh b/ld/emulparams/armelf_linux26.sh
index 36d1b0e..89cd9fb 100644
--- a/ld/emulparams/armelf_linux26.sh
+++ b/ld/emulparams/armelf_linux26.sh
@@ -4,7 +4,8 @@ OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 MAXPAGESIZE=0x8000
-TEMPLATE_NAME=armelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=armelf
 GENERATE_SHLIB_SCRIPT=yes
 
 DATA_START_SYMBOLS='__data_start = . ;';
diff --git a/ld/emulparams/hppaelf.sh b/ld/emulparams/hppaelf.sh
index 2cd06ac..77dcb39 100644
--- a/ld/emulparams/hppaelf.sh
+++ b/ld/emulparams/hppaelf.sh
@@ -3,5 +3,7 @@ OUTPUT_FORMAT="elf32-hppa"
 TEXT_START_ADDR=0x1000
 TARGET_PAGE_SIZE=0x1000
 ARCH=hppa
+NOP=0x08000240
 START="$START$"
-TEMPLATE_NAME=hppaelf
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=hppaelf
diff --git a/ld/emulparams/hppalinux.sh b/ld/emulparams/hppalinux.sh
index e82315f..f270ba6 100644
--- a/ld/emulparams/hppalinux.sh
+++ b/ld/emulparams/hppalinux.sh
@@ -6,5 +6,6 @@ MAXPAGESIZE=0x1000
 ARCH=hppa
 NOP=0x08000240
 START="_start"
-TEMPLATE_NAME=hppaelf
 DATA_START_SYMBOLS='$global$ = .;'
+TEMPLATE_NAME=elf32
+EXTRA_EM_FILE=hppaelf
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 37339cc..3c82bce 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -1,137 +1,32 @@
 # This shell script emits a C file. -*- C -*-
-# It does some substitutions.
-ELFSIZE=32
-cat >e${EMULATION_NAME}.c <<EOF
-/* This file is is generated by a shell script.  DO NOT EDIT! */
-
-/* emulate the original gld for the given ${EMULATION_NAME}
-   Copyright (C) 1991, 93, 96, 97, 98, 99, 2000
-   Free Software Foundation, Inc.
-   Written by Steve Chamberlain steve@cygnus.com
-
-This file is part of GLD, the Gnu Linker.
-
-This program 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 of the License, or
-(at your option) any later version.
-
-This program 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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_IS_${EMULATION_NAME}
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#include <ctype.h>
-
-#include "bfdlink.h"
-#include "getopt.h"
-
-#include "ld.h"
-#include "ldmain.h"
-#include "ldmisc.h"
-
-#include "ldexp.h"
-#include "ldlang.h"
-#include "ldfile.h"
-#include "ldemul.h"
-#include "ldgram.h"
-
-static boolean gld${EMULATION_NAME}_open_dynamic_archive
-  PARAMS ((const char *, search_dirs_type *, lang_input_statement_type *));
-static void gld${EMULATION_NAME}_after_open PARAMS ((void));
-static void gld${EMULATION_NAME}_check_needed
-  PARAMS ((lang_input_statement_type *));
-static void gld${EMULATION_NAME}_stat_needed
-  PARAMS ((lang_input_statement_type *));
-static boolean gld${EMULATION_NAME}_search_needed
-  PARAMS ((const char *, const char *, int));
-static boolean gld${EMULATION_NAME}_try_needed PARAMS ((const char *, int));
-static void gld${EMULATION_NAME}_vercheck
-  PARAMS ((lang_input_statement_type *));
-static void gld${EMULATION_NAME}_find_statement_assignment
-  PARAMS ((lang_statement_union_type *));
-static void gld${EMULATION_NAME}_find_exp_assignment PARAMS ((etree_type *));
-static boolean gld${EMULATION_NAME}_place_orphan
-  PARAMS ((lang_input_statement_type *, asection *));
-static lang_output_section_statement_type *output_rel_find PARAMS ((void));
-static void gld${EMULATION_NAME}_before_parse PARAMS ((void));
-static void gld${EMULATION_NAME}_before_allocation PARAMS ((void));
-static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
-static int  gld${EMULATION_NAME}_parse_args PARAMS((int, char **));
-static void gld${EMULATION_NAME}_list_options PARAMS ((FILE *));
-static void gld${EMULATION_NAME}_finish PARAMS ((void));
+#   Copyright (C) 1991, 93, 96, 97, 98, 99, 2000
+#   Free Software Foundation, Inc.
+#
+# This file is part of GLD, the Gnu Linker.
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+# This file is sourced from elf32.em, and defines extra arm-elf
+# specific routines.
+#
+cat >>e${EMULATION_NAME}.c <<EOF
 
-
 static int no_pipeline_knowledge = 0;
-static char * thumb_entry_symbol = NULL;
-
-#define OPTION_THUMB_ENTRY		301
+static char *thumb_entry_symbol = NULL;
 
-static struct option longopts[] =
-{
-  { "no-pipeline-knowledge", no_argument, NULL, 'p'},
-  { "thumb-entry", required_argument, NULL, OPTION_THUMB_ENTRY},
-  { NULL, no_argument, NULL, 0 }
-};
-
-static void
-gld${EMULATION_NAME}_list_options (file)
-     FILE * file;
-{
-  fprintf (file, _("  -p --no-pipeline-knowledge  Stop the linker knowing about the pipeline length\n"));
-  fprintf (file, _("     --thumb-entry=<sym>      Set the entry point to be Thumb symbol <sym>\n"));
-}
-
-static int
-gld${EMULATION_NAME}_parse_args (argc, argv)
-     int     argc;
-     char ** argv;
-{
-  int        longind;
-  int        optc;
-  int        prevoptind = optind;
-  int        prevopterr = opterr;
-  int        wanterror;
-  static int lastoptind = -1;
-
-  if (lastoptind != optind)
-    opterr = 0;
-  
-  wanterror  = opterr;
-  lastoptind = optind;
-
-  optc   = getopt_long_only (argc, argv, "-p", longopts, & longind);
-  opterr = prevopterr;
-
-  switch (optc)
-    {
-    default:
-      if (wanterror)
-	xexit (1);
-      optind =  prevoptind;
-      return 0;
-
-    case 'p':
-      no_pipeline_knowledge = 1;
-      break;
-
-    case OPTION_THUMB_ENTRY:
-      thumb_entry_symbol = optarg;
-      break;
-    }
-  
-  return 1;
-}
-
 
 static void
 gld${EMULATION_NAME}_before_parse ()
@@ -143,174 +38,12 @@ gld${EMULATION_NAME}_before_parse ()
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo true ; else echo false ; fi`;
 }
 
-/* Try to open a dynamic archive.  This is where we know that ELF
-   dynamic libraries have an extension of .so.  */
-
-static boolean
-gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
-     const char *arch;
-     search_dirs_type *search;
-     lang_input_statement_type *entry;
-{
-  const char *filename;
-  char *string;
-
-  if (! entry->is_archive)
-    return false;
-
-  filename = entry->filename;
-
-  string = (char *) xmalloc (strlen (search->name)
-			     + strlen (filename)
-			     + strlen (arch)
-			     + sizeof "/lib.so");
-
-  sprintf (string, "%s/lib%s%s.so", search->name, filename, arch);
-
-  if (! ldfile_try_open_bfd (string, entry))
-    {
-      free (string);
-      return false;
-    }
-
-  entry->filename = string;
-
-  /* We have found a dynamic object to include in the link.  The ELF
-     backend linker will create a DT_NEEDED entry in the .dynamic
-     section naming this file.  If this file includes a DT_SONAME
-     entry, it will be used.  Otherwise, the ELF linker will just use
-     the name of the file.  For an archive found by searching, like
-     this one, the DT_NEEDED entry should consist of just the name of
-     the file, without the path information used to find it.  Note
-     that we only need to do this if we have a dynamic object; an
-     archive will never be referenced by a DT_NEEDED entry.
-
-     FIXME: This approach--using bfd_elf_set_dt_needed_name--is not
-     very pretty.  I haven't been able to think of anything that is
-     pretty, though.  */
-  if (bfd_check_format (entry->the_bfd, bfd_object)
-      && (entry->the_bfd->flags & DYNAMIC) != 0)
-    {
-      char *needed_name;
-
-      ASSERT (entry->is_archive && entry->search_dirs_flag);
-      needed_name = (char *) xmalloc (strlen (filename)
-				      + strlen (arch)
-				      + sizeof "lib.so");
-      sprintf (needed_name, "lib%s%s.so", filename, arch);
-      bfd_elf_set_dt_needed_name (entry->the_bfd, needed_name);
-    }
-
-  return true;
-}
-
-EOF
-if [ "x${host}" = "x${target}" ] ; then
-  case " ${EMULATION_LIBPATH} " in
-  *" ${EMULATION_NAME} "*)
-cat >>e${EMULATION_NAME}.c <<EOF
-
-/* For a native linker, check the file /etc/ld.so.conf for directories
-   in which we may find shared libraries.  /etc/ld.so.conf is really
-   only meaningful on Linux, but we check it on other systems anyhow.  */
-
-static boolean gld${EMULATION_NAME}_check_ld_so_conf
-  PARAMS ((const char *, int));
-
-static boolean
-gld${EMULATION_NAME}_check_ld_so_conf (name, force)
-     const char *name;
-     int force;
-{
-  static boolean initialized;
-  static char *ld_so_conf;
-
-  if (! initialized)
-    {
-      FILE *f;
-
-      f = fopen ("/etc/ld.so.conf", FOPEN_RT);
-      if (f != NULL)
-	{
-	  char *b;
-	  size_t len, alloc;
-	  int c;
-
-	  len = 0;
-	  alloc = 100;
-	  b = (char *) xmalloc (alloc);
-
-	  while ((c = getc (f)) != EOF)
-	    {
-	      if (len + 1 >= alloc)
-		{
-		  alloc *= 2;
-		  b = (char *) xrealloc (b, alloc);
-		}
-	      if (c != ':'
-		  && c != ' '
-		  && c != '\t'
-		  && c != '\n'
-		  && c != ',')
-		{
-		  b[len] = c;
-		  ++len;
-		}
-	      else
-		{
-		  if (len > 0 && b[len - 1] != ':')
-		    {
-		      b[len] = ':';
-		      ++len;
-		    }
-		}
-	    }
-
-	  if (len > 0 && b[len - 1] == ':')
-	    --len;
-
-	  if (len > 0)
-	    b[len] = '\0';
-	  else
-	    {
-	      free (b);
-	      b = NULL;
-	    }
-
-	  fclose (f);
-
-	  ld_so_conf = b;
-	}
-
-      initialized = true;
-    }
-
-  if (ld_so_conf == NULL)
-    return false;
-
-  return gld${EMULATION_NAME}_search_needed (ld_so_conf, name, force);
-}
-
-EOF
-  ;;
-  esac
-fi
-cat >>e${EMULATION_NAME}.c <<EOF
-
-/* These variables are required to pass information back and forth
-   between after_open and check_needed and stat_needed and vercheck.  */
 
-static struct bfd_link_needed_list *global_needed;
-static struct stat global_stat;
-static boolean global_found;
-static struct bfd_link_needed_list *global_vercheck_needed;
-static boolean global_vercheck_failed;
+static void arm_elf_after_open PARAMS((void));
 
 static void
-gld${EMULATION_NAME}_after_open ()
+arm_elf_after_open ()
 {
-  struct bfd_link_needed_list *needed, *l;
-
   if (strstr (bfd_get_target (output_bfd), "arm") == NULL)
     {
       /* The arm backend needs special fields in the output hash structure.
@@ -330,851 +63,20 @@ gld${EMULATION_NAME}_after_open ()
       }
   }
 
-  /* We only need to worry about this when doing a final link.  */
-  if (link_info.relocateable || link_info.shared)
-    return;
-
-  /* Get the list of files which appear in DT_NEEDED entries in
-     dynamic objects included in the link (often there will be none).
-     For each such file, we want to track down the corresponding
-     library, and include the symbol table in the link.  This is what
-     the runtime dynamic linker will do.  Tracking the files down here
-     permits one dynamic object to include another without requiring
-     special action by the person doing the link.  Note that the
-     needed list can actually grow while we are stepping through this
-     loop.  */
-  needed = bfd_elf_get_needed_list (output_bfd, &link_info);
-  for (l = needed; l != NULL; l = l->next)
-    {
-      struct bfd_link_needed_list *ll;
-      int force;
-
-      /* If we've already seen this file, skip it.  */
-      for (ll = needed; ll != l; ll = ll->next)
-	if (strcmp (ll->name, l->name) == 0)
-	  break;
-      if (ll != l)
-	continue;
-
-      /* See if this file was included in the link explicitly.  */
-      global_needed = l;
-      global_found = false;
-      lang_for_each_input_file (gld${EMULATION_NAME}_check_needed);
-      if (global_found)
-	continue;
-
-      /* We need to find this file and include the symbol table.  We
-	 want to search for the file in the same way that the dynamic
-	 linker will search.  That means that we want to use
-	 rpath_link, rpath, then the environment variable
-	 LD_LIBRARY_PATH (native only), then the linker script
-	 LIB_SEARCH_DIRS.  We do not search using the -L arguments.
-
-	 We search twice.  The first time, we skip objects which may
-	 introduce version mismatches.  The second time, we force
-	 their use.  See gld${EMULATION_NAME}_vercheck comment.  */
-      for (force = 0; force < 2; force++)
-	{
-	  const char *lib_path;
-	  size_t len;
-	  search_dirs_type *search;
-
-	  if (gld${EMULATION_NAME}_search_needed (command_line.rpath_link,
-						  l->name, force))
-	    break;
-	  if (gld${EMULATION_NAME}_search_needed (command_line.rpath,
-						  l->name, force))
-	    break;
-	  if (command_line.rpath_link == NULL
-	      && command_line.rpath == NULL)
-	    {
-	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-	      if (gld${EMULATION_NAME}_search_needed (lib_path, l->name,
-						      force))
-		break;
-	    }
-EOF
-if [ "x${host}" = "x${target}" ] ; then
-  case " ${EMULATION_LIBPATH} " in
-  *" ${EMULATION_NAME} "*)
-cat >>e${EMULATION_NAME}.c <<EOF
-	  lib_path = (const char *) getenv ("LD_LIBRARY_PATH");
-	  if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force))
-	    break;
-EOF
-  ;;
-  esac
-fi
-cat >>e${EMULATION_NAME}.c <<EOF
-	  len = strlen (l->name);
-	  for (search = search_head; search != NULL; search = search->next)
-	    {
-	      char *filename;
-
-	      if (search->cmdline)
-		continue;
-	      filename = (char *) xmalloc (strlen (search->name) + len + 2);
-	      sprintf (filename, "%s/%s", search->name, l->name);
-	      if (gld${EMULATION_NAME}_try_needed (filename, force))
-		break;
-	      free (filename);
-	    }
-	  if (search != NULL)
-	    break;
-EOF
-if [ "x${host}" = "x${target}" ] ; then
-  case " ${EMULATION_LIBPATH} " in
-  *" ${EMULATION_NAME} "*)
-cat >>e${EMULATION_NAME}.c <<EOF
-	  if (gld${EMULATION_NAME}_check_ld_so_conf (l->name, force))
-	    break;
-EOF
-  ;;
-  esac
-fi
-cat >>e${EMULATION_NAME}.c <<EOF
-	}
-
-      if (force < 2)
-	continue;
-
-      einfo ("%P: warning: %s, needed by %B, not found (try using --rpath)\n",
-	     l->name, l->by);
-    }
-}
-
-/* Search for a needed file in a path.  */
-
-static boolean
-gld${EMULATION_NAME}_search_needed (path, name, force)
-     const char *path;
-     const char *name;
-     int force;
-{
-  const char *s;
-  size_t len;
-
-  if (path == NULL || *path == '\0')
-    return false;
-  len = strlen (name);
-  while (1)
-    {
-      char *filename, *sset;
-
-      s = strchr (path, ':');
-      if (s == NULL)
-	s = path + strlen (path);
-
-      filename = (char *) xmalloc (s - path + len + 2);
-      if (s == path)
-	sset = filename;
-      else
-	{
-	  memcpy (filename, path, s - path);
-	  filename[s - path] = '/';
-	  sset = filename + (s - path) + 1;
-	}
-      strcpy (sset, name);
-
-      if (gld${EMULATION_NAME}_try_needed (filename, force))
-	return true;
-
-      free (filename);
-
-      if (*s == '\0')
-	break;
-      path = s + 1;
-    }
-
-  return false;	  
+  /* Call the standard elf routine.  */
+  gld${EMULATION_NAME}_after_open ();
 }
 
-/* This function is called for each possible name for a dynamic object
-   named by a DT_NEEDED entry.  The FORCE parameter indicates whether
-   to skip the check for a conflicting version.  */
 
-static boolean
-gld${EMULATION_NAME}_try_needed (name, force)
-     const char *name;
-     int force;
-{
-  bfd *abfd;
-
-  abfd = bfd_openr (name, bfd_get_target (output_bfd));
-  if (abfd == NULL)
-    return false;
-  if (! bfd_check_format (abfd, bfd_object))
-    {
-      (void) bfd_close (abfd);
-      return false;
-    }
-  if ((bfd_get_file_flags (abfd) & DYNAMIC) == 0)
-    {
-      (void) bfd_close (abfd);
-      return false;
-    }
-
-  /* Check whether this object would include any conflicting library
-     versions.  If FORCE is set, then we skip this check; we use this
-     the second time around, if we couldn't find any compatible
-     instance of the shared library.  */
-
-  if (! force)
-    {
-      struct bfd_link_needed_list *needed;
-
-      if (! bfd_elf_get_bfd_needed_list (abfd, &needed))
-	einfo ("%F%P:%B: bfd_elf_get_bfd_needed_list failed: %E\n", abfd);
-
-      if (needed != NULL)
-	{
-	  global_vercheck_needed = needed;
-	  global_vercheck_failed = false;
-	  lang_for_each_input_file (gld${EMULATION_NAME}_vercheck);
-	  if (global_vercheck_failed)
-	    {
-	      (void) bfd_close (abfd);
-	      /* Return false to force the caller to move on to try
-                 another file on the search path.  */
-	      return false;
-	    }
-
-	  /* But wait!  It gets much worse.  On Linux, if a shared
-             library does not use libc at all, we are supposed to skip
-             it the first time around in case we encounter a shared
-             library later on with the same name which does use the
-             version of libc that we want.  This is much too horrible
-             to use on any system other than Linux.  */
-
-EOF
-case ${target} in
-  *-*-linux-gnu*)
-    cat >>e${EMULATION_NAME}.c <<EOF
-	  {
-	    struct bfd_link_needed_list *l;
-
-	    for (l = needed; l != NULL; l = l->next)
-	      if (strncmp (l->name, "libc.so", 7) == 0)
-		break;
-	    if (l == NULL)
-	      {
-		(void) bfd_close (abfd);
-		return false;
-	      }
-	  }
-
-EOF
-    ;;
-esac
-cat >>e${EMULATION_NAME}.c <<EOF
-	}
-    }
-
-  /* We've found a dynamic object matching the DT_NEEDED entry.  */
-
-  /* We have already checked that there is no other input file of the
-     same name.  We must now check again that we are not including the
-     same file twice.  We need to do this because on many systems
-     libc.so is a symlink to, e.g., libc.so.1.  The SONAME entry will
-     reference libc.so.1.  If we have already included libc.so, we
-     don't want to include libc.so.1 if they are the same file, and we
-     can only check that using stat.  */
-
-  if (bfd_stat (abfd, &global_stat) != 0)
-    einfo ("%F%P:%B: bfd_stat failed: %E\n", abfd);
-  global_found = false;
-  lang_for_each_input_file (gld${EMULATION_NAME}_stat_needed);
-  if (global_found)
-    {
-      /* Return true to indicate that we found the file, even though
-         we aren't going to do anything with it.  */
-      return true;
-    }
-
-  /* Tell the ELF backend that don't want the output file to have a
-     DT_NEEDED entry for this file.  */
-  bfd_elf_set_dt_needed_name (abfd, "");
-
-  /* Add this file into the symbol table.  */
-  if (! bfd_link_add_symbols (abfd, &link_info))
-    einfo ("%F%B: could not read symbols: %E\n", abfd);
-
-  return true;
-}
-
-/* See if an input file matches a DT_NEEDED entry by name.  */
+static void arm_elf_before_allocation PARAMS ((void));
 
 static void
-gld${EMULATION_NAME}_check_needed (s)
-     lang_input_statement_type *s;
+arm_elf_before_allocation ()
 {
-  if (global_found)
-    return;
-
-  if (s->filename != NULL
-      && strcmp (s->filename, global_needed->name) == 0)
-    {
-      global_found = true;
-      return;
-    }
-
-  if (s->the_bfd != NULL)
-    {
-      const char *soname;
-
-      soname = bfd_elf_get_dt_soname (s->the_bfd);
-      if (soname != NULL
-	  && strcmp (soname, global_needed->name) == 0)
-	{
-	  global_found = true;
-	  return;
-	}
-    }
-	  
-  if (s->search_dirs_flag
-      && s->filename != NULL
-      && strchr (global_needed->name, '/') == NULL)
-    {
-      const char *f;
+  /* Call the standard elf routine.  */
+  gld${EMULATION_NAME}_before_allocation ();
 
-      f = strrchr (s->filename, '/');
-      if (f != NULL
-	  && strcmp (f + 1, global_needed->name) == 0)
-	{
-	  global_found = true;
-	  return;
-	}
-    }
-}
-
-/* See if an input file matches a DT_NEEDED entry by running stat on
-   the file.  */
-
-static void
-gld${EMULATION_NAME}_stat_needed (s)
-     lang_input_statement_type *s;
-{
-  struct stat st;
-  const char *suffix;
-  const char *soname;
-  const char *f;
-
-  if (global_found)
-    return;
-  if (s->the_bfd == NULL)
-    return;
-
-  if (bfd_stat (s->the_bfd, &st) != 0)
-    {
-      einfo ("%P:%B: bfd_stat failed: %E\n", s->the_bfd);
-      return;
-    }
-
-  if (st.st_dev == global_stat.st_dev
-      && st.st_ino == global_stat.st_ino)
-    {
-      global_found = true;
-      return;
-    }
-
-  /* We issue a warning if it looks like we are including two
-     different versions of the same shared library.  For example,
-     there may be a problem if -lc picks up libc.so.6 but some other
-     shared library has a DT_NEEDED entry of libc.so.5.  This is a
-     hueristic test, and it will only work if the name looks like
-     NAME.so.VERSION.  FIXME: Depending on file names is error-prone.
-     If we really want to issue warnings about mixing version numbers
-     of shared libraries, we need to find a better way.  */
-
-  if (strchr (global_needed->name, '/') != NULL)
-    return;
-  suffix = strstr (global_needed->name, ".so.");
-  if (suffix == NULL)
-    return;
-  suffix += sizeof ".so." - 1;
-
-  soname = bfd_elf_get_dt_soname (s->the_bfd);
-  if (soname == NULL)
-    soname = s->filename;
-
-  f = strrchr (soname, '/');
-  if (f != NULL)
-    ++f;
-  else
-    f = soname;
-
-  if (strncmp (f, global_needed->name, suffix - global_needed->name) == 0)
-    einfo ("%P: warning: %s, needed by %B, may conflict with %s\n",
-	   global_needed->name, global_needed->by, f);
-}
-
-/* On Linux, it's possible to have different versions of the same
-   shared library linked against different versions of libc.  The
-   dynamic linker somehow tags which libc version to use in
-   /etc/ld.so.cache, and, based on the libc that it sees in the
-   executable, chooses which version of the shared library to use.
-
-   We try to do a similar check here by checking whether this shared
-   library needs any other shared libraries which may conflict with
-   libraries we have already included in the link.  If it does, we
-   skip it, and try to find another shared library farther on down the
-   link path.
-
-   This is called via lang_for_each_input_file.
-   GLOBAL_VERCHECK_NEEDED is the list of objects needed by the object
-   which we ar checking.  This sets GLOBAL_VERCHECK_FAILED if we find
-   a conflicting version.  */
-
-static void
-gld${EMULATION_NAME}_vercheck (s)
-     lang_input_statement_type *s;
-{
-  const char *soname, *f;
-  struct bfd_link_needed_list *l;
-
-  if (global_vercheck_failed)
-    return;
-  if (s->the_bfd == NULL
-      || (bfd_get_file_flags (s->the_bfd) & DYNAMIC) == 0)
-    return;
-
-  soname = bfd_elf_get_dt_soname (s->the_bfd);
-  if (soname == NULL)
-    soname = bfd_get_filename (s->the_bfd);
-
-  f = strrchr (soname, '/');
-  if (f != NULL)
-    ++f;
-  else
-    f = soname;
-
-  for (l = global_vercheck_needed; l != NULL; l = l->next)
-    {
-      const char *suffix;
-
-      if (strcmp (f, l->name) == 0)
-	{
-	  /* Probably can't happen, but it's an easy check.  */
-	  continue;
-	}
-
-      if (strchr (l->name, '/') != NULL)
-	continue;
-
-      suffix = strstr (l->name, ".so.");
-      if (suffix == NULL)
-	continue;
-
-      suffix += sizeof ".so." - 1;
-
-      if (strncmp (f, l->name, suffix - l->name) == 0)
-	{
-	  /* Here we know that S is a dynamic object FOO.SO.VER1, and
-             the object we are considering needs a dynamic object
-             FOO.SO.VER2, and VER1 and VER2 are different.  This
-             appears to be a version mismatch, so we tell the caller
-             to try a different version of this library.  */
-	  global_vercheck_failed = true;
-	  return;
-	}
-    }
-}
-
-/* Place an orphan section.  We use this to put random SHF_ALLOC
-   sections in the right segment.  */
-
-struct orphan_save
-{
-  lang_output_section_statement_type *os;
-  asection **section;
-  lang_statement_union_type **stmt;
-};
-
-/*ARGSUSED*/
-static boolean
-gld${EMULATION_NAME}_place_orphan (file, s)
-     lang_input_statement_type *file;
-     asection *s;
-{
-  static struct orphan_save hold_text;
-  static struct orphan_save hold_rodata;
-  static struct orphan_save hold_data;
-  static struct orphan_save hold_bss;
-  static struct orphan_save hold_rel;
-  static struct orphan_save hold_interp;
-  struct orphan_save *place;
-  lang_statement_list_type *old;
-  lang_statement_list_type add;
-  etree_type *address;
-  const char *secname, *ps;
-  const char *outsecname;
-  lang_output_section_statement_type *os;
-
-  secname = bfd_get_section_name (s->owner, s);
-
-  /* Look through the script to see where to place this section.  */
-  os = lang_output_section_find (secname);
-
-  if (os != NULL
-      && os->bfd_section != NULL
-      && ((s->flags ^ os->bfd_section->flags) & (SEC_LOAD | SEC_ALLOC)) == 0)
-    {
-      /* We have already placed a section with this name.  */
-      wild_doit (&os->children, s, os, file);
-      return true;
-    }
-
-  if (hold_text.os == NULL)
-    hold_text.os = lang_output_section_find (".text");
-
-  /* If this is a final link, then always put .gnu.warning.SYMBOL
-     sections into the .text section to get them out of the way.  */
-  if (! link_info.shared
-      && ! link_info.relocateable
-      && strncmp (secname, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0
-      && hold_text.os != NULL)
-    {
-      wild_doit (&hold_text.os->children, s, hold_text.os, file);
-      return true;
-    }
-
-  /* Decide which segment the section should go in based on the
-     section name and section flags.  We put loadable .note sections
-     right after the .interp section, so that the PT_NOTE segment is
-     stored right after the program headers where the OS can read it
-     in the first page.  */
-#define HAVE_SECTION(hold, name) \
-(hold.os != NULL || (hold.os = lang_output_section_find (name)) != NULL)
-
-  if (s->flags & SEC_EXCLUDE)
-    return false;
-  else if ((s->flags & SEC_ALLOC) == 0)
-    place = NULL;
-  else if ((s->flags & SEC_LOAD) != 0
-	   && strncmp (secname, ".note", 4) == 0
-	   && HAVE_SECTION (hold_interp, ".interp"))
-    place = &hold_interp;
-  else if ((s->flags & SEC_HAS_CONTENTS) == 0
-	   && HAVE_SECTION (hold_bss, ".bss"))
-    place = &hold_bss;
-  else if ((s->flags & SEC_READONLY) == 0
-	   && HAVE_SECTION (hold_data, ".data"))
-    place = &hold_data;
-  else if (strncmp (secname, ".rel", 4) == 0
-	   && (hold_rel.os != NULL
-	       || (hold_rel.os = output_rel_find ()) != NULL))
-    place = &hold_rel;
-  else if ((s->flags & SEC_CODE) == 0
-	   && (s->flags & SEC_READONLY) != 0
-	   && HAVE_SECTION (hold_rodata, ".rodata"))
-    place = &hold_rodata;
-  else if ((s->flags & SEC_READONLY) != 0
-	   && hold_text.os != NULL)
-    place = &hold_text;
-  else
-    place = NULL;
-
-#undef HAVE_SECTION
-
-  /* Choose a unique name for the section.  This will be needed if the
-     same section name appears in the input file with different
-     loadable or allocateable characteristics.  */
-  outsecname = secname;
-  if (bfd_get_section_by_name (output_bfd, outsecname) != NULL)
-    {
-      unsigned int len;
-      char *newname;
-      unsigned int i;
-
-      len = strlen (outsecname);
-      newname = xmalloc (len + 5);
-      strcpy (newname, outsecname);
-      i = 0;
-      do
-	{
-	  sprintf (newname + len, "%d", i);
-	  ++i;
-	}
-      while (bfd_get_section_by_name (output_bfd, newname) != NULL);
-
-      outsecname = newname;
-    }
-
-  if (place != NULL)
-    {
-      /* Start building a list of statements for this section.  */
-      old = stat_ptr;
-      stat_ptr = &add;
-      lang_list_init (stat_ptr);
-
-      /* If the name of the section is representable in C, then create
-	 symbols to mark the start and the end of the section.  */
-      for (ps = outsecname; *ps != '\0'; ps++)
-	if (! isalnum ((unsigned char) *ps) && *ps != '_')
-	  break;
-      if (*ps == '\0' && config.build_constructors)
-	{
-	  char *symname;
-	  etree_type *e_align;
-
-	  symname = (char *) xmalloc (ps - outsecname + sizeof "__start_");
-	  sprintf (symname, "__start_%s", outsecname);
-	  e_align = exp_unop (ALIGN_K,
-			      exp_intop ((bfd_vma) 1 << s->alignment_power));
-	  lang_add_assignment (exp_assop ('=', symname, e_align));
-	}
-    }
-
-  if (link_info.relocateable || (s->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
-    address = exp_intop ((bfd_vma) 0);
-  else
-    address = NULL;
-
-  os = lang_enter_output_section_statement (outsecname, address, 0,
-					    (bfd_vma) 0,
-					    (etree_type *) NULL,
-					    (etree_type *) NULL,
-					    (etree_type *) NULL);
-
-  wild_doit (&os->children, s, os, file);
-
-  lang_leave_output_section_statement
-    ((bfd_vma) 0, "*default*",
-     (struct lang_output_section_phdr_list *) NULL, "*default*");
-
-  if (place != NULL)
-    {
-      asection *snew, **pps;
-
-      stat_ptr = &add;
-
-      if (*ps == '\0' && config.build_constructors)
-	{
-	  char *symname;
-
-	  symname = (char *) xmalloc (ps - outsecname + sizeof "__stop_");
-	  sprintf (symname, "__stop_%s", outsecname);
-	  lang_add_assignment (exp_assop ('=', symname,
-					  exp_nameop (NAME, ".")));
-	}
-      stat_ptr = old;
-
-      snew = os->bfd_section;
-      if (place->os->bfd_section != NULL || place->section != NULL)
-	{
-	  /* Shuffle the section to make the output file look neater.  */
-	  if (place->section == NULL)
-	    {
-#if 0
-	      /* Finding the end of the list is a little tricky.  We
-		 make a wild stab at it by comparing section flags.  */
-	      flagword first_flags = place->os->bfd_section->flags;
-	      for (pps = &place->os->bfd_section->next;
-		   *pps != NULL && (*pps)->flags == first_flags;
-		   pps = &(*pps)->next)
-		;
-	      place->section = pps;
-#else
-	      /* Put orphans after the first section on the list.  */
-	      place->section = &place->os->bfd_section->next;
-#endif
-	    }
-
-	  /*  Unlink the section.  */
-	  for (pps = &output_bfd->sections; *pps != snew; pps = &(*pps)->next)
-	    ;
-	  *pps = snew->next;
-
-	  /* Now tack it on to the "place->os" section list.  */
-	  snew->next = *place->section;
-	  *place->section = snew;
-	}
-      place->section = &snew->next;	/* Save the end of this list.  */
-
-      if (place->stmt == NULL)
-	{
-	  /* Put the new statement list right at the head.  */
-	  *add.tail = place->os->header.next;
-	  place->os->header.next = add.head;
-	}
-      else
-	{
-	  /* Put it after the last orphan statement we added.  */
-	  *add.tail = *place->stmt;
-	  *place->stmt = add.head;
-	}
-      place->stmt = add.tail;		/* Save the end of this list.  */
-    }
-
-  return true;
-}
-
-/* A variant of lang_output_section_find.  */
-static lang_output_section_statement_type *
-output_rel_find ()
-{
-  lang_statement_union_type *u;
-  lang_output_section_statement_type *lookup;
-
-  for (u = lang_output_section_statement.head;
-       u != (lang_statement_union_type *) NULL;
-       u = lookup->next)
-    {
-      lookup = &u->output_section_statement;
-      if (strncmp (".rel", lookup->name, 4) == 0
-	  && lookup->bfd_section != NULL
-	  && (lookup->bfd_section->flags & SEC_ALLOC) != 0)
-	{
-	  return lookup;
-	}
-    }
-  return (lang_output_section_statement_type *) NULL;
-}
-
-/* Look through an expression for an assignment statement.  */
-
-static void
-gld${EMULATION_NAME}_find_exp_assignment (exp)
-     etree_type *exp;
-{
-  struct bfd_link_hash_entry *h;
-
-  switch (exp->type.node_class)
-    {
-    case etree_provide:
-      h = bfd_link_hash_lookup (link_info.hash, exp->assign.dst,
-				false, false, false);
-      if (h == NULL)
-	break;
-
-      /* We call record_link_assignment even if the symbol is defined.
-	 This is because if it is defined by a dynamic object, we
-	 actually want to use the value defined by the linker script,
-	 not the value from the dynamic object (because we are setting
-	 symbols like etext).  If the symbol is defined by a regular
-	 object, then, as it happens, calling record_link_assignment
-	 will do no harm.  */
-
-      /* Fall through.  */
-    case etree_assign:
-      if (strcmp (exp->assign.dst, ".") != 0)
-	{
-	  if (! (bfd_elf${ELFSIZE}_record_link_assignment
-		 (output_bfd, &link_info, exp->assign.dst,
-		  exp->type.node_class == etree_provide ? true : false)))
-	    einfo ("%P%F: failed to record assignment to %s: %E\n",
-		   exp->assign.dst);
-	}
-      gld${EMULATION_NAME}_find_exp_assignment (exp->assign.src);
-      break;
-
-    case etree_binary:
-      gld${EMULATION_NAME}_find_exp_assignment (exp->binary.lhs);
-      gld${EMULATION_NAME}_find_exp_assignment (exp->binary.rhs);
-      break;
-
-    case etree_trinary:
-      gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.cond);
-      gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.lhs);
-      gld${EMULATION_NAME}_find_exp_assignment (exp->trinary.rhs);
-      break;
-
-    case etree_unary:
-      gld${EMULATION_NAME}_find_exp_assignment (exp->unary.child);
-      break;
-
-    default:
-      break;
-    }
-}
-
-/* This is called by the before_allocation routine via
-   lang_for_each_statement.  It locates any assignment statements, and
-   tells the ELF backend about them, in case they are assignments to
-   symbols which are referred to by dynamic objects.  */
-
-static void
-gld${EMULATION_NAME}_find_statement_assignment (s)
-     lang_statement_union_type *s;
-{
-  if (s->header.type == lang_assignment_statement_enum)
-    gld${EMULATION_NAME}_find_exp_assignment (s->assignment_statement.exp);
-}
-
-/* This is called after the sections have been attached to output
-   sections, but before any sizes or addresses have been set.  */
-
-static void
-gld${EMULATION_NAME}_before_allocation ()
-{
-  const char *rpath;
-  asection *sinterp;
-
-  /* If we are going to make any variable assignments, we need to let
-     the ELF backend know about them in case the variables are
-     referred to by dynamic objects.  */
-  lang_for_each_statement (gld${EMULATION_NAME}_find_statement_assignment);
-
-  /* Let the ELF backend work out the sizes of any sections required
-     by dynamic linking.  */
-  rpath = command_line.rpath;
-  if (rpath == NULL)
-    rpath = (const char *) getenv ("LD_RUN_PATH");
-  if (! (bfd_elf${ELFSIZE}_size_dynamic_sections
-         (output_bfd, command_line.soname, rpath,
-	  command_line.export_dynamic, command_line.filter_shlib,
-	  (const char * const *) command_line.auxiliary_filters,
-	  &link_info, &sinterp, lang_elf_version_info)))
-    einfo ("%P%F: failed to set dynamic section sizes: %E\n");
-
-  /* Let the user override the dynamic linker we are using.  */
-  if (command_line.interpreter != NULL
-      && sinterp != NULL)
-    {
-      sinterp->contents = (bfd_byte *) command_line.interpreter;
-      sinterp->_raw_size = strlen (command_line.interpreter) + 1;
-    }
-
-  /* Look for any sections named .gnu.warning.  As a GNU extensions,
-     we treat such sections as containing warning messages.  We print
-     out the warning message, and then zero out the section size so
-     that it does not get copied into the output file.  */
-
-  {
-    LANG_FOR_EACH_INPUT_STATEMENT (is)
-      {
-	asection *s;
-	bfd_size_type sz;
-	char *msg;
-	boolean ret;
-
-	if (is->just_syms_flag)
-	  continue;
-
-	s = bfd_get_section_by_name (is->the_bfd, ".gnu.warning");
-	if (s == NULL)
-	  continue;
-
-	sz = bfd_section_size (is->the_bfd, s);
-	msg = xmalloc ((size_t) sz + 1);
-	if (! bfd_get_section_contents (is->the_bfd, s, msg, (file_ptr) 0, sz))
-	  einfo ("%F%B: Can't read contents of section .gnu.warning: %E\n",
-		 is->the_bfd);
-	msg[sz] = '\0';
-	ret = link_info.callbacks->warning (&link_info, msg,
-					    (const char *) NULL,
-					    is->the_bfd, (asection *) NULL,
-					    (bfd_vma) 0);
-	ASSERT (ret);
-	free (msg);
-
-	/* Clobber the section size, so that we don't waste copying the
-	   warning into the output file.  */
-	s->_raw_size = 0;
-      }
-  }
-
-  /* we should be able to set the size of the interworking stub section */
+  /* We should be able to set the size of the interworking stub section */
 
   /* Here we rummage through the found bfds to collect glue information */
   /* FIXME: should this be based on a command line option? krk@cygnus.com */
@@ -1194,6 +96,9 @@ gld${EMULATION_NAME}_before_allocation ()
   bfd_elf32_arm_allocate_interworking_sections (& link_info);
 }
 
+
+static void gld${EMULATION_NAME}_finish PARAMS ((void));
+
 static void
 gld${EMULATION_NAME}_finish PARAMS((void))
 {
@@ -1202,7 +107,8 @@ gld${EMULATION_NAME}_finish PARAMS((void))
   if (thumb_entry_symbol == NULL)
     return;
   
-  h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol, false, false, true);
+  h = bfd_link_hash_lookup (link_info.hash, thumb_entry_symbol,
+			    false, false, true);
 
   if (h != (struct bfd_link_hash_entry *) NULL
       && (h->type == bfd_link_hash_defined
@@ -1234,92 +140,48 @@ gld${EMULATION_NAME}_finish PARAMS((void))
       entry_symbol = buffer;
     }
   else
-    einfo (_("%P: warning: connot find thumb start symbol %s\n"), thumb_entry_symbol);
+    einfo (_("%P: warning: connot find thumb start symbol %s\n"),
+	   thumb_entry_symbol);
 }
 
-static char *
-gld${EMULATION_NAME}_get_script (isfile)
-     int *isfile;
 EOF
 
-if test -n "$COMPILE_IN"
-then
-# Scripts compiled in.
+# Define some shell vars to insert bits of code into the standard elf
+# parse_args and list_options functions.
+#
+PARSE_AND_LIST_PROLOGUE='
+#define OPTION_THUMB_ENTRY		301
+'
 
-# sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
+PARSE_AND_LIST_SHORTOPTS=p
 
-cat >>e${EMULATION_NAME}.c <<EOF
-{			     
-  *isfile = 0;
-
-  if (link_info.relocateable == true && config.build_constructors == true)
-    return
-EOF
-sed $sc ldscripts/${EMULATION_NAME}.xu                     >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocateable == true) return' >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xr                     >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.text_read_only) return'         >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xbn                    >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.magic_demand_paged) return'     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xn                     >> e${EMULATION_NAME}.c
-if test -n "$GENERATE_SHLIB_SCRIPT" ; then
-        echo '  ; else if (link_info.shared) return'       >> e${EMULATION_NAME}.c
-        sed $sc ldscripts/${EMULATION_NAME}.xs             >> e${EMULATION_NAME}.c
-fi
-echo '  ; else return'                                     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.x                      >> e${EMULATION_NAME}.c
-echo '; }'                                                 >> e${EMULATION_NAME}.c
+PARSE_AND_LIST_LONGOPTS='
+  { "no-pipeline-knowledge", no_argument, NULL, '\'p\''},
+  { "thumb-entry", required_argument, NULL, OPTION_THUMB_ENTRY},
+'
 
-else
-# Scripts read from the filesystem.
+PARSE_AND_LIST_OPTIONS='
+  fprintf (file, _("  -p --no-pipeline-knowledge  Stop the linker knowing about the pipeline length\n"));
+  fprintf (file, _("     --thumb-entry=<sym>      Set the entry point to be Thumb symbol <sym>\n"));
+'
 
-cat >>e${EMULATION_NAME}.c <<EOF
-{			     
-  *isfile = 1;
+PARSE_AND_LIST_ARGS_CASES='
+    case '\'p\'':
+      no_pipeline_knowledge = 1;
+      break;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
-    return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable == true)
-    return "ldscripts/${EMULATION_NAME}.xr";
-  else if (!config.text_read_only)
-    return "ldscripts/${EMULATION_NAME}.xbn";
-  else if (!config.magic_demand_paged)
-    return "ldscripts/${EMULATION_NAME}.xn";
-  else if (link_info.shared)
-    return "ldscripts/${EMULATION_NAME}.xs";
-  else
-    return "ldscripts/${EMULATION_NAME}.x";
-}
-EOF
+    case OPTION_THUMB_ENTRY:
+      thumb_entry_symbol = optarg;
+      break;
+'
 
-fi
+# We have our own after_open and before_allocation functions, but they call
+# the standard routines, so give them a different name.
+LDEMUL_AFTER_OPEN=arm_elf_after_open
+LDEMUL_BEFORE_ALLOCATION=arm_elf_before_allocation
 
-cat >>e${EMULATION_NAME}.c <<EOF
+# Replace the elf before_parse function with our own.
+LDEMUL_BEFORE_PARSE=gld"${EMULATION_NAME}"_before_parse
 
-struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation = 
-{
-  gld${EMULATION_NAME}_before_parse,
-  syslib_default,
-  hll_default,
-  after_parse_default,
-  gld${EMULATION_NAME}_after_open,
-  after_allocation_default,
-  set_output_arch_default,
-  ldemul_default_target,
-  gld${EMULATION_NAME}_before_allocation,
-  gld${EMULATION_NAME}_get_script,
-  "${EMULATION_NAME}",
-  "${OUTPUT_FORMAT}",
-  gld${EMULATION_NAME}_finish,
-  NULL,	/* create output section statements */
-  gld${EMULATION_NAME}_open_dynamic_archive,
-  gld${EMULATION_NAME}_place_orphan,
-  NULL,	/* set symbols */
-  gld${EMULATION_NAME}_parse_args,
-  NULL,	/* unrecognized file */
-  gld${EMULATION_NAME}_list_options,
-  NULL,	/* recognized file */
-  NULL 	/* find_potential_libraries */
-};
-EOF
+# Call the extra arm-elf function
+LDEMUL_FINISH=gld${EMULATION_NAME}_finish
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index f1e23fd..33004be 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -69,14 +69,35 @@ static boolean gld${EMULATION_NAME}_place_orphan
   PARAMS ((lang_input_statement_type *, asection *));
 static char *gld${EMULATION_NAME}_get_script PARAMS ((int *isfile));
 
+EOF
+
+# Import any needed special functions and/or overrides.
+#
+if test -n "$EXTRA_EM_FILE" ; then
+. ${srcdir}/emultempl/${EXTRA_EM_FILE}.em
+fi
+
+# Functions in this file can be overriden by setting the LDEMUL_* shell
+# variables.  If the name of the overriding function is the same as is
+# defined in this file, then don't output this file's version.
+# If a different overriding name is given then output the standard function
+# as presumably it is called from the overriding function.
+#
+if test x"$LDEMUL_BEFORE_PARSE" != xgld"$EMULATION_NAME"_before_parse; then
+cat >>e${EMULATION_NAME}.c <<EOF
+
 static void
-gld${EMULATION_NAME}_before_parse()
+gld${EMULATION_NAME}_before_parse ()
 {
   ldfile_output_architecture = bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`;
   config.dynamic_link = ${DYNAMIC_LINK-true};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo true ; else echo false ; fi`;
 }
 
+EOF
+fi
+
+cat >>e${EMULATION_NAME}.c <<EOF
 
 /* These variables are required to pass information back and forth
    between after_open and check_needed and stat_needed and vercheck.  */
@@ -325,7 +346,7 @@ cat >>e${EMULATION_NAME}.c <<EOF
       return true;
     }
 
-  /* Tell the ELF backend that don't want the output file to have a
+  /* Tell the ELF backend that we don't want the output file to have a
      DT_NEEDED entry for this file.  */
   bfd_elf_set_dt_needed_name (abfd, "");
 
@@ -533,6 +554,10 @@ gld${EMULATION_NAME}_check_needed (s)
     }
 }
 
+EOF
+
+if test x"$LDEMUL_AFTER_OPEN" != xgld"$EMULATION_NAME"_after_open; then
+cat >>e${EMULATION_NAME}.c <<EOF
 
 /* This is called after all the input files have been opened.  */
 
@@ -654,6 +679,10 @@ cat >>e${EMULATION_NAME}.c <<EOF
     }
 }
 
+EOF
+fi
+
+cat >>e${EMULATION_NAME}.c <<EOF
 
 /* Look through an expression for an assignment statement.  */
 
@@ -726,6 +755,10 @@ gld${EMULATION_NAME}_find_statement_assignment (s)
     gld${EMULATION_NAME}_find_exp_assignment (s->assignment_statement.exp);
 }
 
+EOF
+
+if test x"$LDEMUL_BEFORE_ALLOCATION" != xgld"$EMULATION_NAME"_before_allocation; then
+cat >>e${EMULATION_NAME}.c <<EOF
 
 /* This is called after the sections have been attached to output
    sections, but before any sizes or addresses have been set.  */
@@ -801,6 +834,11 @@ gld${EMULATION_NAME}_before_allocation ()
   }
 }
 
+EOF
+fi
+
+if test x"$LDEMUL_OPEN_DYNAMIC_ARCHIVE" != xgld"$EMULATION_NAME"_open_dynamic_archive; then
+cat >>e${EMULATION_NAME}.c <<EOF
 
 /* Try to open a dynamic archive.  This is where we know that ELF
    dynamic libraries have an extension of .so (or .sl on oddball systems
@@ -884,8 +922,12 @@ gld${EMULATION_NAME}_open_dynamic_archive (arch, search, entry)
   return true;
 }
 
+EOF
+fi
+cat >>e${EMULATION_NAME}.c <<EOF
+
+/* A variant of lang_output_section_find.  Used by place_orphan.  */
 
-/* A variant of lang_output_section_find.  */
 static lang_output_section_statement_type *
 output_rel_find ()
 {
@@ -907,18 +949,20 @@ output_rel_find ()
   return (lang_output_section_statement_type *) NULL;
 }
 
+EOF
+
+if test x"$LDEMUL_PLACE_ORPHAN" != xgld"$EMULATION_NAME"_place_orphan; then
+cat >>e${EMULATION_NAME}.c <<EOF
 
 /* Place an orphan section.  We use this to put random SHF_ALLOC
    sections in the right segment.  */
 
-struct orphan_save
-{
+struct orphan_save {
   lang_output_section_statement_type *os;
   asection **section;
   lang_statement_union_type **stmt;
 };
 
-/*ARGSUSED*/
 static boolean
 gld${EMULATION_NAME}_place_orphan (file, s)
      lang_input_statement_type *file;
@@ -1137,9 +1181,14 @@ gld${EMULATION_NAME}_place_orphan (file, s)
   return true;
 }
 
+EOF
+fi
+
+if test x"$LDEMUL_GET_SCRIPT" != xgld"$EMULATION_NAME"_get_script; then
+cat >>e${EMULATION_NAME}.c <<EOF
 
 static char *
-gld${EMULATION_NAME}_get_script(isfile)
+gld${EMULATION_NAME}_get_script (isfile)
      int *isfile;
 EOF
 
@@ -1194,26 +1243,14 @@ cat >>e${EMULATION_NAME}.c <<EOF
   else
     return "ldscripts/${EMULATION_NAME}.x";
 }
-EOF
-
-fi
 
-if test -n "$PARSE_AND_LIST_ARGS_CASES" || test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
-NEED_PARSE_AND_LIST=yes
-
-cat >>e${EMULATION_NAME}.c <<EOF
-static int  gld_${EMULATION_NAME}_parse_args PARAMS ((int, char **));
-static void gld_${EMULATION_NAME}_list_options PARAMS ((FILE * file));
 EOF
-else
-NEED_PARSE_AND_LIST=no
+fi
+fi
 
-cat >>e${EMULATION_NAME}.c <<EOF
-#define gld_${EMULATION_NAME}_parse_args   NULL
-#define gld_${EMULATION_NAME}_list_options NULL
-EOF
+if test -n "$PARSE_AND_LIST_ARGS_CASES" -o x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 
-fi
+if test x"$LDEMUL_PARSE_ARGS" != xgld_"$EMULATION_NAME"_parse_args; then
 
 if test -n "$PARSE_AND_LIST_PROLOGUE" ; then
 cat >>e${EMULATION_NAME}.c <<EOF
@@ -1221,7 +1258,6 @@ cat >>e${EMULATION_NAME}.c <<EOF
 EOF
 fi
 
-if test "$NEED_PARSE_AND_LIST" = yes; then
 cat >>e${EMULATION_NAME}.c <<EOF
 
 #include "getopt.h"
@@ -1232,7 +1268,6 @@ cat >>e${EMULATION_NAME}.c <<EOF
 static struct option longopts[] =
 {
 EOF
-fi
 
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 cat >>e${EMULATION_NAME}.c <<EOF
@@ -1251,12 +1286,13 @@ cat >>e${EMULATION_NAME}.c <<EOF
 EOF
 fi
 
-if test "$NEED_PARSE_AND_LIST" = yes; then
 cat >>e${EMULATION_NAME}.c <<EOF
   {NULL, no_argument, NULL, 0}
 };
 
 
+static int gld_${EMULATION_NAME}_parse_args PARAMS ((int, char **));
+
 static int
 gld_${EMULATION_NAME}_parse_args (argc, argv)
      int argc;
@@ -1272,7 +1308,9 @@ gld_${EMULATION_NAME}_parse_args (argc, argv)
     opterr = 0;
 
   wanterror  = opterr;
-  optc = getopt_long_only (argc, argv, "-z:", longopts, &longind);
+  optc = getopt_long_only (argc, argv,
+			   "-${PARSE_AND_LIST_SHORTOPTS}z:", longopts,
+			   &longind);
   opterr = prevopterr;
 
   switch (optc)
@@ -1284,7 +1322,6 @@ gld_${EMULATION_NAME}_parse_args (argc, argv)
       return 0;
 
 EOF
-fi
 
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 cat >>e${EMULATION_NAME}.c <<EOF
@@ -1332,20 +1369,25 @@ cat >>e${EMULATION_NAME}.c <<EOF
 EOF
 fi
 
-if test "$NEED_PARSE_AND_LIST" = yes; then
 cat >>e${EMULATION_NAME}.c <<EOF
     }
 
   return 1;
 }
 
+EOF
+fi
+
+if test x"$LDEMUL_LIST_OPTIONS" != xgld_"$EMULATION_NAME"_list_options; then
+cat >>e${EMULATION_NAME}.c <<EOF
+
+static void gld_${EMULATION_NAME}_list_options PARAMS ((FILE * file));
 
 static void
 gld_${EMULATION_NAME}_list_options (file)
      FILE * file;
 {
 EOF
-fi
 
 if test x"$GENERATE_SHLIB_SCRIPT" = xyes; then
 cat >>e${EMULATION_NAME}.c <<EOF
@@ -1371,43 +1413,54 @@ cat >>e${EMULATION_NAME}.c <<EOF
 EOF
 fi
 
-if test "$NEED_PARSE_AND_LIST" = yes; then
 cat >>e${EMULATION_NAME}.c <<EOF
 }
 EOF
-fi
 
 if test -n "$PARSE_AND_LIST_EPILOGUE" ; then
 cat >>e${EMULATION_NAME}.c <<EOF
  $PARSE_AND_LIST_EPILOGUE
 EOF
 fi
+fi
+else
+if test x"$LDEMUL_PARSE_ARGS" != xgld_"$EMULATION_NAME"_parse_args; then
+cat >>e${EMULATION_NAME}.c <<EOF
+#define gld_${EMULATION_NAME}_parse_args   NULL
+EOF
+fi
+if test x"$LDEMUL_LIST_OPTIONS" != xgld_"$EMULATION_NAME"_list_options; then
+cat >>e${EMULATION_NAME}.c <<EOF
+#define gld_${EMULATION_NAME}_list_options NULL
+EOF
+fi
+fi
 
 cat >>e${EMULATION_NAME}.c <<EOF
 
 struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
 {
-  gld${EMULATION_NAME}_before_parse,
-  syslib_default,
-  hll_default,
-  after_parse_default,
-  gld${EMULATION_NAME}_after_open,
-  after_allocation_default,
-  set_output_arch_default,
-  ldemul_default_target,
-  gld${EMULATION_NAME}_before_allocation,
-  gld${EMULATION_NAME}_get_script,
+  ${LDEMUL_BEFORE_PARSE-gld${EMULATION_NAME}_before_parse},
+  ${LDEMUL_SYSLIB-syslib_default},
+  ${LDEMUL_HLL-hll_default},
+  ${LDEMUL_AFTER_PARSE-after_parse_default},
+  ${LDEMUL_AFTER_OPEN-gld${EMULATION_NAME}_after_open},
+  ${LDEMUL_AFTER_ALLOCATION-after_allocation_default},
+  ${LDEMUL_SET_OUTPUT_ARCH-set_output_arch_default},
+  ${LDEMUL_CHOOSE_TARGET-ldemul_default_target},
+  ${LDEMUL_BEFORE_ALLOCATION-gld${EMULATION_NAME}_before_allocation},
+  ${LDEMUL_GET_SCRIPT-gld${EMULATION_NAME}_get_script},
   "${EMULATION_NAME}",
   "${OUTPUT_FORMAT}",
-  NULL, 	/* finish */
-  NULL, 	/* create output section statements */
-  gld${EMULATION_NAME}_open_dynamic_archive,
-  gld${EMULATION_NAME}_place_orphan,
-  NULL,		/* set_symbols */
-  gld_${EMULATION_NAME}_parse_args,
-  NULL,		/* unrecognized_file */
-  gld_${EMULATION_NAME}_list_options,
-  NULL,		/* recognized_file */
-  NULL		/* find_potential_libraries */
+  ${LDEMUL_FINISH-NULL},
+  ${LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS-NULL},
+  ${LDEMUL_OPEN_DYNAMIC_ARCHIVE-gld${EMULATION_NAME}_open_dynamic_archive},
+  ${LDEMUL_PLACE_ORPHAN-gld${EMULATION_NAME}_place_orphan},
+  ${LDEMUL_SET_SYMBOLS-NULL},
+  ${LDEMUL_PARSE_ARGS-gld_${EMULATION_NAME}_parse_args},
+  ${LDEMUL_UNRECOGNIZED_FILE-NULL},
+  ${LDEMUL_LIST_OPTIONS-gld_${EMULATION_NAME}_list_options},
+  ${LDEMUL_RECOGNIZED_FILE-NULL},
+  ${LDEMUL_FIND_POTENTIAL_LIBRARIES-NULL},
 };
 EOF
diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index dfa1d0a..3139785 100644
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -1,73 +1,50 @@
 # This shell script emits a C file. -*- C -*-
-# It does some substitutions.
-cat >e${EMULATION_NAME}.c <<EOF
-/* This file is is generated by a shell script.  DO NOT EDIT! */
-
-/* An emulation for HP PA-RISC ELF linkers.
-   Copyright (C) 1991, 93, 94, 95, 97, 99, 2000
-   Free Software Foundation, Inc.
-   Written by Steve Chamberlain steve@cygnus.com
-
-This file is part of GLD, the Gnu Linker.
-
-This program 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 of the License, or
-(at your option) any later version.
-
-This program 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 this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include <ctype.h>
-#include "bfdlink.h"
-
-#include "ld.h"
-#include "ldmain.h"
-#include "ldmisc.h"
-#include "ldexp.h"
-#include "ldlang.h"
-#include "ldfile.h"
-#include "ldemul.h"
-#include "ldgram.h"
+#   Copyright (C) 1991, 93, 94, 95, 97, 99, 2000
+#   Free Software Foundation, Inc.
+#
+# This file is part of GLD, the Gnu Linker.
+#
+# This program 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 of the License, or
+# (at your option) any later version.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+
+# This file is sourced from elf32.em, and defines extra hppa-elf
+# specific routines.
+#
+cat >>e${EMULATION_NAME}.c <<EOF
+
 #include "ldctor.h"
 #include "elf32-hppa.h"
 
-static void hppaelf_before_parse PARAMS ((void));
 static void hppaelf_set_output_arch PARAMS ((void));
 static void hppaelf_create_output_section_statements PARAMS ((void));
 static void hppaelf_delete_padding_statements
-  PARAMS ((lang_statement_list_type *list));
+  PARAMS ((lang_statement_list_type *));
+static asection *hppaelf_add_stub_section
+  PARAMS ((const char *, asection *));
+static void hppaelf_layaout_sections_again PARAMS ((void));
 static void hppaelf_finish PARAMS ((void));
-static boolean gld${EMULATION_NAME}_place_orphan
-  PARAMS ((lang_input_statement_type *, asection *));
-static lang_output_section_statement_type *output_rel_find PARAMS ((void));
-static char *hppaelf_get_script PARAMS ((int *));
 
 
 /* Fake input file for stubs.  */
 static lang_input_statement_type *stub_file;
 
-/* Perform some emulation specific initialization.  For PA ELF we set
-   up the local label prefix and the output architecture.  */
-
-static void
-hppaelf_before_parse ()
-{
-  ldfile_output_architecture = bfd_arch_hppa;
-}
 
 /* Set the output architecture and machine.  */
 
 static void
-hppaelf_set_output_arch()
+hppaelf_set_output_arch ()
 {
   unsigned long machine = 0;
 
@@ -162,6 +139,9 @@ struct hook_stub_info
 
 /* Traverse the linker tree to find the spot where the stub goes.  */
 
+static boolean hook_in_stub
+  PARAMS ((struct hook_stub_info *, lang_statement_union_type **));
+
 static boolean
 hook_in_stub (info, lp)
      struct hook_stub_info *info;
@@ -230,6 +210,7 @@ hook_in_stub (info, lp)
   return false;
 }
 
+
 /* Call-back for elf32_hppa_size_stubs.  */
 
 /* Create a new stub section, and arrange for it to be linked
@@ -275,6 +256,7 @@ hppaelf_add_stub_section (stub_name, input_section)
   return NULL;
 }
 
+
 /* Another call-back for elf32_hppa_size_stubs.  */
 
 static void
@@ -312,10 +294,10 @@ hppaelf_finish ()
     return;
 
   /* Call into the BFD backend to do the real work.  */
-  if (elf32_hppa_size_stubs (stub_file->the_bfd,
-			     &link_info,
-			     &hppaelf_add_stub_section,
-			     &hppaelf_layaout_sections_again) == false)
+  if (! elf32_hppa_size_stubs (stub_file->the_bfd,
+			       &link_info,
+			       &hppaelf_add_stub_section,
+			       &hppaelf_layaout_sections_again))
     {
       einfo ("%X%P: can not size stub section: %E\n");
       return;
@@ -324,350 +306,15 @@ hppaelf_finish ()
   /* Now build the linker stubs.  */
   if (stub_file->the_bfd->sections != NULL)
     {
-      if (elf32_hppa_build_stubs (stub_file->the_bfd, &link_info) == false)
+      if (! elf32_hppa_build_stubs (stub_file->the_bfd, &link_info))
 	einfo ("%X%P: can not build stubs: %E\n");
     }
 }
 
-
-/* Place an orphan section.  We use this to put random SHF_ALLOC
-   sections in the right segment.  */
-
-struct orphan_save
-{
-  lang_output_section_statement_type *os;
-  asection **section;
-  lang_statement_union_type **stmt;
-};
-
-/*ARGSUSED*/
-static boolean
-gld${EMULATION_NAME}_place_orphan (file, s)
-     lang_input_statement_type *file;
-     asection *s;
-{
-  static struct orphan_save hold_text;
-  static struct orphan_save hold_rodata;
-  static struct orphan_save hold_data;
-  static struct orphan_save hold_bss;
-  static struct orphan_save hold_rel;
-  static struct orphan_save hold_interp;
-  struct orphan_save *place;
-  lang_statement_list_type *old;
-  lang_statement_list_type add;
-  etree_type *address;
-  const char *secname, *ps;
-  const char *outsecname;
-  lang_output_section_statement_type *os;
-
-  secname = bfd_get_section_name (s->owner, s);
-
-  /* Look through the script to see where to place this section.  */
-  os = lang_output_section_find (secname);
-
-  if (os != NULL
-      && os->bfd_section != NULL
-      && ((s->flags ^ os->bfd_section->flags) & (SEC_LOAD | SEC_ALLOC)) == 0)
-    {
-      /* We have already placed a section with this name.  */
-      wild_doit (&os->children, s, os, file);
-      return true;
-    }
-
-  if (hold_text.os == NULL)
-    hold_text.os = lang_output_section_find (".text");
-
-  /* If this is a final link, then always put .gnu.warning.SYMBOL
-     sections into the .text section to get them out of the way.  */
-  if (! link_info.shared
-      && ! link_info.relocateable
-      && strncmp (secname, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0
-      && hold_text.os != NULL)
-    {
-      wild_doit (&hold_text.os->children, s, hold_text.os, file);
-      return true;
-    }
-
-  /* Decide which segment the section should go in based on the
-     section name and section flags.  We put loadable .note sections
-     right after the .interp section, so that the PT_NOTE segment is
-     stored right after the program headers where the OS can read it
-     in the first page.  */
-#define HAVE_SECTION(hold, name) \
-(hold.os != NULL || (hold.os = lang_output_section_find (name)) != NULL)
-
-  if (s->flags & SEC_EXCLUDE)
-    return false;
-  else if ((s->flags & SEC_ALLOC) == 0)
-    place = NULL;
-  else if ((s->flags & SEC_LOAD) != 0
-	   && strncmp (secname, ".note", 4) == 0
-	   && HAVE_SECTION (hold_interp, ".interp"))
-    place = &hold_interp;
-  else if ((s->flags & SEC_HAS_CONTENTS) == 0
-	   && HAVE_SECTION (hold_bss, ".bss"))
-    place = &hold_bss;
-  else if ((s->flags & SEC_READONLY) == 0
-	   && HAVE_SECTION (hold_data, ".data"))
-    place = &hold_data;
-  else if (strncmp (secname, ".rel", 4) == 0
-	   && (hold_rel.os != NULL
-	       || (hold_rel.os = output_rel_find ()) != NULL))
-    place = &hold_rel;
-  else if ((s->flags & SEC_CODE) == 0
-	   && (s->flags & SEC_READONLY) != 0
-	   && HAVE_SECTION (hold_rodata, ".rodata"))
-    place = &hold_rodata;
-  else if ((s->flags & SEC_READONLY) != 0
-	   && hold_text.os != NULL)
-    place = &hold_text;
-  else
-    place = NULL;
-
-#undef HAVE_SECTION
-
-  /* Choose a unique name for the section.  This will be needed if the
-     same section name appears in the input file with different
-     loadable or allocateable characteristics.  */
-  outsecname = secname;
-  if (bfd_get_section_by_name (output_bfd, outsecname) != NULL)
-    {
-      unsigned int len;
-      char *newname;
-      unsigned int i;
-
-      len = strlen (outsecname);
-      newname = xmalloc (len + 5);
-      strcpy (newname, outsecname);
-      i = 0;
-      do
-	{
-	  sprintf (newname + len, "%d", i);
-	  ++i;
-	}
-      while (bfd_get_section_by_name (output_bfd, newname) != NULL);
-
-      outsecname = newname;
-    }
-
-  if (place != NULL)
-    {
-      /* Start building a list of statements for this section.  */
-      old = stat_ptr;
-      stat_ptr = &add;
-      lang_list_init (stat_ptr);
-
-      /* If the name of the section is representable in C, then create
-	 symbols to mark the start and the end of the section.  */
-      for (ps = outsecname; *ps != '\0'; ps++)
-	if (! isalnum ((unsigned char) *ps) && *ps != '_')
-	  break;
-      if (*ps == '\0' && config.build_constructors)
-	{
-	  char *symname;
-	  etree_type *e_align;
-
-	  symname = (char *) xmalloc (ps - outsecname + sizeof "__start_");
-	  sprintf (symname, "__start_%s", outsecname);
-	  e_align = exp_unop (ALIGN_K,
-			      exp_intop ((bfd_vma) 1 << s->alignment_power));
-	  lang_add_assignment (exp_assop ('=', symname, e_align));
-	}
-    }
-
-  if (link_info.relocateable || (s->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
-    address = exp_intop ((bfd_vma) 0);
-  else
-    address = NULL;
-
-  os = lang_enter_output_section_statement (outsecname, address, 0,
-					    (bfd_vma) 0,
-					    (etree_type *) NULL,
-					    (etree_type *) NULL,
-					    (etree_type *) NULL);
-
-  wild_doit (&os->children, s, os, file);
-
-  lang_leave_output_section_statement
-    ((bfd_vma) 0, "*default*",
-     (struct lang_output_section_phdr_list *) NULL, "*default*");
-
-  if (place != NULL)
-    {
-      asection *snew, **pps;
-
-      stat_ptr = &add;
-
-      if (*ps == '\0' && config.build_constructors)
-	{
-	  char *symname;
-
-	  symname = (char *) xmalloc (ps - outsecname + sizeof "__stop_");
-	  sprintf (symname, "__stop_%s", outsecname);
-	  lang_add_assignment (exp_assop ('=', symname,
-					  exp_nameop (NAME, ".")));
-	}
-      stat_ptr = old;
-
-      snew = os->bfd_section;
-      if (place->os->bfd_section != NULL || place->section != NULL)
-	{
-	  /* Shuffle the section to make the output file look neater.  */
-	  if (place->section == NULL)
-	    {
-#if 0
-	      /* Finding the end of the list is a little tricky.  We
-		 make a wild stab at it by comparing section flags.  */
-	      flagword first_flags = place->os->bfd_section->flags;
-	      for (pps = &place->os->bfd_section->next;
-		   *pps != NULL && (*pps)->flags == first_flags;
-		   pps = &(*pps)->next)
-		;
-	      place->section = pps;
-#else
-	      /* Put orphans after the first section on the list.  */
-	      place->section = &place->os->bfd_section->next;
-#endif
-	    }
-
-	  /*  Unlink the section.  */
-	  for (pps = &output_bfd->sections; *pps != snew; pps = &(*pps)->next)
-	    ;
-	  *pps = snew->next;
-
-	  /* Now tack it on to the "place->os" section list.  */
-	  snew->next = *place->section;
-	  *place->section = snew;
-	}
-      place->section = &snew->next;	/* Save the end of this list.  */
-
-      if (place->stmt == NULL)
-	{
-	  /* Put the new statement list right at the head.  */
-	  *add.tail = place->os->header.next;
-	  place->os->header.next = add.head;
-	}
-      else
-	{
-	  /* Put it after the last orphan statement we added.  */
-	  *add.tail = *place->stmt;
-	  *place->stmt = add.head;
-	}
-      place->stmt = add.tail;		/* Save the end of this list.  */
-    }
-
-  return true;
-}
-
-/* A variant of lang_output_section_find.  */
-static lang_output_section_statement_type *
-output_rel_find ()
-{
-  lang_statement_union_type *u;
-  lang_output_section_statement_type *lookup;
-
-  for (u = lang_output_section_statement.head;
-       u != (lang_statement_union_type *) NULL;
-       u = lookup->next)
-    {
-      lookup = &u->output_section_statement;
-      if (strncmp (".rel", lookup->name, 4) == 0
-	  && lookup->bfd_section != NULL
-	  && (lookup->bfd_section->flags & SEC_ALLOC) != 0)
-	{
-	  return lookup;
-	}
-    }
-  return (lang_output_section_statement_type *) NULL;
-}
-
-/* The script itself gets inserted here.  */
-
-static char *
-hppaelf_get_script(isfile)
-     int *isfile;
 EOF
 
-if test -n "$COMPILE_IN"
-then
-# Scripts compiled in.
-
-# sed commands to quote an ld script as a C string.
-sc="-f stringify.sed"
-
-cat >>e${EMULATION_NAME}.c <<EOF
-{
-  *isfile = 0;
-
-  if (link_info.relocateable == true && config.build_constructors == true)
-    return
-EOF
-sed $sc ldscripts/${EMULATION_NAME}.xu                     >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocateable == true) return' >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xr                     >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.text_read_only) return'         >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xbn                    >> e${EMULATION_NAME}.c
-echo '  ; else if (!config.magic_demand_paged) return'     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xn                     >> e${EMULATION_NAME}.c
-
-if test -n "$GENERATE_SHLIB_SCRIPT" ; then
-echo '  ; else if (link_info.shared) return'		   >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xs                     >> e${EMULATION_NAME}.c
-fi
-
-echo '  ; else return'                                     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.x                      >> e${EMULATION_NAME}.c
-echo '; }'                                                 >> e${EMULATION_NAME}.c
-
-else
-# Scripts read from the filesystem.
-
-cat >>e${EMULATION_NAME}.c <<EOF
-{			     
-  *isfile = 1;
-
-  if (link_info.relocateable == true && config.build_constructors == true)
-    return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable == true)
-    return "ldscripts/${EMULATION_NAME}.xr";
-  else if (!config.text_read_only)
-    return "ldscripts/${EMULATION_NAME}.xbn";
-  else if (!config.magic_demand_paged)
-    return "ldscripts/${EMULATION_NAME}.xn";
-  else if (link_info.shared)
-    return "ldscripts/${EMULATION_NAME}.xs";
-  else
-    return "ldscripts/${EMULATION_NAME}.x";
-}
-EOF
-
-fi
-
-cat >>e${EMULATION_NAME}.c <<EOF
-
-struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
-{
-  hppaelf_before_parse,
-  syslib_default,
-  hll_default,
-  after_parse_default,
-  after_open_default,
-  after_allocation_default,
-  hppaelf_set_output_arch,
-  ldemul_default_target,
-  before_allocation_default,
-  hppaelf_get_script,
-  "${EMULATION_NAME}",
-  "elf32-hppa",
-  hppaelf_finish,
-  hppaelf_create_output_section_statements,
-  NULL,		/* open dynamic */
-  gld${EMULATION_NAME}_place_orphan,
-  NULL,		/* set_symbols */
-  NULL,		/* parse_args */
-  NULL,		/* unrecognized_file */
-  NULL,		/* list_options */
-  NULL,		/* recognized_file */
-  NULL		/* find_potential_libraries */
-};
-EOF
+# Put these routines in ld_${EMULATION_NAME}_emulation
+#
+LDEMUL_SET_OUTPUT_ARCH=hppaelf_set_output_arch
+LDEMUL_FINISH=hppaelf_finish
+LDEMUL_CREATE_OUTPUT_SECTION_STATEMENTS=hppaelf_create_output_section_statements
diff --git a/ld/emultempl/m68kcoff.em b/ld/emultempl/m68kcoff.em
index 06422d3..5b62e8e 100644
--- a/ld/emultempl/m68kcoff.em
+++ b/ld/emultempl/m68kcoff.em
@@ -33,8 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "ld.h"
 #include "ldmain.h"
-#include "ldemul.h"
 #include "ldfile.h"
+#include "ldemul.h"
 #include "ldmisc.h"
 
 static void gld${EMULATION_NAME}_before_parse PARAMS ((void));