Nuke the machinery to sync libkern with libc, it's not been used in the

last 15 years and there is no point to use it in the future.

From Jean-Philippe Ouellet

15 files changed, 15 insertions, 100 deletions

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 87480371ea8..3417cd658d3 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.33 2014/05/21 01:17:52 tedu Exp $
+#	$OpenBSD: Makefile,v 1.34 2014/06/09 20:47:10 miod Exp $
 #
 # The NLS (message catalog) functions are always in libc.  To choose that
 # strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
@@ -24,30 +24,6 @@ NLS= 	C.msg Pig.msg da.ISO8859-1.msg da.UTF-8.msg de.ISO8859-1.msg \
 	nl.ISO8859-1.msg nl.UTF-8.msg no.ISO8859-1.msg no.UTF-8.msg \
 	ru.KOI8-R.msg ru.UTF-8.msg sv.ISO8859-1.msg sv.UTF-8.msg
 
-copy-to-libkern:	copy-to-libkern-machind copy-to-libkern-machdep
-
-.if make(copy-to-libkern)
-copy-to-libkern-machind: ${KSRCS}
-	cp -p ${.ALLSRC} ${LIBKERN}
-.if defined(KINCLUDES) && !empty(KINCLUDES)
-	(cd ${.CURDIR} ; cp -p ${KINCLUDES} ${LIBKERN})
-.endif
-
-copy-to-libkern-machdep: ${KMSRCS}
-.if defined(KMSRCS) && !empty(KMSRCS)
-	cp -p ${.ALLSRC} ${LIBKERN}/arch/${MACHINE_CPU}
-.endif
-.if defined(KMINCLUDES) && !empty(KMINCLUDES)
-	(cd ${.CURDIR} ; cp -p ${KMINCLUDES} ${LIBKERN}/arch/${MACHINE_CPU})
-.endif
-
-rm-from-libkern:
-	for i in ${KSRCS}; do rm -f ${LIBKERN}/$$i; done
-.if defined(KMSRCS) && !empty(KMSRCS)
-	for i in ${KMSRCS}; do rm -f ${LIBKERN}/arch/${MACHINE_CPU}/$$i; done
-.endif
-.endif
-
 all: tags
 tags: ${SRCS}
 	ctags -w ${.ALLSRC:M*.c}
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index 42f270b1fdb..095dba4fcd9 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.19 2014/05/12 19:25:16 espie Exp $
+#	$OpenBSD: Makefile.inc,v 1.20 2014/06/09 20:47:10 miod Exp $
 #
 # This file contains make rules used to build libc
 #
@@ -58,15 +58,3 @@ AINC+=  -nostdinc -idirafter ${DESTDIR}/usr/include
 .endif
 
 CFLAGS+=-DNLS
-
-LIBKERN=	${LIBCSRCDIR}/../../sys/lib/libkern
-
-KSRCS=	bcmp.c bzero.c ffs.c strcat.c strcmp.c strcpy.c strlen.c  strncmp.c \
-	strncpy.c strnlen.c htonl.c htons.c ntohl.c ntohs.c timingsafe_bcmp.c
-.if (${MACHINE_CPU} != "alpha")
-KSRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
-	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
-	subdi3.c  ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
-KINCLUDES+=	quad/quad.h
-.endif
-
diff --git a/lib/libc/arch/alpha/Makefile.inc b/lib/libc/arch/alpha/Makefile.inc
index d832133f450..5bfc478e8ef 100644
--- a/lib/libc/arch/alpha/Makefile.inc
+++ b/lib/libc/arch/alpha/Makefile.inc
@@ -1,11 +1,6 @@
-#	$OpenBSD: Makefile.inc,v 1.5 1999/01/20 04:44:58 d Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2014/06/09 20:47:10 miod Exp $
 #	$NetBSD: Makefile.inc,v 1.4 1996/10/17 02:58:18 cgd Exp $
 
-KMINCLUDES=
-KMSRCS=	divrem.m4 bzero.S htonl.S htons.S ntohl.S ntohs.S \
-	byte_swap_2.S byte_swap_4.S ffs.S
-#KMSRCS=	bcmp.S strcat.S strcmp.S strcpy.S strlen.S
-
 # `source' files built from m4 source
 SRCS+=	__divqu.S __divq.S __divlu.S __divl.S
 SRCS+=	__remqu.S __remq.S __remlu.S __reml.S
