Makefile generates boths IBM-PC and PC-98 version of object code in

apm_init.inc.  The PC-98 version of object is included in `#ifdef
PC98'.

Pointed-out by:	URATA Shuichiro <s-urata@nmit.tmg.nec.co.jp>

4 files changed, 194 insertions, 22 deletions

diff --git a/sys/i386/apm/apm_init/Makefile b/sys/i386/apm/apm_init/Makefile
index 4d8d618..ca69901 100644
--- a/sys/i386/apm/apm_init/Makefile
+++ b/sys/i386/apm/apm_init/Makefile
@@ -12,7 +12,7 @@
 #
 # Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
 #
-#	$Id$
+#	$Id: Makefile,v 1.6 1997/02/22 09:29:51 peter Exp $
 #
 
 OBJS = apm_init.o real_prot.o table.o
@@ -31,15 +31,36 @@ all: apm_init.inc
 .S.o:
 	$(CC)  $(CFLAGS) $(INC) -c $<
 
-apm_init.inc: apm_init bin2asm
-	./bin2asm apm_init apm_init.inc
+apm_init.inc: apm_initat.inc apm_init98.inc
+	echo "#ifdef PC98" > apm_init.inc
+	cat apm_init98.inc >> apm_init.inc
+	echo "#else" >> apm_init.inc
+	cat apm_initat.inc >> apm_init.inc
+	echo "#endif" >> apm_init.inc
 
-apm_init: $(OBJS)
-	$(LD) -Bstatic -N -T 0 -o apm_init $(OBJS)
-	cp apm_init apm_init.sym
-	@strip apm_init
-	@sh ${.CURDIR}/rmaouthdr apm_init apm_init.tmp
-	@mv -f apm_init.tmp apm_init
+apm_initat.inc: apm_initat bin2asm
+	./bin2asm apm_initat apm_initat.inc
+
+apm_initat: $(OBJS)
+	rm -f $(OBJS)
+	make $(OBJS)
+	$(LD) -Bstatic -N -T 0 -o apm_initat $(OBJS)
+	cp apm_initat apm_initat.sym
+	@strip apm_initat
+	@sh ${.CURDIR}/rmaouthdr apm_initat apm_initat.tmp
+	@mv -f apm_initat.tmp apm_initat
+
+apm_init98.inc: apm_init98 bin2asm
+	./bin2asm apm_init98 apm_init98.inc
+
+apm_init98: $(OBJS)
+	rm -f $(OBJS)
+	make CC="$(CC) -DPC98" $(OBJS)
+	$(LD) -Bstatic -N -T 0 -o apm_init98 $(OBJS)
+	cp apm_init98 apm_init98.sym
+	@strip apm_init98
+	@sh ${.CURDIR}/rmaouthdr apm_init98 apm_init98.tmp
+	@mv -f apm_init98.tmp apm_init98
 
 bin2asm: bin2asm.c
 	$(CC) -o bin2asm ${.CURDIR}/bin2asm.c
@@ -47,6 +68,7 @@ bin2asm: bin2asm.c
 allclean: clean
 	@rm -f apm_init.inc
 clean:
-	@rm -f *.o apm_init apm_init.sym bin2asm
+	@rm -f *.o apm_init98 apm_init98.inc apm_init98.sym \
+		apm_initat apm_initat.inc apm_initat.sym apm_init apm_init.sym bin2asm
 
 .include <bsd.prog.mk>
diff --git a/sys/i386/apm/apm_init/apm_init.inc b/sys/i386/apm/apm_init/apm_init.inc
index 6e9ed52..74000e3 100644
--- a/sys/i386/apm/apm_init/apm_init.inc
+++ b/sys/i386/apm/apm_init/apm_init.inc
@@ -1,5 +1,68 @@
+#ifdef PC98
 /* This file is automatically generated by bin2asm */
-/* Original file is 'apm_init' */
+/* Original file is 'apm_init98' */
+
+	.byte	0xfa, 0x55, 0x0f, 0xa0, 0x66, 0x8c, 0xd8, 0x66
+	.byte	0x8e, 0xe0, 0x66, 0xb8, 0xe8, 0x00, 0x66, 0x8e
+	.byte	0xd8, 0x66, 0x8e, 0xc0, 0x66, 0x8e, 0xd0, 0x89
+	.byte	0x25, 0x94, 0x01, 0x00, 0x00, 0xbc, 0x00, 0x00
+	.byte	0x01, 0x00, 0x0f, 0x01, 0x0d, 0xb0, 0x01, 0x00
+	.byte	0x00, 0xe8, 0x22, 0x01, 0x00, 0x00, 0xb4, 0x9a
+	.byte	0xb0, 0x00, 0x66, 0xbb, 0x00, 0x00, 0x00, 0x00
+	.byte	0xfb, 0xcd, 0x1f, 0xfa, 0x73, 0x15, 0x66, 0xe8
+	.byte	0xdc, 0x00, 0x00, 0x00, 0xc7, 0x05, 0x98, 0x01
+	.byte	0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe9, 0xa0
+	.byte	0x00, 0x00, 0x00, 0x89, 0xc2, 0x66, 0xe8, 0xc5
+	.byte	0x00, 0x00, 0x00, 0x66, 0x81, 0xfb, 0x4d, 0x50
+	.byte	0x74, 0x0f, 0xc7, 0x05, 0x98, 0x01, 0x00, 0x00
+	.byte	0xff, 0xff, 0xff, 0xff, 0xe9, 0x82, 0x00, 0x00
+	.byte	0x00, 0xf7, 0xc1, 0x02, 0x00, 0x00, 0x00, 0x75
+	.byte	0x0c, 0xc7, 0x05, 0x98, 0x01, 0x00, 0x00, 0xfe
+	.byte	0xff, 0xff, 0xff, 0xeb, 0x6e, 0x81, 0xe2, 0xff
+	.byte	0xff, 0x00, 0x00, 0x89, 0x15, 0x98, 0x01, 0x00
+	.byte	0x00, 0x81, 0xe1, 0xff, 0xff, 0x00, 0x00, 0x89
+	.byte	0x0d, 0x9c, 0x01, 0x00, 0x00, 0xe8, 0xae, 0x00
+	.byte	0x00, 0x00, 0xb4, 0x9a, 0xb0, 0x04, 0x66, 0xbb
+	.byte	0x00, 0x00, 0x00, 0x00, 0xfb, 0xcd, 0x1f, 0xfa
+	.byte	0xb4, 0x9a, 0xb0, 0x03, 0x66, 0xbb, 0x00, 0x00
+	.byte	0x00, 0x00, 0xfb, 0xcd, 0x1f, 0xfa, 0x73, 0x12
+	.byte	0x66, 0xe8, 0x5a, 0x00, 0x00, 0x00, 0xc7, 0x05
+	.byte	0x98, 0x01, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff
+	.byte	0xeb, 0x21, 0x89, 0xc5, 0x66, 0xe8, 0x46, 0x00
+	.byte	0x00, 0x00, 0xb8, 0xff, 0xff, 0x00, 0x00, 0x21
+	.byte	0xc5, 0x21, 0xc1, 0x21, 0xc2, 0x21, 0xc6, 0x21
+	.byte	0xc7, 0xc1, 0xe5, 0x10, 0x09, 0xe9, 0xc1, 0xe7
+	.byte	0x10, 0x09, 0xfe, 0xfa, 0x0f, 0x01, 0x1d, 0xb0
+	.byte	0x01, 0x00, 0x00, 0x8b, 0x25, 0x94, 0x01, 0x00
+	.byte	0x00, 0x8b, 0x2d, 0x98, 0x01, 0x00, 0x00, 0x8b
+	.byte	0x3d, 0x9c, 0x01, 0x00, 0x00, 0x66, 0x8c, 0xe0
+	.byte	0x66, 0x8e, 0xd0, 0x66, 0x8e, 0xc0, 0x66, 0x8e
+	.byte	0xd8, 0x89, 0xe8, 0x0f, 0xa1, 0x5d, 0xcb, 0x00
+	.byte	0xfa, 0x0f, 0x20, 0xc0, 0x66, 0x83, 0xc8, 0x01
+	.byte	0x0f, 0x22, 0xc0, 0x66, 0xea, 0x33, 0x01, 0x00
+	.byte	0x00, 0xe0, 0x00, 0x66, 0xb8, 0xe8, 0x00, 0x8e
+	.byte	0xd8, 0x8e, 0xd0, 0x8e, 0xc0, 0x0f, 0x01, 0x1d
+	.byte	0xb0, 0x01, 0x00, 0x00, 0xc3, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x66, 0xb8, 0xf8, 0x00, 0xea, 0x5b, 0x01, 0x00
+	.byte	0x00, 0xf0, 0x00, 0x8e, 0xd8, 0x8e, 0xd0, 0x8e
+	.byte	0xc0, 0x0f, 0x20, 0xc0, 0x66, 0x83, 0xe0, 0xfe
+	.byte	0x0f, 0x22, 0xc0, 0x66, 0xea, 0x73, 0x01, 0x00
+	.byte	0x00, 0x00, 0x80, 0x8c, 0xc8, 0x8e, 0xd8, 0x8e
+	.byte	0xd0, 0x8e, 0xc0, 0x67, 0x66, 0x0f, 0x01, 0x1d
+	.byte	0xb6, 0x01, 0x00, 0x00, 0x66, 0xc3, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+/* Total size = 0x01c0 */
+#else
+/* This file is automatically generated by bin2asm */
+/* Original file is 'apm_initat' */
 
 	.byte	0xfa, 0x55, 0x0f, 0xa0, 0x66, 0x8c, 0xd8, 0x66
 	.byte	0x8e, 0xe0, 0x66, 0xb8, 0xe8, 0x00, 0x66, 0x8e
@@ -59,3 +122,4 @@
 	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 /* Total size = 0x01c0 */
+#endif
diff --git a/sys/i386/bios/apm_init/Makefile b/sys/i386/bios/apm_init/Makefile
index 4d8d618..ca69901 100644
--- a/sys/i386/bios/apm_init/Makefile
+++ b/sys/i386/bios/apm_init/Makefile
@@ -12,7 +12,7 @@
 #
 # Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
 #
-#	$Id$
+#	$Id: Makefile,v 1.6 1997/02/22 09:29:51 peter Exp $
 #
 
 OBJS = apm_init.o real_prot.o table.o
@@ -31,15 +31,36 @@ all: apm_init.inc
 .S.o:
 	$(CC)  $(CFLAGS) $(INC) -c $<
 
-apm_init.inc: apm_init bin2asm
-	./bin2asm apm_init apm_init.inc
+apm_init.inc: apm_initat.inc apm_init98.inc
+	echo "#ifdef PC98" > apm_init.inc
+	cat apm_init98.inc >> apm_init.inc
+	echo "#else" >> apm_init.inc
+	cat apm_initat.inc >> apm_init.inc
+	echo "#endif" >> apm_init.inc
 
-apm_init: $(OBJS)
-	$(LD) -Bstatic -N -T 0 -o apm_init $(OBJS)
-	cp apm_init apm_init.sym
-	@strip apm_init
-	@sh ${.CURDIR}/rmaouthdr apm_init apm_init.tmp
-	@mv -f apm_init.tmp apm_init
+apm_initat.inc: apm_initat bin2asm
+	./bin2asm apm_initat apm_initat.inc
+
+apm_initat: $(OBJS)
+	rm -f $(OBJS)
+	make $(OBJS)
+	$(LD) -Bstatic -N -T 0 -o apm_initat $(OBJS)
+	cp apm_initat apm_initat.sym
+	@strip apm_initat
+	@sh ${.CURDIR}/rmaouthdr apm_initat apm_initat.tmp
+	@mv -f apm_initat.tmp apm_initat
+
+apm_init98.inc: apm_init98 bin2asm
+	./bin2asm apm_init98 apm_init98.inc
+
+apm_init98: $(OBJS)
+	rm -f $(OBJS)
+	make CC="$(CC) -DPC98" $(OBJS)
+	$(LD) -Bstatic -N -T 0 -o apm_init98 $(OBJS)
+	cp apm_init98 apm_init98.sym
+	@strip apm_init98
+	@sh ${.CURDIR}/rmaouthdr apm_init98 apm_init98.tmp
+	@mv -f apm_init98.tmp apm_init98
 
 bin2asm: bin2asm.c
 	$(CC) -o bin2asm ${.CURDIR}/bin2asm.c
@@ -47,6 +68,7 @@ bin2asm: bin2asm.c
 allclean: clean
 	@rm -f apm_init.inc
 clean:
-	@rm -f *.o apm_init apm_init.sym bin2asm
+	@rm -f *.o apm_init98 apm_init98.inc apm_init98.sym \
+		apm_initat apm_initat.inc apm_initat.sym apm_init apm_init.sym bin2asm
 
 .include <bsd.prog.mk>
diff --git a/sys/i386/bios/apm_init/apm_init.inc b/sys/i386/bios/apm_init/apm_init.inc
index 6e9ed52..74000e3 100644
--- a/sys/i386/bios/apm_init/apm_init.inc
+++ b/sys/i386/bios/apm_init/apm_init.inc
@@ -1,5 +1,68 @@
+#ifdef PC98
 /* This file is automatically generated by bin2asm */
-/* Original file is 'apm_init' */
+/* Original file is 'apm_init98' */
+
+	.byte	0xfa, 0x55, 0x0f, 0xa0, 0x66, 0x8c, 0xd8, 0x66
+	.byte	0x8e, 0xe0, 0x66, 0xb8, 0xe8, 0x00, 0x66, 0x8e
+	.byte	0xd8, 0x66, 0x8e, 0xc0, 0x66, 0x8e, 0xd0, 0x89
+	.byte	0x25, 0x94, 0x01, 0x00, 0x00, 0xbc, 0x00, 0x00
+	.byte	0x01, 0x00, 0x0f, 0x01, 0x0d, 0xb0, 0x01, 0x00
+	.byte	0x00, 0xe8, 0x22, 0x01, 0x00, 0x00, 0xb4, 0x9a
+	.byte	0xb0, 0x00, 0x66, 0xbb, 0x00, 0x00, 0x00, 0x00
+	.byte	0xfb, 0xcd, 0x1f, 0xfa, 0x73, 0x15, 0x66, 0xe8
+	.byte	0xdc, 0x00, 0x00, 0x00, 0xc7, 0x05, 0x98, 0x01
+	.byte	0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xe9, 0xa0
+	.byte	0x00, 0x00, 0x00, 0x89, 0xc2, 0x66, 0xe8, 0xc5
+	.byte	0x00, 0x00, 0x00, 0x66, 0x81, 0xfb, 0x4d, 0x50
+	.byte	0x74, 0x0f, 0xc7, 0x05, 0x98, 0x01, 0x00, 0x00
+	.byte	0xff, 0xff, 0xff, 0xff, 0xe9, 0x82, 0x00, 0x00
+	.byte	0x00, 0xf7, 0xc1, 0x02, 0x00, 0x00, 0x00, 0x75
+	.byte	0x0c, 0xc7, 0x05, 0x98, 0x01, 0x00, 0x00, 0xfe
+	.byte	0xff, 0xff, 0xff, 0xeb, 0x6e, 0x81, 0xe2, 0xff
+	.byte	0xff, 0x00, 0x00, 0x89, 0x15, 0x98, 0x01, 0x00
+	.byte	0x00, 0x81, 0xe1, 0xff, 0xff, 0x00, 0x00, 0x89
+	.byte	0x0d, 0x9c, 0x01, 0x00, 0x00, 0xe8, 0xae, 0x00
+	.byte	0x00, 0x00, 0xb4, 0x9a, 0xb0, 0x04, 0x66, 0xbb
+	.byte	0x00, 0x00, 0x00, 0x00, 0xfb, 0xcd, 0x1f, 0xfa
+	.byte	0xb4, 0x9a, 0xb0, 0x03, 0x66, 0xbb, 0x00, 0x00
+	.byte	0x00, 0x00, 0xfb, 0xcd, 0x1f, 0xfa, 0x73, 0x12
+	.byte	0x66, 0xe8, 0x5a, 0x00, 0x00, 0x00, 0xc7, 0x05
+	.byte	0x98, 0x01, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff
+	.byte	0xeb, 0x21, 0x89, 0xc5, 0x66, 0xe8, 0x46, 0x00
+	.byte	0x00, 0x00, 0xb8, 0xff, 0xff, 0x00, 0x00, 0x21
+	.byte	0xc5, 0x21, 0xc1, 0x21, 0xc2, 0x21, 0xc6, 0x21
+	.byte	0xc7, 0xc1, 0xe5, 0x10, 0x09, 0xe9, 0xc1, 0xe7
+	.byte	0x10, 0x09, 0xfe, 0xfa, 0x0f, 0x01, 0x1d, 0xb0
+	.byte	0x01, 0x00, 0x00, 0x8b, 0x25, 0x94, 0x01, 0x00
+	.byte	0x00, 0x8b, 0x2d, 0x98, 0x01, 0x00, 0x00, 0x8b
+	.byte	0x3d, 0x9c, 0x01, 0x00, 0x00, 0x66, 0x8c, 0xe0
+	.byte	0x66, 0x8e, 0xd0, 0x66, 0x8e, 0xc0, 0x66, 0x8e
+	.byte	0xd8, 0x89, 0xe8, 0x0f, 0xa1, 0x5d, 0xcb, 0x00
+	.byte	0xfa, 0x0f, 0x20, 0xc0, 0x66, 0x83, 0xc8, 0x01
+	.byte	0x0f, 0x22, 0xc0, 0x66, 0xea, 0x33, 0x01, 0x00
+	.byte	0x00, 0xe0, 0x00, 0x66, 0xb8, 0xe8, 0x00, 0x8e
+	.byte	0xd8, 0x8e, 0xd0, 0x8e, 0xc0, 0x0f, 0x01, 0x1d
+	.byte	0xb0, 0x01, 0x00, 0x00, 0xc3, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x66, 0xb8, 0xf8, 0x00, 0xea, 0x5b, 0x01, 0x00
+	.byte	0x00, 0xf0, 0x00, 0x8e, 0xd8, 0x8e, 0xd0, 0x8e
+	.byte	0xc0, 0x0f, 0x20, 0xc0, 0x66, 0x83, 0xe0, 0xfe
+	.byte	0x0f, 0x22, 0xc0, 0x66, 0xea, 0x73, 0x01, 0x00
+	.byte	0x00, 0x00, 0x80, 0x8c, 0xc8, 0x8e, 0xd8, 0x8e
+	.byte	0xd0, 0x8e, 0xc0, 0x67, 0x66, 0x0f, 0x01, 0x1d
+	.byte	0xb6, 0x01, 0x00, 0x00, 0x66, 0xc3, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03
+	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+/* Total size = 0x01c0 */
+#else
+/* This file is automatically generated by bin2asm */
+/* Original file is 'apm_initat' */
 
 	.byte	0xfa, 0x55, 0x0f, 0xa0, 0x66, 0x8c, 0xd8, 0x66
 	.byte	0x8e, 0xe0, 0x66, 0xb8, 0xe8, 0x00, 0x66, 0x8e
@@ -59,3 +122,4 @@
 	.byte	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
 /* Total size = 0x01c0 */
+#endif