From 9ae9e582546d553b918562fbd505566c0af57ed6 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Fri, 28 Feb 1997 04:17:50 +0000
Subject: [PATCH] 	* emultempl/m88kbcs.em: Remove. 	*
 emulparams/m88kbcs.sh (TEMPLATE_NAME): Don't set. 	* Makefile.in
 (em88kbcs.c): Depend upon generic.em rather than 	m88kbcs.em.

---
 ld/ChangeLog            |   9 +++
 ld/Makefile.in          |  13 ++++-
 ld/emultempl/.Sanitize  |   1 -
 ld/emultempl/m88kbcs.em | 119 ----------------------------------------
 4 files changed, 20 insertions(+), 122 deletions(-)
 delete mode 100644 ld/emultempl/m88kbcs.em

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b253d131cad..24201ff227f 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,14 @@
 Thu Feb 27 11:41:03 1997  Ian Lance Taylor  <ian@cygnus.com>
 
+	* ldmain.c (main): Don't initialize link_info.lprefix or
+	link_info.lprefix_len.
+	* emultempl/hppaelf.em (hppaelf_before_parse): Likewise.
+
+	* emultempl/m88kbcs.em: Remove.
+	* emulparams/m88kbcs.sh (TEMPLATE_NAME): Don't set.
+	* Makefile.in (em88kbcs.c): Depend upon generic.em rather than
+	m88kbcs.em.
+
 	* mri.c (mri_draw_tree): Pass noload_section, not SEC_NEVER_LOAD,
 	to lang_enter_output_section_statement.  From Mark Rasin
 	<mark.rasin@telrad.co.il>.
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 87f8cd01012..0f84f70e850 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for the GNU linker ld (version 2)
-# Copyright (C) 1989, 90, 91, 92, 93, 94, 95, 1996
+# Copyright (C) 1989, 90, 91, 92, 93, 94, 95, 96, 1997
 # Free Software Foundation, Inc.
 
 # This file is part of GNU ld.
@@ -260,6 +260,7 @@ ALL_EMULATIONS = \
 	emipsidt.o \
 	emipsidtl.o \
 	emipslit.o \
+	emipslnews.o \
 	enews.o \
 	ens32knbsd.o \
 	epc532macha.o \
@@ -387,6 +388,11 @@ ecoff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \
 ed10velf.c: $(srcdir)/emulparams/d10velf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd10v.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} d10velf "$(tdir_d10v)"
+# start-sanitize-d30v
+ed30velf.c: $(srcdir)/emulparams/d30velf.sh \
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elfd30v.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} d30velf "$(tdir_d30v)"
+# end-sanitize-d30v
 edelta68.c: $(srcdir)/emulparams/delta68.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/delta68.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} delta68 "$(tdir_delta68)"
@@ -543,7 +549,7 @@ em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/psos.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m68kpsos "$(tdir_m68kpsos)"
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
-  $(srcdir)/emultempl/m88kbcs.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
 emipsbig.c:  $(srcdir)/emulparams/mipsbig.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
@@ -560,6 +566,9 @@ emipsidtl.c: $(srcdir)/emulparams/mipsidtl.sh \
 emipslit.c:  $(srcdir)/emulparams/mipslit.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipslit "$(tdir_mipslit)"
+emipslnews.c:  $(srcdir)/emulparams/mipslnews.sh \
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} mipslnews
 emn10300.c: $(srcdir)/emulparams/mn10300.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mn10300 "$(tdir_mn10300)"
diff --git a/ld/emultempl/.Sanitize b/ld/emultempl/.Sanitize
index 960a1ce6512..396aec070f0 100644
--- a/ld/emultempl/.Sanitize
+++ b/ld/emultempl/.Sanitize
@@ -33,7 +33,6 @@ gld960c.em
 hppaelf.em
 linux.em
 lnk960.em
-m88kbcs.em
 mipsecoff.em
 pe.em
 stringify.sed
diff --git a/ld/emultempl/m88kbcs.em b/ld/emultempl/m88kbcs.em
deleted file mode 100644
index ebf58bec380..00000000000
--- a/ld/emultempl/m88kbcs.em
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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! */
-
-/* emulate the original gld for the given ${EMULATION_NAME}
-   Copyright (C) 1991, 1993 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 "bfdlink.h"
-
-#include "ld.h"
-#include "ldemul.h"
-#include "ldfile.h"
-#include "ldmisc.h"
-#include "ldmain.h"
-
-static void
-gld${EMULATION_NAME}_before_parse()
-{
-  link_info.lprefix = "@";
-  link_info.lprefix_len = 1;
-
-  ldfile_output_architecture = bfd_arch_${ARCH};
-}
-
-static char *
-gld${EMULATION_NAME}_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='s/["\\]/\\&/g
-s/$/\\n\\/
-1s/^/"/
-$s/$/n"/
-'
-
-cat >>e${EMULATION_NAME}.c <<EOF
-{			     
-  *isfile = 0;
-
-  if (link_info.relocateable == true && config.build_constructors == true)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xu`;
-  else if (link_info.relocateable == true)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xr`;
-  else if (!config.text_read_only)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xbn`;
-  else if (!config.magic_demand_paged)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xn`;
-  else
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.x`;
-}
-EOF
-
-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
-    return "ldscripts/${EMULATION_NAME}.x";
-}
-EOF
-
-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,
-  after_open_default,
-  after_allocation_default,
-  set_output_arch_default,
-  ldemul_default_target,
-  before_allocation_default,
-  gld${EMULATION_NAME}_get_script,
-  "${EMULATION_NAME}",
-  "${OUTPUT_FORMAT}"
-};
-EOF
-- 
2.30.2