diff --git a/lib/libc/arch/amd64/Makefile.inc b/lib/libc/arch/amd64/Makefile.inc
index 891bde15d16..8b5442a43ae 100644
--- a/lib/libc/arch/amd64/Makefile.inc
+++ b/lib/libc/arch/amd64/Makefile.inc
@@ -1,4 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.4 2012/01/17 02:34:18 guenther Exp $
-
-KMINCLUDES= arch/amd64/SYS.h
-KMSRCS=	ffs.S htonl.S ntohl.S htons.S ntohs.S
+#	$OpenBSD: Makefile.inc,v 1.5 2014/06/09 20:47:10 miod Exp $
diff --git a/lib/libc/arch/arm/Makefile.inc b/lib/libc/arch/arm/Makefile.inc
index a31c9615f89..429d29db9ee 100644
--- a/lib/libc/arch/arm/Makefile.inc
+++ b/lib/libc/arch/arm/Makefile.inc
@@ -1,12 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.4 2005/08/07 22:12:11 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2014/06/09 20:47:10 miod Exp $
 # $NetBSD: Makefile.inc,v 1.5 2002/07/10 04:29:06 thorpej Exp $
 
 .include <bsd.own.mk>
 
-KMINCLUDES=
-KMSRCS=arch/arm/gen/divsi3.S arch/arm/string/memmove.S \
-	arch/arm/string/memcpy.S
-
 #SRCS+=	__sigaction14_sigtramp.c __sigtramp1.S
 
 CPPFLAGS += -DSOFTFLOAT
diff --git a/lib/libc/arch/hppa/Makefile.inc b/lib/libc/arch/hppa/Makefile.inc
index 3d2e80e9c1c..fe2da80bad1 100644
--- a/lib/libc/arch/hppa/Makefile.inc
+++ b/lib/libc/arch/hppa/Makefile.inc
@@ -1,4 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.7 2004/05/25 20:44:50 mickey Exp $
-
-KMINCLUDES=	arch/hppa/DEFS.h arch/hppa/SYS.h prefix.h
-KMSRCS=
+#	$OpenBSD: Makefile.inc,v 1.8 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/arch/hppa64/Makefile.inc b/lib/libc/arch/hppa64/Makefile.inc
index e55e3d0014c..d8c4bff9a3e 100644
--- a/lib/libc/arch/hppa64/Makefile.inc
+++ b/lib/libc/arch/hppa64/Makefile.inc
@@ -1,4 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2005/04/01 10:54:27 mickey Exp $
-
-KMINCLUDES=	arch/hppa64/DEFS.h arch/hppa64/SYS.h prefix.h
-KMSRCS=
+#	$OpenBSD: Makefile.inc,v 1.2 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/arch/i386/Makefile.inc b/lib/libc/arch/i386/Makefile.inc
index 1b1fc263f5d..7e94acff690 100644
--- a/lib/libc/arch/i386/Makefile.inc
+++ b/lib/libc/arch/i386/Makefile.inc
@@ -1,5 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2012/01/17 21:31:19 mikeb Exp $
-
-KMINCLUDES= arch/i386/SYS.h arch/i386/DEFS.h
-KMSRCS=	bcmp.S bzero.S ffs.S strcat.S strcmp.S strcpy.S htonl.S htons.S \
-	ntohl.S ntohs.S
+#	$OpenBSD: Makefile.inc,v 1.4 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/arch/m88k/Makefile.inc b/lib/libc/arch/m88k/Makefile.inc
index 62e9dc68e4d..60b23aad174 100644
--- a/lib/libc/arch/m88k/Makefile.inc
+++ b/lib/libc/arch/m88k/Makefile.inc
@@ -1,6 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2000/03/01 17:31:20 todd Exp $
-
-KMINCLUDES=	arch/m88k/DEFS.h arch/m88k/SYS.h
-#KMSRCS=	bcmp.S bzero.S ffs.S strcat.c strcmp.S strcpy.S strlen.S strncmp.S \
-#	strncpy.S htonl.S htons.S ntohl.S ntohs.S
-KMSRCS=	htonl.S htons.S ntohl.S ntohs.S
+#	$OpenBSD: Makefile.inc,v 1.3 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/arch/mips64/Makefile.inc b/lib/libc/arch/mips64/Makefile.inc
index 7e333674e53..d8c4bff9a3e 100644
--- a/lib/libc/arch/mips64/Makefile.inc
+++ b/lib/libc/arch/mips64/Makefile.inc
@@ -1,4 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2004/08/11 17:30:59 pefo Exp $
-
-KMINCLUDES=
-KMSRCS=
+#	$OpenBSD: Makefile.inc,v 1.2 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/arch/powerpc/Makefile.inc b/lib/libc/arch/powerpc/Makefile.inc
index 996d06ac0d0..7e94acff690 100644
--- a/lib/libc/arch/powerpc/Makefile.inc
+++ b/lib/libc/arch/powerpc/Makefile.inc
@@ -1,4 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2000/03/01 17:31:22 todd Exp $
-
-KMINCLUDES= arch/powerpc/SYS.h
-KMSRCS=
+#	$OpenBSD: Makefile.inc,v 1.4 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/arch/sparc/Makefile.inc b/lib/libc/arch/sparc/Makefile.inc
index 0298ade72d7..c66455bb654 100644
--- a/lib/libc/arch/sparc/Makefile.inc
+++ b/lib/libc/arch/sparc/Makefile.inc
@@ -1,9 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1999/01/20 04:44:58 d Exp $
-
-KMINCLUDES= arch/sparc/SYS.h arch/sparc/DEFS.h
-KMSRCS=	bzero.S ffs.S strlen.S htonl.S htons.S \
-	ntohl.S ntohs.S divrem.m4 \
-	_setjmp.S mul.S saveregs.S setjmp.S umul.S
+#	$OpenBSD: Makefile.inc,v 1.4 2014/06/09 20:47:11 miod Exp $
 
 # `source' files built from m4 source
 # the name `div.o' is taken for the ANSI C `div' function, hence sdiv here
