[src/trunk]: src/sys/lib/libkern Build fix for the mips64 merge:

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

details:   https://anonhg.NetBSD.org/src/rev/e4cb74d600bb
branches:  trunk
changeset: 750032:e4cb74d600bb
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Mon Dec 14 12:18:14 2009 +0000

description:
Build fix for the mips64 merge:
- If memset2.c is in ${SRCS}, exclude conflicting memset.c.
- If MD byte_swap_8.* is in ${SRCS}, exclude conflicting bswap64.c.

diffstat:

 sys/lib/libkern/Makefile.libkern |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 541947ba3bfe -r e4cb74d600bb sys/lib/libkern/Makefile.libkern
--- a/sys/lib/libkern/Makefile.libkern  Mon Dec 14 09:57:37 2009 +0000
+++ b/sys/lib/libkern/Makefile.libkern  Mon Dec 14 12:18:14 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.libkern,v 1.7 2009/11/21 13:37:18 uebayasi Exp $
+#      $NetBSD: Makefile.libkern,v 1.8 2009/12/14 12:18:14 uebayasi Exp $
 
 # 
 # Variable definitions for libkern.  
@@ -57,7 +57,9 @@
 # Other stuff
 SRCS+= __assert.c __main.c
 SRCS+= __cmsg_alignbytes.c cpuset.c inet_addr.c intoa.c
+.if empty(SRCS:Mbyte_swap_8.*)
 SRCS+= bswap64.c
+.endif
 SRCS+= md4c.c md5c.c rmd160.c sha1.c sha2.c
 SRCS+= pmatch.c arc4random.c bcd.c mcount.c mertwist.c crc32.c
 
@@ -67,7 +69,10 @@
 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+= memcmp.c
+.if empty(SRCS:Mmemset2.*)
+SRCS+= memset.c 
+.endif
 SRCS+= popcount32.c popcount64.c
 SRCS+= strtoul.c strtoll.c strtoull.c strtoumax.c
 
@@ -96,4 +101,3 @@
 SRCS := ${SRCS:N${unwanted_file}}
 .endif
 .endfor
-