Module Name: src
Committed By: christos
Date: Sun Mar 10 07:31:03 UTC 2013
Modified Files:
src/sys/lib/libkern: Makefile.libkern
Log Message:
On sparc64 memcpy and memset are provided by memcpyset.s (should have been
memcpyset.S, but...). Don't include them in the build because it breaks the
modular build where the kernel library is built as an object.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/lib/libkern/Makefile.libkern
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.19 src/sys/lib/libkern/Makefile.libkern:1.20
--- src/sys/lib/libkern/Makefile.libkern:1.19 Wed Jan 23 17:34:37 2013
+++ src/sys/lib/libkern/Makefile.libkern Sun Mar 10 03:31:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.19 2013/01/23 22:34:37 matt Exp $
+# $NetBSD: Makefile.libkern,v 1.20 2013/03/10 07:31:03 christos Exp $
#
# Variable definitions for libkern.
@@ -70,12 +70,16 @@ SRCS+= strsep.c strstr.c
SRCS+= strlcpy.c strlcat.c
SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= memcpy.c memmove.c
+SRCS+= memmove.c
SRCS+= strchr.c strrchr.c
SRCS+= memcmp.c
+
+.if (${MACHINE_ARCH} != "sparc64") # provided by memcpyset.s
+SRCS+= memcpy.c
.if empty(SRCS:Mmemset2.*)
SRCS+= memset.c
.endif
+.endif
SRCS+= popcount32.c popcount64.c
SRCS+= strtoul.c strtoll.c strtoull.c strtoumax.c