diff --git a/lib/libc/arch/sparc64/Makefile.inc b/lib/libc/arch/sparc64/Makefile.inc
index fd49eda49ee..f2d9c07ddf7 100644
--- a/lib/libc/arch/sparc64/Makefile.inc
+++ b/lib/libc/arch/sparc64/Makefile.inc
@@ -1,9 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.3 2003/07/21 18:50:11 jason Exp $
-
-KMINCLUDES= arch/sparc64/SYS.h
-KMSRCS=	ffs.S strlen.S htonl.S htons.S \
-	ntohl.S ntohs.S divrem.m4 \
-	_setjmp.S mul.S saveregs.S setjmp.S umul.S
+#	$OpenBSD: Makefile.inc,v 1.4 2014/06/09 20:47:11 miod Exp $
 
 # `source' files built from m4 source
 # the name `div.o' is taken for the ANSI C `div' function, hence sdiv here
diff --git a/lib/libc/arch/vax/Makefile.inc b/lib/libc/arch/vax/Makefile.inc
index fc6fd273297..d8c4bff9a3e 100644
--- a/lib/libc/arch/vax/Makefile.inc
+++ b/lib/libc/arch/vax/Makefile.inc
@@ -1,4 +1 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2002/11/01 20:14:06 miod Exp $
-
-KMINCLUDES= arch/vax/SYS.h arch/vax/DEFS.h
-KMSRCS=
+#	$OpenBSD: Makefile.inc,v 1.2 2014/06/09 20:47:11 miod Exp $
diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc
index 21538c9b6b7..a1fcc4f707b 100644
--- a/lib/libc/quad/Makefile.inc
+++ b/lib/libc/quad/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2010/02/03 20:49:00 miod Exp $
+#	$OpenBSD: Makefile.inc,v 1.6 2014/06/09 20:47:11 miod Exp $
 
 # Quad support
 SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \
@@ -6,8 +6,5 @@ SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \
 	floatunsdidf.c iordi3.c lshldi3.c lshrdi3.c moddi3.c muldi3.c \
 	negdi2.c notdi2.c qdivrem.c subdi3.c ucmpdi2.c udivdi3.c umoddi3.c \
 	xordi3.c
-KSRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
-	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
-	subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
 
 .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/quad ${LIBCSRCDIR}/quad