From 71acc4e8d5d721f8de1b35dc06ed36b312f04c95 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 7 May 1999 07:40:05 +0000
Subject: [PATCH] REstore mcore support (duh!)

---
 ld/Makefile.am              | 8 ++++++++
 ld/Makefile.in              | 8 ++++++++
 ld/configure.tgt            | 3 +++
 ld/emulparams/elf32mcore.sh | 3 ---
 ld/emulparams/mcorepe.sh    | 3 ---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ld/Makefile.am b/ld/Makefile.am
index e9dd6b47ce1..1f02098730d 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -130,6 +130,7 @@ ALL_EMULATIONS = \
 	egld960.o \
 	egld960coff.o \
 	eelf32fr30.o \
+	eelf32mcore.o \
 	ego32.o \
 	eh8300.o \
 	eh8300h.o \
@@ -166,6 +167,7 @@ ALL_EMULATIONS = \
 	em68knbsd.o \
 	em68kpsos.o \
 	em88kbcs.o \
+	emcorepe.o \
 	emipsbig.o \
 	emipsbsd.o \
 	emipsidt.o \
@@ -323,6 +325,9 @@ eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
+eelf32mcore.c: $(srcdir)/emulparams/elf32mcore.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf32mcore "$(tdir_mcore)"
 em32relf.c: $(srcdir)/emulparams/m32relf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m32relf "$(tdir_m32r)"
@@ -485,6 +490,9 @@ em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
+emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
+  $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
 emipsbig.c:  $(srcdir)/emulparams/mipsbig.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipsbig
diff --git a/ld/Makefile.in b/ld/Makefile.in
index ae47142a36e..e5961ae226f 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -233,6 +233,7 @@ ALL_EMULATIONS = \
 	egld960.o \
 	egld960coff.o \
 	eelf32fr30.o \
+	eelf32mcore.o \
 	ego32.o \
 	eh8300.o \
 	eh8300h.o \
@@ -269,6 +270,7 @@ ALL_EMULATIONS = \
 	em68knbsd.o \
 	em68kpsos.o \
 	em88kbcs.o \
+	emcorepe.o \
 	emipsbig.o \
 	emipsbsd.o \
 	emipsidt.o \
@@ -1022,6 +1024,9 @@ eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \
 eelf32fr30.c: $(srcdir)/emulparams/elf32fr30.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32fr30 "$(tdir_fr30)"
+eelf32mcore.c: $(srcdir)/emulparams/elf32mcore.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} elf32mcore "$(tdir_mcore)"
 em32relf.c: $(srcdir)/emulparams/m32relf.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m32relf "$(tdir_m32r)"
@@ -1184,6 +1189,9 @@ em68kpsos.c:	$(srcdir)/emulparams/m68kpsos.sh \
 em88kbcs.c: $(srcdir)/emulparams/m88kbcs.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/m88kbcs.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} m88kbcs "$(tdir_m88kbcs)"
+emcorepe.c: $(srcdir)/emulparams/mcorepe.sh \
+  $(srcdir)/emultempl/pe.em $(srcdir)/scripttempl/pe.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} mcorepe "$(tdir_mcorepe)"
 emipsbig.c:  $(srcdir)/emulparams/mipsbig.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/mips.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} mipsbig
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 8b4a29731bc..d0555cebab2 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -233,6 +233,9 @@ v850e-*-*)		targ_emul=v850 ;;
 v850ea-*-*)		targ_emul=v850 ;;
 w65-*-*)		targ_emul=w65 ;;
 fr30-*-*)		targ_emul=elf32fr30 ;;
+mcore-*-pe)		targ_emul=mcorepe ;
+			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+mcore-*-elf)		targ_emul=elf32mcore ;;
 *-*-aout)		targ_emul=${target_cpu}-${target_vendor} ;;
 *-*-coff)		targ_emul=${target_cpu}-${target_vendor} ;;
 *-*-netware)		targ_emul=${target_cpu}-nw ;;
diff --git a/ld/emulparams/elf32mcore.sh b/ld/emulparams/elf32mcore.sh
index 524a7f46985..b3c2ba587c7 100644
--- a/ld/emulparams/elf32mcore.sh
+++ b/ld/emulparams/elf32mcore.sh
@@ -1,6 +1,3 @@
-
-# CYGNUS LOCAL entire file
-
 SCRIPT_NAME=elf
 OUTPUT_FORMAT="elf32-mcore-big"
 BIG_OUTPUT_FORMAT="elf32-mcore-big"
diff --git a/ld/emulparams/mcorepe.sh b/ld/emulparams/mcorepe.sh
index ea3087b95d1..b5baee9ea70 100644
--- a/ld/emulparams/mcorepe.sh
+++ b/ld/emulparams/mcorepe.sh
@@ -1,6 +1,3 @@
-
-# CYGNUS LOCAL entire file
-
 ARCH=mcore
 SCRIPT_NAME=mcorepe
 OUTPUT_FORMAT="pei-mcore-big"
-- 
2.30.2