* config/mt-foo: Changed EMUL=GLDFOO_EMULATION_NAME

	to EMUL=foo. (The GLDFOO_EMULATION_NAMEs have bee removed.)
	* config/mh-foo:  Rename LDEMULATION names as appropriate
	(usually 'gldfoo' -> plain 'foo').

19 files changed, 23 insertions, 20 deletions

diff --git a/ld/config/coff-a29k.mt b/ld/config/coff-a29k.mt
index 8b7bc1c..813dfab 100644
--- a/ld/config/coff-a29k.mt
+++ b/ld/config/coff-a29k.mt
@@ -1 +1 @@
-EMUL=GLD29K_EMULATION_NAME
+EMUL=a29k
diff --git a/ld/config/coff-h8300.mt b/ld/config/coff-h8300.mt
index ce528ba..5502e85 100644
--- a/ld/config/coff-h8300.mt
+++ b/ld/config/coff-h8300.mt
@@ -1 +1 @@
-EMUL=H8300HMS_EMULATION_NAME
+EMUL=h8300hms
diff --git a/ld/config/delta88.mh b/ld/config/delta88.mh
index 78ecf20..41e96f6 100644
--- a/ld/config/delta88.mh
+++ b/ld/config/delta88.mh
@@ -5,7 +5,7 @@ YACC=yacc -tvd
 
 HOSTING_CRT0=/lib/crt0.o -X
 HOSTING_LIBS=-lgnu -lc
-HOSTING_EMU=LDEMULATION=gldm88kbcs; export LDEMULATION
+HOSTING_EMU=LDEMULATION=m88kbcs; export LDEMULATION
 
 INSTALL=cp
 
diff --git a/ld/config/dgux.mh b/ld/config/dgux.mh
index 3e987a4..dfff954 100644
--- a/ld/config/dgux.mh
+++ b/ld/config/dgux.mh
@@ -5,5 +5,5 @@ YACC=yacc -tvd
 
 HOSTING_CRT0=/lib/crt0.o -X
 HOSTING_LIBS=/usr/sde/m88kbcs/lib/libc.a
-HOSTING_EMU=LDEMULATION=gldm88kbcs; export LDEMULATION
+HOSTING_EMU=LDEMULATION=m88kbcs; export LDEMULATION
 
diff --git a/ld/config/ebmon29k.mt b/ld/config/ebmon29k.mt
index 4357680..fc83976 100644
--- a/ld/config/ebmon29k.mt
+++ b/ld/config/ebmon29k.mt
@@ -1 +1 @@
-EMUL=EBMON29K_EMULATION_NAME
+EMUL=ebmon29k
diff --git a/ld/config/i386-aout.mt b/ld/config/i386-aout.mt
index b969803..5a2b724 100644
--- a/ld/config/i386-aout.mt
+++ b/ld/config/i386-aout.mt
@@ -1 +1 @@
-EMUL=GLDI386AOUT_EMULATION_NAME
+EMUL=i386aout
diff --git a/ld/config/i386v.mt b/ld/config/i386v.mt
index eacc2d9..e2f13be 100644
--- a/ld/config/i386v.mt
+++ b/ld/config/i386v.mt
@@ -1 +1,2 @@
-EMUL=i386v_EMULATION_NAME
+# This doesn't seem to exist.
+EMUL=i386v
diff --git a/ld/config/m68k.mt b/ld/config/m68k.mt
index f75c0f8..4cb7625 100644
--- a/ld/config/m68k.mt
+++ b/ld/config/m68k.mt
@@ -1 +1,2 @@
-EMUL=GLD_EMULATION_NAME
+# This seems somewhat bogus.
+EMUL=sun3
diff --git a/ld/config/m68kv.mt b/ld/config/m68kv.mt
index 84f0cb1..cb4727b 100644
--- a/ld/config/m68kv.mt
+++ b/ld/config/m68kv.mt
@@ -1 +1,2 @@
-EMUL=m68kv_EMULATION_NAME
+# This emulation seems not to exist.
+EMUL=m68kv
diff --git a/ld/config/m88k-bcs.mt b/ld/config/m88k-bcs.mt
index 1a72a3b..601aed1 100644
--- a/ld/config/m88k-bcs.mt
+++ b/ld/config/m88k-bcs.mt
@@ -1 +1 @@
-EMUL=GLDM88KBCS_EMULATION_NAME
+EMUL=m88kbcs
diff --git a/ld/config/news.mh b/ld/config/news.mh
index 41c4647..085fb13 100755
--- a/ld/config/news.mh
+++ b/ld/config/news.mh
@@ -5,4 +5,4 @@ YACC=yacc -d
 
 HOSTING_CRT0=/lib/crt0.o
 HOSTING_LIBS=-lc
