Module Name: src
Committed By: dsl
Date: Fri Aug 14 19:23:55 UTC 2009
Modified Files:
src/sys/lib/libkern: Makefile.libkern
src/sys/lib/libkern/arch/alpha: Makefile.inc
src/sys/lib/libkern/arch/arm: Makefile.inc
src/sys/lib/libkern/arch/hppa: Makefile.inc
src/sys/lib/libkern/arch/i386: Makefile.inc
src/sys/lib/libkern/arch/ia64: Makefile.inc
src/sys/lib/libkern/arch/m68k: Makefile.inc
src/sys/lib/libkern/arch/mips: Makefile.inc
src/sys/lib/libkern/arch/powerpc: Makefile.inc
src/sys/lib/libkern/arch/sh3: Makefile.inc
src/sys/lib/libkern/arch/sparc: Makefile.inc
src/sys/lib/libkern/arch/sparc64: Makefile.inc
src/sys/lib/libkern/arch/usermode: Makefile.inc
src/sys/lib/libkern/arch/vax: Makefile.inc
src/sys/lib/libkern/arch/x86_64: Makefile.inc
Log Message:
Move that majority of the 'SRCS+= foo.c' into the main Makefile.libkern.
Any .S files added by the arch/*/Makefile.inc cause the .c file to
be excluded.
Specific exclusions added using NO_SRCS to match previous files.
At least sparc, sparc64, i386, amd64 and vax GENERIC still build.
(There is a fubar with the naming of the byte-swap files ...)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.27 -r1.28 src/sys/lib/libkern/arch/alpha/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libkern/arch/arm/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libkern/arch/hppa/Makefile.inc
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libkern/arch/i386/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/arch/ia64/Makefile.inc
cvs rdiff -u -r1.29 -r1.30 src/sys/lib/libkern/arch/m68k/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/sys/lib/libkern/arch/mips/Makefile.inc
cvs rdiff -u -r1.27 -r1.28 src/sys/lib/libkern/arch/powerpc/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/sys/lib/libkern/arch/sh3/Makefile.inc
cvs rdiff -u -r1.33 -r1.34 src/sys/lib/libkern/arch/sparc/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/lib/libkern/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libkern/arch/usermode/Makefile.inc
cvs rdiff -u -r1.22 -r1.23 src/sys/lib/libkern/arch/vax/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/sys/lib/libkern/arch/x86_64/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.4 src/sys/lib/libkern/Makefile.libkern:1.5
--- src/sys/lib/libkern/Makefile.libkern:1.4 Wed Aug 12 21:18:42 2009
+++ src/sys/lib/libkern/Makefile.libkern Fri Aug 14 19:23:53 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.4 2009/08/12 21:18:42 dsl Exp $
+# $NetBSD: Makefile.libkern,v 1.5 2009/08/14 19:23:53 dsl Exp $
#
# Variable definitions for libkern.
@@ -50,17 +50,29 @@
.endif
# Other stuff
+SRCS+= __assert.c __main.c
SRCS+= __cmsg_alignbytes.c cpuset.c inet_addr.c intoa.c
+SRCS+= bswap64.c
SRCS+= md4c.c md5c.c rmd160.c sha1.c sha2.c
SRCS+= pmatch.c arc4random.c bcd.c mcount.c mertwist.c crc32.c
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+= strchr.c strrchr.c
+SRCS+= memcmp.c memset.c
SRCS+= popcount32.c popcount64.c
+SRCS+= strtoul.c strtoll.c strtoull.c strtoumax.c
+
+SRCS+= scanc.c skpc.c
+SRCS+= random.c
-SRCS+= strtoll.c strtoull.c strtoumax.c
+SRCS+= memchr.c
+SRCS+= strcat.c strcmp.c strcpy.c strlen.c
+SRCS+= strncmp.c strncpy.c
+SRCS+= strcasecmp.c strncasecmp.c
SRCS+= xlat_mbr_fstype.c
@@ -70,11 +82,8 @@
CLEANFILES+= lib${LIB}.o lib${LIB}.po
# Remove from SRCS the .c files for any .S files added by the MD makefiles,
-# also remove from SRCS the .c files for the .S and .c files in NO_SRCS.
-#
-# Usage:
-# Add .S files to NO_SRSC when another .S file provides the entry points.
-# Add .c files to NO_SRSC when another .c file provides the entry points.
+# also remove from SRCS the .c files for the .c files in NO_SRCS.
+# (Unlike libc, we don't worry about lint)
.for check_file in ${SRCS:M*.S} ${NO_SRCS}
unwanted_file := ${SRCS:M${check_file:.S=.c}}
Index: src/sys/lib/libkern/arch/alpha/Makefile.inc
diff -u src/sys/lib/libkern/arch/alpha/Makefile.inc:1.27 src/sys/lib/libkern/arch/alpha/Makefile.inc:1.28
--- src/sys/lib/libkern/arch/alpha/Makefile.inc:1.27 Wed Aug 12 21:20:40 2009
+++ src/sys/lib/libkern/arch/alpha/Makefile.inc Fri Aug 14 19:23:53 2009
@@ -1,19 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.27 2009/08/12 21:20:40 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.28 2009/08/14 19:23:53 dsl Exp $
SRCS+= _mcount.S
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
SRCS+= memcpy.S memmove.S
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= bswap64.c
-SRCS+= memchr.c memcmp.c memset.c
SRCS+= softfloat.c
-SRCS+= strcat.c strcmp.c strcpy.c strlen.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strncpy.c strtoul.c
-SRCS+= scanc.c skpc.c
-SRCS+= random.c
# `source' files built from m4 source
SRCS+= __divqu.S __divq.S __divlu.S __divl.S
Index: src/sys/lib/libkern/arch/arm/Makefile.inc
diff -u src/sys/lib/libkern/arch/arm/Makefile.inc:1.8 src/sys/lib/libkern/arch/arm/Makefile.inc:1.9
--- src/sys/lib/libkern/arch/arm/Makefile.inc:1.8 Wed Aug 12 21:20:40 2009
+++ src/sys/lib/libkern/arch/arm/Makefile.inc Fri Aug 14 19:23:53 2009
@@ -1,14 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.8 2009/08/12 21:20:40 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.9 2009/08/14 19:23:53 dsl Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
SRCS+= divsi3.S clzsi2.S
SRCS+= memcmp.S memcpy.S memset.S memmove.S strcmp.S strncmp.S
-
-SRCS+= __assert.c __main.c bswap64.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c random.c scanc.c
-SRCS+= skpc.c strcat.c strcasecmp.c
-SRCS+= strcpy.c strlen.c strncasecmp.c
-SRCS+= strncpy.c strtoul.c ulmax.c ulmin.c
-
-SRCS+= memchr.c
Index: src/sys/lib/libkern/arch/hppa/Makefile.inc
diff -u src/sys/lib/libkern/arch/hppa/Makefile.inc:1.9 src/sys/lib/libkern/arch/hppa/Makefile.inc:1.10
--- src/sys/lib/libkern/arch/hppa/Makefile.inc:1.9 Wed Aug 12 21:20:40 2009
+++ src/sys/lib/libkern/arch/hppa/Makefile.inc Fri Aug 14 19:23:53 2009
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.9 2009/08/12 21:20:40 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.10 2009/08/14 19:23:53 dsl Exp $
SRCS+= milli.S
SRCS+= bcopy.S spcopy.S memcpy.S memmove.S
-SRCS+= __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= random.c ashrdi3.c divdi3.c strncpy.c strncmp.c strcmp.c memchr.c
-SRCS+= memcmp.c memset.c strlen.c strcpy.c
-SRCS+= strcat.c skpc.c strncasecmp.c strtoul.c
-SRCS+= scanc.c ffs.c strlcpy.c bswap16.c bswap32.c bswap64.c
-SRCS+= __assert.c
+SRCS+= ashrdi3.c divdi3.c
+SRCS+= ffs.c bswap16.c bswap32.c
Index: src/sys/lib/libkern/arch/i386/Makefile.inc
diff -u src/sys/lib/libkern/arch/i386/Makefile.inc:1.30 src/sys/lib/libkern/arch/i386/Makefile.inc:1.31
--- src/sys/lib/libkern/arch/i386/Makefile.inc:1.30 Wed Aug 12 22:49:37 2009
+++ src/sys/lib/libkern/arch/i386/Makefile.inc Fri Aug 14 19:23:53 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.30 2009/08/12 22:49:37 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.31 2009/08/14 19:23:53 dsl Exp $
SRCS+= byte_swap_2.S byte_swap_4.S ffs.S
SRCS+= memchr.S memcmp.S memcpy.S memmove.S memset.S
@@ -8,10 +8,4 @@
SRCS+= strrchr.S
SRCS+= scanc.S skpc.S
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= bswap64.c
-SRCS+= strcasecmp.c
-SRCS+= strncasecmp.c
-SRCS+= strncmp.c strncpy.c strtoul.c
SRCS+= crc32.c
Index: src/sys/lib/libkern/arch/ia64/Makefile.inc
diff -u src/sys/lib/libkern/arch/ia64/Makefile.inc:1.3 src/sys/lib/libkern/arch/ia64/Makefile.inc:1.4
--- src/sys/lib/libkern/arch/ia64/Makefile.inc:1.3 Wed Aug 12 21:20:40 2009
+++ src/sys/lib/libkern/arch/ia64/Makefile.inc Fri Aug 14 19:23:54 2009
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/08/12 21:20:40 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.4 2009/08/14 19:23:54 dsl Exp $
#
-SRCS+= __assert.c __main.c memset.c skpc.c scanc.c random.c
-SCRS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SCRS+= strcasecmp.c strncasecmp.c strncmp.c strtoul.c ffs.c
-SCRS+= strncpy.c memcmp.c strcat.c strcpy.c strcmp.c strlen.c
-SCRS+= memchr.c
+SRCS+= ffs.c
SRCS+= divdi3.S divsi3.S modsi3.S moddi3.S udivdi3.S udivsi3.S
-SCRS+= umoddi3.S umodsi3.S bswap64.S bswap32.S bswap16.S ntohl.S htonl.S
-SCRS+= memcpy.S
+SRCS+= umoddi3.S umodsi3.S bswap64.S bswap32.S bswap16.S ntohl.S htonl.S
+SRCS+= memcpy.S
Index: src/sys/lib/libkern/arch/m68k/Makefile.inc
diff -u src/sys/lib/libkern/arch/m68k/Makefile.inc:1.29 src/sys/lib/libkern/arch/m68k/Makefile.inc:1.30
--- src/sys/lib/libkern/arch/m68k/Makefile.inc:1.29 Wed Aug 12 21:24:57 2009
+++ src/sys/lib/libkern/arch/m68k/Makefile.inc Fri Aug 14 19:23:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.29 2009/08/12 21:24:57 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.30 2009/08/14 19:23:54 dsl Exp $
SRCS+= bswap16.S bswap32.S bswap64.S
SRCS+= memcmp.S memcpy.S memmove.S memset.S
@@ -8,16 +8,8 @@
SRCS+= htonl.S htons.S ntohl.S ntohs.S
SRCS+= ffs.S
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= memchr.c
-SRCS+= strcasecmp.c
-SRCS+= strncasecmp.c
-SRCS+= strtoul.c
-
.if defined(MACHINE_ARCH) && (${MACHINE_ARCH} == "m68000")
SRCS+= mulsi3.S divsi3.S udivsi3.S modsi3.S umodsi3.S
-SRCS+= random.c
random.o random.d: random.c
.else
SRCS+= random.S
Index: src/sys/lib/libkern/arch/mips/Makefile.inc
diff -u src/sys/lib/libkern/arch/mips/Makefile.inc:1.19 src/sys/lib/libkern/arch/mips/Makefile.inc:1.20
--- src/sys/lib/libkern/arch/mips/Makefile.inc:1.19 Wed Aug 12 21:20:40 2009
+++ src/sys/lib/libkern/arch/mips/Makefile.inc Fri Aug 14 19:23:54 2009
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.19 2009/08/12 21:20:40 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.20 2009/08/14 19:23:54 dsl Exp $
#
# There are likely more that we will notice when we go native
-SRCS+= __assert.c bswap64.c memchr.c memcmp.c memset.c random.c scanc.c
-SRCS+= skpc.c strcat.c strcpy.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strncpy.c strtoul.c
+NO_SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
+NO_SRCS+= __main.c
SRCS+= byte_swap_2.S byte_swap_4.S ffs.S memcpy.S memset.S memmove.S
SRCS+= strlen.S strcmp.S
Index: src/sys/lib/libkern/arch/powerpc/Makefile.inc
diff -u src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.27 src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.28
--- src/sys/lib/libkern/arch/powerpc/Makefile.inc:1.27 Wed Aug 12 21:20:40 2009
+++ src/sys/lib/libkern/arch/powerpc/Makefile.inc Fri Aug 14 19:23:54 2009
@@ -1,14 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.27 2009/08/12 21:20:40 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.28 2009/08/14 19:23:54 dsl Exp $
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= bswap16.c bswap32.c bswap64.c
-SRCS+= memchr.c memcmp.c
-SRCS+= strcat.c strcmp.c strcpy.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strncpy.c
-SRCS+= scanc.c skpc.c
+SRCS+= bswap16.c bswap32.c
SRCS+= htonl.c htons.c ntohl.c ntohs.c
-SRCS+= random.c strtoul.c
SRCS+= syncicache.c
SRCS+= ffs.S memset.S strlen.S
Index: src/sys/lib/libkern/arch/sh3/Makefile.inc
diff -u src/sys/lib/libkern/arch/sh3/Makefile.inc:1.17 src/sys/lib/libkern/arch/sh3/Makefile.inc:1.18
--- src/sys/lib/libkern/arch/sh3/Makefile.inc:1.17 Wed Aug 12 21:20:41 2009
+++ src/sys/lib/libkern/arch/sh3/Makefile.inc Fri Aug 14 19:23:54 2009
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.17 2009/08/12 21:20:41 dsl Exp $
-
-SRCS+= __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= scanc.c skpc.c
-SRCS+= strcat.c strcmp.c strcpy.c strlen.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strtoul.c
-SRCS+= strncpy.c random.c __assert.c memchr.c memcmp.c
+# $NetBSD: Makefile.inc,v 1.18 2009/08/14 19:23:54 dsl Exp $
SRCS+= ffs.S
SRCS+= memset.S
SRCS+= memmove.S memcpy.S byte_swap_2.S byte_swap_4.S byte_swap_8.S
SRCS+= ashiftrt.S ashlsi3.S ashrsi3.S lshrsi3.S movstr.S movstr_i4.S
SRCS+= movstrSI.S movstrSI12_i4.S mulsi3.S sdivsi3.S udivsi3.S
+
+NO_SRCS+= bswap64.c
Index: src/sys/lib/libkern/arch/sparc/Makefile.inc
diff -u src/sys/lib/libkern/arch/sparc/Makefile.inc:1.33 src/sys/lib/libkern/arch/sparc/Makefile.inc:1.34
--- src/sys/lib/libkern/arch/sparc/Makefile.inc:1.33 Wed Aug 12 21:20:41 2009
+++ src/sys/lib/libkern/arch/sparc/Makefile.inc Fri Aug 14 19:23:54 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.33 2009/08/12 21:20:41 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.34 2009/08/14 19:23:54 dsl Exp $
SRCS+= ffs.S
SRCS+= memset.S
@@ -6,13 +6,7 @@
SRCS+= htonl.S htons.S ntohl.S ntohs.S
SRCS+= random.S
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= bswap16.c bswap32.c bswap64.c
-SRCS+= memchr.c memcmp.c
-SRCS+= strcat.c strcmp.c strcpy.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strncpy.c strtoul.c
-SRCS+= scanc.c skpc.c
+SRCS+= bswap16.c bswap32.c
SRCS+= mul.S umul.S saveregs.S
Index: src/sys/lib/libkern/arch/sparc64/Makefile.inc
diff -u src/sys/lib/libkern/arch/sparc64/Makefile.inc:1.9 src/sys/lib/libkern/arch/sparc64/Makefile.inc:1.10
--- src/sys/lib/libkern/arch/sparc64/Makefile.inc:1.9 Wed Aug 12 21:20:41 2009
+++ src/sys/lib/libkern/arch/sparc64/Makefile.inc Fri Aug 14 19:23:55 2009
@@ -1,17 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.9 2009/08/12 21:20:41 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.10 2009/08/14 19:23:55 dsl Exp $
SRCS+= ffs.S
SRCS+= strlen.S
SRCS+= htonl.S htons.S ntohl.S ntohs.S
SRCS+= random.S
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= bswap16.c bswap32.c bswap64.c
-SRCS+= memchr.c memcmp.c memset.c
-SRCS+= strcat.c strcmp.c strcpy.c strtoul.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strncpy.c
-SRCS+= scanc.c skpc.c
+SRCS+= bswap16.c bswap32.c
SRCS+= umul.S mul.S rem.S sdiv.S udiv.S umul.S urem.S
SRCS+= mul.S saveregs.S umul.S
Index: src/sys/lib/libkern/arch/usermode/Makefile.inc
diff -u src/sys/lib/libkern/arch/usermode/Makefile.inc:1.2 src/sys/lib/libkern/arch/usermode/Makefile.inc:1.3
--- src/sys/lib/libkern/arch/usermode/Makefile.inc:1.2 Wed Aug 12 21:20:41 2009
+++ src/sys/lib/libkern/arch/usermode/Makefile.inc Fri Aug 14 19:23:55 2009
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/08/12 21:20:41 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.3 2009/08/14 19:23:55 dsl Exp $
#
# There are likely more that we will notice when we go native
-SRCS+= __assert.c bswap64.c memchr.c memcmp.c memset.c random.c scanc.c
-SRCS+= skpc.c strcat.c strcpy.c strcasecmp.c
-SRCS+= strncasecmp.c strncmp.c strncpy.c strtoul.c
+NO_SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
+NO_SRCS+= __main.c strlen.c strcmp.c
Index: src/sys/lib/libkern/arch/vax/Makefile.inc
diff -u src/sys/lib/libkern/arch/vax/Makefile.inc:1.22 src/sys/lib/libkern/arch/vax/Makefile.inc:1.23
--- src/sys/lib/libkern/arch/vax/Makefile.inc:1.22 Wed Aug 12 21:20:41 2009
+++ src/sys/lib/libkern/arch/vax/Makefile.inc Fri Aug 14 19:23:55 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2009/08/12 21:20:41 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.23 2009/08/14 19:23:55 dsl Exp $
#
# The rest of the lib routines are in machine/macros.h
#
@@ -7,7 +7,6 @@
SRCS+= random.S
SRCS+= udiv.S urem.S
-SRCS+= __assert.c
-SRCS+= __main.c memchr.c memcmp.c
-SRCS+= strcasecmp.c strcat.c strcmp.c strcpy.c strncasecmp.c strncmp.c
-SRCS+= strncpy.c strlen.c strtoul.c
+NO_SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
+NO_SRCS+= memset.c
+NO_SRCS+= scanc.c skpc.c
Index: src/sys/lib/libkern/arch/x86_64/Makefile.inc
diff -u src/sys/lib/libkern/arch/x86_64/Makefile.inc:1.4 src/sys/lib/libkern/arch/x86_64/Makefile.inc:1.5
--- src/sys/lib/libkern/arch/x86_64/Makefile.inc:1.4 Wed Aug 12 21:20:41 2009
+++ src/sys/lib/libkern/arch/x86_64/Makefile.inc Fri Aug 14 19:23:55 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/08/12 21:20:41 dsl Exp $
+# $NetBSD: Makefile.inc,v 1.5 2009/08/14 19:23:55 dsl Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
@@ -8,10 +8,3 @@
SRCS+= strrchr.S
SRCS+= scanc.S skpc.S
SRCS+= random.S
-
-SRCS+= __main.c __assert.c
-SRCS+= imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c
-SRCS+= bswap64.c
-SRCS+= strcasecmp.c
-SRCS+= strncasecmp.c
-SRCS+= strncmp.c strncpy.c strtoul.c
