[src/trunk]: src/sys/lib/libkern Make sparc64 32-bit kernel buildable.

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71613402d654
branches:  trunk
changeset: 785448:71613402d654
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Thu Mar 14 11:53:33 2013 +0000

description:
Make sparc64 32-bit kernel buildable.

diffstat:

 sys/lib/libkern/Makefile.libkern        |  4 ++--
 sys/lib/libkern/arch/sparc/Makefile.inc |  5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 891f412c270e -r 71613402d654 sys/lib/libkern/Makefile.libkern
--- a/sys/lib/libkern/Makefile.libkern  Thu Mar 14 10:06:45 2013 +0000
+++ b/sys/lib/libkern/Makefile.libkern  Thu Mar 14 11:53:33 2013 +0000
@@ -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+= 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.*)
diff -r 891f412c270e -r 71613402d654 sys/lib/libkern/arch/sparc/Makefile.inc
--- a/sys/lib/libkern/arch/sparc/Makefile.inc   Thu Mar 14 10:06:45 2013 +0000
+++ b/sys/lib/libkern/arch/sparc/Makefile.inc   Thu Mar 14 11:53:33 2013 +0000
@@ -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