* 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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e9db192d24e97d07a91996a62495bb6bb80fe355..576118d9b3076da18585ab871e3bb1a4f90c4ee1 100644 (file)
--- 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 8935204cc3ab47bdd2521fde270f2b0e551d8225..bf42c113d5373604fbe5517a8a926b1795900a2f 100644 (file)
--- 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 05930b84e21be40d1f02c2447e06a7fadbada0b8..48ba243f3b40c7880887675651abb978850c6daa 100644 (file)
--- 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 bbb6abfeb794e5d932d68b3d0a55510c78b53571..367cb8c208d1f30f3e61c92ae59be6eae3341d5d 100644 (file)
--- 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 3f648393616b49585dc03629b1cfd275796bb535..996be0b32d3750dbec6b746f1754af0bf7094526 100644 (file)
--- 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 e9e8eb55640bc9d6956277730fddf87abdac99fb..a0474e36bd2dec60d32efbe4264c918be0827f44 100644 (file)
--- 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 99c0595081bdb7064535fbaa8be039de9abc2673..cbfdcde0ed4cc5d611c2113d9a5ff37000e3fb84 100644 (file)
--- 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