From 439a3604ae0f5ebef5b0311ae235e066523e228c Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Fri, 13 May 1994 17:06:49 +0000
Subject: [PATCH] 	* config/i386-linux.mt (OTHER_EMULATIONS): Change em_
 to e to 	match corresponding change in emulation templates. 	*
 config/i386-lynx.mt, config/m68k-lynx.mt: Likewise. 	*
 config/sparc-lynx.mt, config/sun4sol2.mt: Likewise.

---
 ld/ChangeLog             | 7 +++++++
 ld/config/i386-linux.mt  | 4 ++--
 ld/config/i386-lynx.mt   | 2 +-
 ld/config/m68k-lynx.mt   | 2 +-
 ld/config/sparc-lynx.mt  | 2 +-
 ld/config/sparc64-elf.mt | 4 ++--
 ld/config/sun4sol2.mt    | 4 ++--
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e9db192d24e..576118d9b30 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 13 13:00:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+	* config/i386-linux.mt (OTHER_EMULATIONS): Change em_ to e to
+	match corresponding change in emulation templates.
+	* config/i386-lynx.mt, config/m68k-lynx.mt: Likewise.
+	* config/sparc-lynx.mt, config/sun4sol2.mt: Likewise.
+
 Wed May 11 18:16:46 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
 	* ldver.c (ldversion): Updated version number.
diff --git a/ld/config/i386-linux.mt b/ld/config/i386-linux.mt
index 8935204cc3a..bf42c113d53 100644
--- a/ld/config/i386-linux.mt
+++ b/ld/config/i386-linux.mt
@@ -1,5 +1,5 @@
 EMUL=i386linux
-OTHER_EMULATIONS= em_i386linux.o
-em_i386linux.c: $(srcdir)/emulparams/i386linux.sh \
+OTHER_EMULATIONS= ei386linux.o
+ei386linux.c: $(srcdir)/emulparams/i386linux.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} i386linux
diff --git a/ld/config/i386-lynx.mt b/ld/config/i386-lynx.mt
index 05930b84e21..48ba243f3b4 100644
--- a/ld/config/i386-lynx.mt
+++ b/ld/config/i386-lynx.mt
@@ -1,2 +1,2 @@
 EMUL=i386lynx
-OTHER_EMULATIONS=em_i386lynx.o
+OTHER_EMULATIONS=ei386lynx.o
diff --git a/ld/config/m68k-lynx.mt b/ld/config/m68k-lynx.mt
index bbb6abfeb79..367cb8c208d 100644
--- a/ld/config/m68k-lynx.mt
+++ b/ld/config/m68k-lynx.mt
@@ -1,2 +1,2 @@
 EMUL=m68klynx
-OTHER_EMULATIONS=em_m68klynx.o
+OTHER_EMULATIONS=em68klynx.o
diff --git a/ld/config/sparc-lynx.mt b/ld/config/sparc-lynx.mt
index 3f648393616..996be0b32d3 100644
--- a/ld/config/sparc-lynx.mt
+++ b/ld/config/sparc-lynx.mt
@@ -1,2 +1,2 @@
 EMUL=sparclynx
-OTHER_EMULATIONS=em_sparclynx.o
+OTHER_EMULATIONS=esparclynx.o
diff --git a/ld/config/sparc64-elf.mt b/ld/config/sparc64-elf.mt
index e9e8eb55640..a0474e36bd2 100644
--- a/ld/config/sparc64-elf.mt
+++ b/ld/config/sparc64-elf.mt
@@ -1,5 +1,5 @@
 EMUL=elf64_sparc
-OTHER_EMULATIONS= em_elf64_sparc.o
-em_elf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
+OTHER_EMULATIONS= eelf64_sparc.o
+eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf64_sparc
diff --git a/ld/config/sun4sol2.mt b/ld/config/sun4sol2.mt
index 99c0595081b..cbfdcde0ed4 100644
--- a/ld/config/sun4sol2.mt
+++ b/ld/config/sun4sol2.mt
@@ -1,5 +1,5 @@
 EMUL=elf32_sparc
-OTHER_EMULATIONS= em_elf32_sparc.o
-em_elf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \
+OTHER_EMULATIONS= eelf32_sparc.o
+eelf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32_sparc
-- 
2.30.2