mvme68k/stand patch for MI libsa and libkern

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

Could anyone test the following patch that makes
mvme68k/stand loaders use MI libsa and libkern?

Changes should be trivial, but there might be some botches.

---
Index: Makefile.booters
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/Makefile.booters,v
retrieving revision 1.18
diff -u -r1.18 Makefile.booters
--- Makefile.booters    11 Apr 2009 10:56:12 -0000      1.18
+++ Makefile.booters    11 Apr 2009 11:59:38 -0000
@@ -70,18 +70,8 @@
 
 LIB_SA_DIR=    ${.CURDIR}/../libsa
 LIBSA_DIR!=    cd ${LIB_SA_DIR} && ${PRINTOBJDIR}
-LIBSA=${LIBSA_DIR}/libsa.a
-
-.PHONY: ${LIBSA}
-${LIBSA}:
-       @echo making sure the libsa is up to date...
-       @cd ${LIB_SA_DIR} && ${MAKE}
-
-SRTOBJ?= ${LIBSA_DIR}/SRT0.o
-.PHONY: ${SRTOBJ}
-${SRTOBJ}:
-       @echo making sure the libsa is up to date...
-       @cd ${LIB_SA_DIR} && ${MAKE} SRT0.o
+LIBSA=         ${LIBSA_DIR}/lib/sa/libsa.a
+LIBKERN=       ${LIBSA_DIR}/lib/kern/libkern.a
 
 LIB_BUG_DIR=   ${.CURDIR}/../libbug
 LIBBUG_DIR!=   cd ${LIB_BUG_DIR} && ${PRINTOBJDIR}
Index: bootsd/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/bootsd/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- bootsd/Makefile     4 Dec 2000 21:25:58 -0000       1.6
+++ bootsd/Makefile     11 Apr 2009 11:59:38 -0000
@@ -3,7 +3,7 @@
 
 SRCS=   boot.c conf.c
 PROG=  bootsd 
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD= ${LIBS}
 
 .include "../Makefile.booters"
Index: bootst/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/bootst/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- bootst/Makefile     9 Feb 2002 09:36:00 -0000       1.14
+++ bootst/Makefile     11 Apr 2009 11:59:38 -0000
@@ -5,7 +5,7 @@
 
 PROG=bootst.bug
 SRCS=   boot.c conf.c dev_tape.c rawfs.c
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 SRTOBJ=
 DPADD= ${LIBS} ${WRTVID}
 
Index: bootxx/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/bootxx/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- bootxx/Makefile     5 Dec 2000 21:51:38 -0000       1.8
+++ bootxx/Makefile     11 Apr 2009 11:59:38 -0000
@@ -6,7 +6,7 @@
 
 SRCS=   bootxx.c conf.c block_x.S
 PROG=  bootxx
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD= ${LIBS}
 SRTOBJ=
 
Index: libsa/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/libsa/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- libsa/Makefile      19 Mar 2009 10:19:33 -0000      1.30
+++ libsa/Makefile      11 Apr 2009 11:59:38 -0000
@@ -1,50 +1,6 @@
 #      $NetBSD: Makefile,v 1.30 2009/03/19 10:19:33 tsutsui Exp $
 
-LIB=sa
-
-# Logically src/sys
-DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
-DIR_LIBC=$S/../common/lib/libc
-
-SRC_net= arp.c \
-        bootp.c bootparam.c \
-        dev_net.c \
-        ether.c \
-        ip_cksum.c \
-        net.c netif.c nfs.c \
-        rarp.c rpc.c
-
-SRC_sa= alloc.c \
-       close.c closeall.c \
-       dev.c dev_net.c dkcksum.c \
-       ether_sprintf.c exit.c \
-       files.c fstat.c \
-       getfile.c gets.c globals.c \
-       intoa.c \
-       loadfile.c loadfile_aout.c loadfile_elf32.c lseek.c \
-       memmove.c memcmp.c memcpy.c memset.c \
-       nullfs.c \
-       open.c \
-       panic.c printf.c \
-       read.c \
-       snprintf.c sprintf.c strerror.c subr_prf.c \
-       twiddle.c \
-       udp.c ufs.c
-
-SRC_common+= ashrdi3.c inet_addr.c strncpy.c strlen.c
-
-SRC_libc_inet= inet_addr.c
-SRC_libc_quad= ashldi3.c ashrdi3.c
-SRC_libc_string= strcmp.c strlen.c strncpy.c
-
-SRC_mvme= exec_mvme.c
-
-SRC_here= bugdev.c \
-         chiptotime.c clock.c \
-         parse_args.c
-
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_common} ${SRC_mvme} ${SRC_here}
+S!= cd ${.CURDIR}/../../../..; pwd
 
 # DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
 #      -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
@@ -58,16 +14,30 @@
 CLEANFILES+= SRT0.o
 
 .include "../Makefile.booters"
-.include "${S}/../common/lib/libc/Makefile.inc"
-
-.PATH: ${DIR_SA} ${DIR_KERN} \
-       ${DIR_LIBC}/inet ${DIR_LIBC}/quad ${DIR_LIBC}/string
 
 # only needed during build
 libinstall::
 
-all realall: lib${LIB}.a SRT0.o
+all realall: SRT0.o
+
+.include <bsd.prog.mk>
+
+### find out what to use for libsa
+SA_AS= library
+SAMISCMAKEFLAGS= SA_USE_LOADFILE=yes SA_EXTRADIR=${.CURDIR}
+.include "${S}/lib/libsa/Makefile.inc"
+LIBSA= ${SALIB}
+
+### find out what to use for libkern
+KERN_AS= library
+.include "${S}/lib/libkern/Makefile.inc"
+LIBKERN= ${KERNLIB}
+
+LIBS= ${LIBSA} ${LIBKERN}
+
+all realall: ${LIBS}
+
+cleandir distclean: cleanlibdir
 
-.include <bsd.own.mk>
-.undef DESTDIR
-.include <bsd.lib.mk>
+cleanlibdir:
+       -rm -rf lib
Index: netboot/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/mvme68k/stand/netboot/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- netboot/Makefile    10 Apr 2002 18:43:21 -0000      1.15
+++ netboot/Makefile    11 Apr 2009 11:59:38 -0000
@@ -5,7 +5,7 @@
 SRCS=   boot.c conf.c devopen.c
 SRCS+= if_ie.c if_le.c
 PROG=  netboot
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD= ${LIBS}
 CLEANFILES+= netboot.bin
 
--- /dev/null   2009-04-11 20:42:28.000000000 +0900
+++ libsa/Makefile.inc  2009-04-11 20:42:18.000000000 +0900
@@ -0,0 +1,15 @@
+#      $NetBSD$
+
+S!= cd ${SA_EXTRADIR}/../../../..; pwd
+
+.PATH.c: ${SA_EXTRADIR}
+
+SRC_sa=   dev_net.c
+
+SRC_mvme= exec_mvme.c
+
+SRC_here= bugdev.c \
+         chiptotime.c clock.c \
+         parse_args.c
+
+SRCS= ${SRC_sa} ${SRC_mvme} ${SRC_here}

---
Izumi Tsutsui