Module Name: src
Committed By: nakayama
Date: Thu Mar 14 11:53:34 UTC 2013
Modified Files:
src/sys/lib/libkern: Makefile.libkern
src/sys/lib/libkern/arch/sparc: Makefile.inc
Log Message:
Make sparc64 32-bit kernel buildable.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.34 -r1.35 src/sys/lib/libkern/arch/sparc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.21 src/sys/lib/libkern/Makefile.libkern:1.22
--- src/sys/lib/libkern/Makefile.libkern:1.21 Mon Mar 11 11:44:48 2013
+++ src/sys/lib/libkern/Makefile.libkern Thu Mar 14 11:53:33 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.21 2013/03/11 11:44:48 christos Exp $
+# $NetBSD: Makefile.libkern,v 1.22 2013/03/14 11:53:33 nakayama Exp $
#
# Variable definitions for libkern.
@@ -74,7 +74,7 @@ SRCS+= memmove.c
SRCS+= strchr.c strrchr.c
SRCS+= memcmp.c
-.if (${MACHINE_ARCH} != "sparc64") || defined(RUMPTOP)
+.if (${MACHINE} != "sparc64") || defined(RUMPTOP)
# provided by memcpyset.s on sparc64, but RUMP does not know about it.
SRCS+= memcpy.c
.if empty(SRCS:Mmemset2.*)
Index: src/sys/lib/libkern/arch/sparc/Makefile.inc
diff -u src/sys/lib/libkern/arch/sparc/Makefile.inc:1.34 src/sys/lib/libkern/arch/sparc/Makefile.inc:1.35
--- src/sys/lib/libkern/arch/sparc/Makefile.inc:1.34 Fri Aug 14 19:23:54 2009
+++ src/sys/lib/libkern/arch/sparc/Makefile.inc Thu Mar 14 11:53:34 2013
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.34 2009/08/14 19:23:54 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.35 2013/03/14 11:53:34 nakayama Exp $
SRCS+= ffs.S
+.if (${MACHINE} != "sparc64") || defined(RUMPTOP)
+# provided by memcpyset.s on sparc64 32-bit kernel
SRCS+= memset.S
+.endif
SRCS+= strlen.S
SRCS+= htonl.S htons.S ntohl.S ntohs.S
SRCS+= random.S
