* mpw-config.in (i386-unknown-aout): Change to i386-unknown-go32.

	(i386-unknown-coff): Remove.
	(sh-hitachi-hms): New target.
	(emulation_ofiles): Set correctly for each target.
	(version, TDEFINES): Add to makefile fragment.
	* mpw-make.in (BISON): Use byacc instead of bison.
	(em_*.c): Replace with e*.c everywhere.
	(ldgram.h): Separate action from ldgram.c generation.
	(LD_PROG): Depend on Version.r.
	(Version.r): generate from version info.
	* mpw-em.c: Remove.
	* mpw-emipsidt.c: New file, modified for MPW from emipsidt.c.

1 files changed, 27 insertions, 15 deletions

diff --git a/ld/mpw-config.in b/ld/mpw-config.in
index 44e3411..928e903 100644
--- a/ld/mpw-config.in
+++ b/ld/mpw-config.in
@@ -2,26 +2,38 @@
 
 If "{target_canonical}" =~ /m68k-apple-macos/
 	Set emulname m68kcoff
+	forward-include "{srcdir}"mpw-em68kcoff.c em68kcoff.c
+	Set emulation_ofiles "{o}"em68kcoff.c.o
 Else If "{target_canonical}" =~ /ppc-apple-macos/
-	Set emulname ppcelf
-Else If "{target_canonical}" =~ /i386-unknown-aout/
-	Set emulname i386aout
-Else If "{target_canonical}" =~ /i386-unknown-coff/
-	Set emulname i386coff
+	Set emulname xcoff
+	forward-include "{srcdir}"mpw-excoff.c excoff.c
+	Set emulation_ofiles "{o}"excoff.c.o
+Else If "{target_canonical}" =~ /i386-unknown-go32/
+	Set emulname i386go32
+	forward-include "{srcdir}"mpw-ei386go32.c ei386go32.c
+	Set emulation_ofiles "{o}"ei386go32.c.o
 Else If "{target_canonical}" =~ /mips-idt-ecoff/
 	Set emulname mipsidt
-	forward-include "{srcdir}"mpw-em.c em_mipsidt.c
+	forward-include "{srcdir}"mpw-emipsidt.c emipsidt.c
+	Set emulation_ofiles "{o}"emipsidt.c.o
+Else If "{target_canonical}" =~ /sh-hitachi-hms/
+	Set emulname sh
+	forward-include "{srcdir}"mpw-esh.c esh.c
+	Set emulation_ofiles "{o}"esh.c.o
 End If
 
-Echo '/* This file is automatically generated.  DO NOT EDIT! */' >ldemul-tmp.h
-Echo "extern ld_emulation_xfer_type ld_{emulname}_emulation;" >>ldemul-tmp.h
-Echo '#define EMULATION_LIST \' >>ldemul-tmp.h
-Echo "  &ld_{emulname}_emulation, \" >>ldemul-tmp.h
-Echo '  0' >>ldemul-tmp.h
-MoveIfChange ldemul-tmp.h ldemul-list.h
+Echo '/* This file is automatically generated.  DO NOT EDIT! */' > "{o}"ldemul-tmp.h
+Echo "extern ld_emulation_xfer_type ld_{emulname}_emulation;" >> "{o}"ldemul-tmp.h
+Echo '#define EMULATION_LIST \'				>> "{o}"ldemul-tmp.h
+Echo "  &ld_{emulname}_emulation, \"			>> "{o}"ldemul-tmp.h
+Echo '  0'						>> "{o}"ldemul-tmp.h
+MoveIfChange "{o}"ldemul-tmp.h "{o}"ldemul-list.h
 
-Echo '# From mpw-config.in'       > "{o}"mk.tmp
+Echo '# From mpw-config.in'      > "{o}"mk.tmp
 
-Echo "EMUL = " {emulname} >> "{o}"mk.tmp
+Echo "EMUL = " {emulname}	>> "{o}"mk.tmp
+Echo "EMULATION_OFILES = " {emulation_ofiles} >> "{o}"mk.tmp
+Echo 'version = ' `Search 'ld version ' {srcdir}ldver.c | sed -e 's/.*ld version \([^ ]*\).*/\1/'` >> "{o}"mk.tmp
+Echo "TDEFINES = "		>> "{o}"mk.tmp
 
-Echo '# End from mpw-config.in'  >> "{o}"mk.tmp
+Echo '# End from mpw-config.in'	>> "{o}"mk.tmp