Index: Makefile.in
===================================================================
RCS file: /var/cvs/elf2flt/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- Makefile.in	2003/04/09 05:18:13	1.6
+++ Makefile.in	2003/07/26 16:03:28
@@ -28,10 +28,10 @@
 all: $(PROGS)
 
 elf2flt: $(srcdir)/elf2flt.c Makefile
-	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/elf2flt.c $(LIBS)
+	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/elf2flt.c -L$(LIBS) -lbfd -liberty
 
 flthdr: $(srcdir)/flthdr.c Makefile
-	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/flthdr.c $(LIBS)
+	$(CC) $(CCFLAGS) $(LDFLAGS) -o $@ $(srcdir)/flthdr.c -L$(LIBS) -lbfd -liberty
 
 clean:
 	-rm -f $(PROGS) *.[oa]
Index: ld-elf2flt.in
===================================================================
RCS file: /var/cvs/elf2flt/ld-elf2flt.in,v
retrieving revision 1.6
diff -u -r1.6 ld-elf2flt.in
--- ld-elf2flt.in	2003/07/22 11:31:20	1.6
+++ ld-elf2flt.in	2003/07/26 16:03:29
@@ -77,6 +77,16 @@
 		ARG1="$ARG1 $FINAL_ONLY"
 		NEWLDSCRIPT=`mktemp /tmp/flt-XXXXXX`
 		SEDOP=" -e s/^R_RODAT// -e /^W_RODAT/d"
+		echo $ARG1|grep -q -e "-m\ *h8300h"
+		if [ $? -eq 0 ]
+		then
+		    EMUL="-m h8300helf"
+		fi
+		echo $ARG1|grep -q -e "-m\ *h8300s"
+		if [ $? -eq 0 ]
+		then
+		    EMUL="-m h8300self";
+		fi
 		if [ "$MOVDAT" ]
 		then
 			$LINKER -r -d -o "$OFILE.elf2flt" $ARG1  || exit $?
@@ -126,12 +136,12 @@
 
 		if [ "@got_check@" = "no" ]
 		then
-		 $LINKER $SDIRS -T $LDSCRIPT -Ur -d -o "$OFILE.elf" $ARG1         ||exit $?
-		 $LINKER $SDIRS -T $LDSCRIPT -o "$OFILE.gdb" $ARG1                ||exit $?
+		 $LINKER $SDIRS -T $LDSCRIPT -Ur -d -o "$OFILE.elf" $ARG1               ||exit $?
+		 $LINKER $SDIRS -T $LDSCRIPT -o "$OFILE.gdb" $ARG1                      ||exit $?
 		else
-		 $LINKER -r -d -o "$OFILE.elf2flt" $ARG1                          ||exit $?
-		 $LINKER $SDIRS -T $LDSCRIPT -Ur -o "$OFILE.elf" "$OFILE.elf2flt" ||exit $?
-		 $LINKER $SDIRS -T $LDSCRIPT -o "$OFILE.gdb" "$OFILE.elf2flt"     ||exit $?
+		 $LINKER -r -d -o "$OFILE.elf2flt" $ARG1                                ||exit $?
+		 $LINKER $EMUL $SDIRS -T $LDSCRIPT -Ur -o "$OFILE.elf" "$OFILE.elf2flt" ||exit $?
+		 $LINKER $EMUL $SDIRS -T $LDSCRIPT -o "$OFILE.gdb" "$OFILE.elf2flt"     ||exit $?
 		 rm -f "$OFILE.elf2flt"
 		fi
 		if grep _GLOBAL_OFFSET_TABLE_ "$OFILE.gdb" > /dev/null