pass MACHINE{,_ARCH} into libkern/Makefile so cross-build works

no 64bit math for sgi (;

3 files changed, 9 insertions, 6 deletions

diff --git a/sys/lib/libkern/Makefile b/sys/lib/libkern/Makefile
index a491d6c7871..17f1e76bb79 100644
--- a/sys/lib/libkern/Makefile
+++ b/sys/lib/libkern/Makefile
@@ -1,9 +1,12 @@
-#	$OpenBSD: Makefile,v 1.11 1997/11/30 21:30:12 mickey Exp $
+#	$OpenBSD: Makefile,v 1.12 1998/03/18 20:47:04 mickey Exp $
 #	$NetBSD: Makefile,v 1.31 1996/08/10 04:01:31 mycroft Exp $
 
 LIB=	kern
 NOPIC=
 
+MACHINE=	${XMACHINE}
+MACHINE_ARCH=	${XMACHINE_ARCH}
+
 M=	${.CURDIR}/arch/${MACHINE_ARCH}
 
 CPPFLAGS=	-I$M ${KERNCPPFLAGS}
@@ -13,7 +16,7 @@ CPPFLAGS=	-I$M ${KERNCPPFLAGS}
 .include "$M/Makefile.inc"
 .endif
 
-.if (${MACHINE_ARCH} != "alpha")
+.if (${MACHINE_ARCH} != "alpha" && ${MACHINE} != "sgi")
 # Quad support
 SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
 	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
diff --git a/sys/lib/libkern/Makefile.inc b/sys/lib/libkern/Makefile.inc
index e43456e89dd..b9acdf8a1de 100644
--- a/sys/lib/libkern/Makefile.inc
+++ b/sys/lib/libkern/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.9 1998/02/14 02:37:06 d Exp $
+#	$OpenBSD: Makefile.inc,v 1.10 1998/03/18 20:47:07 mickey Exp $
 #	$NetBSD: Makefile.inc,v 1.22 1996/09/30 15:54:35 ws Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
@@ -23,7 +23,7 @@ KERNMAKE= \
 	    LD='${LD}' STRIP='${STRIP}' \
 	    CPP='${CPP}' STRIP='${STRIP}' AR='${AR}' \
 	    NM='${NM}' LORDER='${LORDER}' \
-	    MACHINE='${MACHINE}' MACHINE_ARCH='${MACHINE_ARCH}' \
+	    XMACHINE='${MACHINE}' XMACHINE_ARCH='${MACHINE_ARCH}' \
 	    KERNCPPFLAGS='${CPPFLAGS:S@^-I.@-I../../.@g}'
 
 ${KERNLIB}:		.NOTMAIN __always_make_kernlib
diff --git a/sys/lib/libkern/arch/mips/Makefile.inc b/sys/lib/libkern/arch/mips/Makefile.inc
index d60ae259ebb..d1c939cbba3 100644
--- a/sys/lib/libkern/arch/mips/Makefile.inc
+++ b/sys/lib/libkern/arch/mips/Makefile.inc
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1997/11/04 19:08:10 chuck Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 1998/03/18 20:47:10 mickey Exp $
 #	$NetBSD: Makefile.inc,v 1.4 1996/04/13 01:17:46 cgd Exp $
 #
 #	There are likely more that we will notice when we go native
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
-	memchr.c \
+	memchr.c strcmp.c \
 	bcmp.S bcopy.S bzero.S strcat.c strcmp.c strcpy.c ffs.S htonl.S \
 	htons.S strcmp.S strlen.S strncmp.c random.c scanc.c skpc.c strncpy.c \
 	strncasecmp.c