* mpw-config.in (m68k-apple-macos, ppc-apple-macos,

        i386-unknown-aout, i386-unknown-coff): New targets.
	(m68k-aout, m68k-coff): Remove targets.
	(mk.tmp): Add definition of EMUL.

diff --git a/ld/ChangeLog.mpw b/ld/ChangeLog.mpw
index 9c93ee4c455a365811d1f27980b6c1023214b1c0..cc5538bfa9407aa68d0e35f605875acf726103be 100644 (file)
--- a/ld/ChangeLog.mpw
+++ b/ld/ChangeLog.mpw
@@ -1,3 +1,10 @@
+Wed Dec 14 13:29:52 1994  Stan Shebs  <shebs@andros.cygnus.com>
+
+       * mpw-config.in (m68k-apple-macos, ppc-apple-macos,
+        i386-unknown-aout, i386-unknown-coff): New targets.
+       (m68k-aout, m68k-coff): Remove targets.
+       (mk.tmp): Add definition of EMUL.
+
 Tue Jun 28 13:17:23 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * mpw-config.in (emulname): Set based on target.

diff --git a/ld/mpw-config.in b/ld/mpw-config.in
index 20086628ae483e0a9df4886eabfa724a71a7108d..44e34111c2680f1dd836b691f96048ab93d10796 100644 (file)
--- a/ld/mpw-config.in
+++ b/ld/mpw-config.in
@@ -1,9 +1,13 @@
 # Configuration fragment for LD.
 
-If "{target_canonical}" =~ /m68k-aout/
-       Set emulname m68kaout
-Else If "{target_canonical}" =~ /m68k-coff/
+If "{target_canonical}" =~ /m68k-apple-macos/
        Set emulname m68kcoff
+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
 Else If "{target_canonical}" =~ /mips-idt-ecoff/
        Set emulname mipsidt
        forward-include "{srcdir}"mpw-em.c em_mipsidt.c
@@ -15,3 +19,9 @@ 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 '# From mpw-config.in'       > "{o}"mk.tmp
+
+Echo "EMUL = " {emulname} >> "{o}"mk.tmp
+
+Echo '# End from mpw-config.in'  >> "{o}"mk.tmp