* Makefile.in (em32relf.c): Add rule for.

	* configure.tgt (m32r-*-*): Recognize.
	* emulparams/m32relf.sh: New file.

4 files changed, 68 insertions, 2 deletions

diff --git a/ld/.Sanitize b/ld/.Sanitize
index b4247d4..e5dce05 100644
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -88,7 +88,7 @@ Things-to-lose:
 
 Do-last:
 
-arc_files="ChangeLog configure.in configure.tgt Makefile.in"
+arc_files="ChangeLog configure.tgt Makefile.in"
 
 if ( echo $* | grep keep\-arc > /dev/null ) ; then
 	for i in $arc_files ; do
@@ -146,6 +146,35 @@ else
 	done
 fi
 
+m32r_files="ChangeLog configure.tgt Makefile.in"
+
+if ( echo $* | grep keep\-m32r > /dev/null ) ; then
+	for i in $m32r_files ; do
+		if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping m32r stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $m32r_files ; do
+		if test ! -d $i && (grep sanitize-m32r $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"m32r\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-m32r/,/end-\sanitize\-m32r/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 v850_files="ChangeLog configure.tgt Makefile.in"
 
 if ( echo $* | grep keep\-v850 > /dev/null ) ; then
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7c932f4..6850171 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,22 @@
+start-sanitize-m32r
+Mon Sep 30 12:14:43 1996  Doug Evans  <dje@canuck.cygnus.com>
+
+	* Makefile.in (em32relf.c): Add rule for.
+	* configure.tgt (m32r-*-*): Recognize.
+	* emulparams/m32relf.sh: New file.
+end-sanitize-m32r
+
+Thu Sep 26 13:58:47 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Add symbolic doublequoting to ldmain compile edit.
+	* mpw-config.in: Add mips-*-* case as mips-elf, and use more
+	wildcards in matching.
+	* mpw-emipself.c: New file, pregenerated mips elf emulation.
+
 Tue Sep 17 12:18:21 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* ldint.texinfo: Rewrote.
+
 	* configure.tgt: Add cases for MIPS 5000 like MIPS 4300.
 
 Mon Sep 16 17:55:21 1996  Ian Lance Taylor  <ian@cygnus.com>
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 5ad95c6..9fc39b1 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -64,6 +64,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 HLDFLAGS = @HLDFLAGS@
+HLDENV = @HLDENV@
 RPATH_ENVVAR = @RPATH_ENVVAR@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
@@ -269,6 +270,8 @@ ALL_EMULATIONS = \
 	eriscix.o \
 	esa29200.o \
 	esh.o \
+	eshelf.o \
+	eshlelf.o \
 	eshl.o \
 	esparcaout.o \
 	esparclynx.o \
@@ -390,6 +393,11 @@ edelta68.c: $(srcdir)/emulparams/delta68.sh \
 eebmon29k.c: $(srcdir)/emulparams/ebmon29k.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/ebmon29k.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} ebmon29k "$(tdir_ebmon29k)"
+# start-sanitize-m32r
+em32relf.c: $(srcdir)/emulparams/m32relf.sh \
+  $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} m32relf "$(tdir_m32r)"
+# end-sanitize-m32r
 eelf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \
   $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf32_sparc "$(tdir_elf32_sparc)"
@@ -579,6 +587,12 @@ esa29200.c: $(srcdir)/emulparams/sa29200.sh \
 esh.c: $(srcdir)/emulparams/sh.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} sh "$(tdir_sh)"
+eshelf.c: $(srcdir)/emulparams/shelf.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} shelf "$(tdir_shelf)"
+eshlelf.c: $(srcdir)/emulparams/shlelf.sh \
+  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+	${GENSCRIPTS} shlelf "$(tdir_shlelf)"
 eshl.c: $(srcdir)/emulparams/shl.sh \
   $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} shl "$(tdir_shl)"
@@ -625,7 +639,7 @@ ez8002.c: $(srcdir)/emulparams/z8002.sh \
 	${GENSCRIPTS} z8002 "$(tdir_z8002)"
 
 $(LD_PROG): $(OFILES) $(BFDDEP) $(LIBIBERTY)
-	$(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(EXTRALIBS)
+	$(HLDENV) $(CC) $(HLDFLAGS) $(CFLAGS) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(EXTRALIBS)
 
 # The generated emulation files mostly have the same dependencies.
 $(EMULATION_OFILES): ../bfd/bfd.h sysdep.h config.h $(INCDIR)/bfdlink.h \
diff --git a/ld/configure.tgt b/ld/configure.tgt
index b2e0575..67028d5 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -23,6 +23,7 @@ sparc64-*-elf*)		targ_emul=elf64_sparc ;;
 sparc-sun-sunos4*) 	targ_emul=sun4 ;;
 sparclite*-*-coff)	targ_emul=coff_sparc ;;
 sparclite*-fujitsu-*)	targ_emul=sparcaout ;;
+sparclet*-*-aout)	targ_emul=sparcaout targ_extra_emuls=sparclaout ;;
 sparc*-*-aout)		targ_emul=sparcaout ;;
 sparc*-*-coff)		targ_emul=coff_sparc ;;
 sparc*-*-elf)		targ_emul=elf32_sparc ;;
@@ -38,6 +39,9 @@ i960-wrs-vxworks*)	targ_emul=gld960 ;;
 i960-*-coff)		targ_emul=gld960coff ;;
 i960-intel-nindy)	targ_emul=gld960 ;;
 i960-*-rtems*)		targ_emul=gld960coff ;;
+# start-sanitize-m32r
+m32r-*-*)		targ_emul=m32relf ;;
+# end-sanitize-m32r
 m68*-sun-sunos[34]*)	targ_emul=sun3 ;;
 m68*-wrs-vxworks*)	targ_emul=sun3 ;;
 m68*-ericsson-ose)	targ_emul=sun3 ;;
@@ -133,6 +137,8 @@ mips*vr4300el-*-elf*)	targ_emul=elf32l4300 ;;
 mips*vr4300-*-elf*)	targ_emul=elf32b4300 ;;
 mips*vr4100el-*-elf*)	targ_emul=elf32l4300 ;;
 mips*vr4100-*-elf*)	targ_emul=elf32b4300 ;;
+mips*vr5000el-*-elf*)	targ_emul=elf32l4300 ;;
+mips*vr5000-*-elf*)	targ_emul=elf32b4300 ;;
 mips*el-*-elf*)		targ_emul=elf32elmip ;;
 mips*-*-elf*)		targ_emul=elf32ebmip ;;
 alpha-*-linuxecoff*)	targ_emul=alpha targ_extra_emuls=elf64alpha