-HOSTING_EMU=LDEMULATION=gldnews; export LDEMULATION
+HOSTING_EMU=LDEMULATION=news; export LDEMULATION
diff --git a/ld/config/news.mt b/ld/config/news.mt
index 3ee654f..9bd82b8 100644
--- a/ld/config/news.mt
+++ b/ld/config/news.mt
@@ -1 +1 @@
-EMUL=GLDNEWS_EMULATION_NAME
+EMUL=news
diff --git a/ld/config/sparc-ll.mh b/ld/config/sparc-ll.mh
index 23cdb47..d8ff9f4 100644
--- a/ld/config/sparc-ll.mh
+++ b/ld/config/sparc-ll.mh
@@ -4,5 +4,5 @@ CC=/usr/latest/bin/gcc -Wall -ansi
 #stuff for self hosting
 HOSTING_CRT0=/lib/crt0.o
 HOSTING_LIBS=/limbo/latest/=sun4/lib/gcc/sparc/1.93/gnulib  -lc
-HOSTING_EMU=LDEMULATION=gld; export LDEMULATION
+HOSTING_EMU=LDEMULATION=sun4; export LDEMULATION
 
diff --git a/ld/config/sparc.mh b/ld/config/sparc.mh
index b44661b..260bbe1 100755
--- a/ld/config/sparc.mh
+++ b/ld/config/sparc.mh
@@ -3,5 +3,5 @@ YACC=yacc -tvd
 #stuff for self hosting
 HOSTING_CRT0=/lib/crt0.o
 HOSTING_LIBS=/usr/latest/lib/gcc/sun4/libgcc.a  -lc
-HOSTING_EMU=LDEMULATION=gld; export LDEMULATION
+HOSTING_EMU=LDEMULATION=sun4; export LDEMULATION
 
diff --git a/ld/config/sun3.mh b/ld/config/sun3.mh
index 6166050..ef3d974 100644
--- a/ld/config/sun3.mh
+++ b/ld/config/sun3.mh
@@ -5,4 +5,4 @@ YACC=yacc -d
 
 HOSTING_CRT0=/usr/lib/crt0.o /usr/lib/Fcrt1.o -L/usr/lib/fsoft.o
 HOSTING_LIBS=-lc
-HOSTING_EMU=LDEMULATION=gld68k; export LDEMULATION
+HOSTING_EMU=LDEMULATION=sun3; export LDEMULATION
diff --git a/ld/config/sun3.mt b/ld/config/sun3.mt
index cd3d86e..52c36bb 100644
--- a/ld/config/sun3.mt
+++ b/ld/config/sun3.mt
@@ -1 +1,2 @@
-EMUL=GLD68K_EMULATION_NAME
+EMUL=sun3
+
diff --git a/ld/config/sun4.mt b/ld/config/sun4.mt
index f75c0f8..97bc9f9 100644
--- a/ld/config/sun4.mt
+++ b/ld/config/sun4.mt
@@ -1 +1 @@
-EMUL=GLD_EMULATION_NAME
+EMUL=sun4
diff --git a/ld/config/vxworks68.mt b/ld/config/vxworks68.mt
index 8cc9050..6d50298 100644
--- a/ld/config/vxworks68.mt
+++ b/ld/config/vxworks68.mt
@@ -1,2 +1 @@
-GLD_EMULATION_NAME=gld
-EMUL=GLD_EMULATION_NAME
+EMUL=sun3
diff --git a/ld/config/vxworks960.mt b/ld/config/vxworks960.mt
index 2abcd2d..fb6515c 100644
--- a/ld/config/vxworks960.mt
+++ b/ld/config/vxworks960.mt
@@ -1 +1 @@
-EMUL=GLD960_EMULATION_NAME
+EMUL=gld960