Get rid of more unwanted pieces of code.

11 files changed, 0 insertions, 760 deletions

diff --git a/sys/lib/libkern/arch/arm32/Makefile.inc b/sys/lib/libkern/arch/arm32/Makefile.inc
deleted file mode 100644
index 74717b8cfdf..00000000000
--- a/sys/lib/libkern/arch/arm32/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.5 2000/12/18 18:40:45 provos Exp $
-
-SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
-	memchr.c memcmp.c \
-	bcmp.c bzero.c ffs.c strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c \
-	strlen.c strncmp.c \
-	strncpy.c scanc.c skpc.c locc.c htonl.c htons.c ntohl.c ntohs.c \
-	div.S random.c strncasecmp.c
diff --git a/sys/lib/libkern/arch/arm32/div.S b/sys/lib/libkern/arch/arm32/div.S
deleted file mode 100644
index 92c1b6f73c0..00000000000
--- a/sys/lib/libkern/arch/arm32/div.S
+++ /dev/null
@@ -1,353 +0,0 @@
-/* $OpenBSD: div.S,v 1.3 1997/11/07 15:56:58 niklas Exp $ */
-/* $NetBSD: div.S,v 1.2 1996/04/26 20:05:28 mark Exp $ */
-
-/*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by NetBSD Project
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-a1	.req	r0
-a2	.req	r1
-a3	.req	r2
-a4	.req	r3
-v1	.req	r4
-v2	.req	r5
-v3	.req	r6
-v4	.req	r7
-v5	.req	r8
-v6	.req	r9
-v7	.req	r10
-fp	.req	r11
-ip	.req	r12
-sp	.req	r13
-lr	.req	r14
-pc	.req	r15
-
-.text
-
-	.global	__rt_sdiv
-__rt_sdiv:
-	b	x_divide
-
-	.global	__rt_udiv
-__rt_udiv:
-	b	x_udivide
-
-	.global	___umodsi3
-___umodsi3:
-	mov	a3, a1
-	mov	a1, a2
-	mov	a2, a3
-	b	x_uremainder
-
-	.global	___udivsi3
-___udivsi3:
-	mov	a3, a1
-	mov	a1, a2
-	mov	a2, a3
-	b	x_udivide
-
-	.global	___modsi3
-___modsi3:
-	mov	a3, a1
-	mov	a1, a2
-	mov	a2, a3
-	b	x_remainder
-
-	.global	___divsi3
-___divsi3:
-	mov	a3, a1
-	mov	a1, a2
-	mov	a2, a3
-	b	x_divide
-
-	.global	x_divtest
-x_divtest:
-	mov	pc,lr
-
-	.global	x_remainder
-x_remainder:
-	stmfd	sp!,{lr}
-	bl	x_divide
-	mov	a1,a2
-	ldmfd	sp!,{pc}
-
-	.global	x_uremainder
-x_uremainder:
-	stmfd	sp!,{lr}
-	bl	x_udivide
-	mov	a1,a2
-	ldmfd	sp!,{pc}
-
-x_overflow:
-	mvn	a1,#0
-	mov	pc,lr
-
-	.global	x_udivide		/* a1 = a2 / a1; a2 = a2 % a1 */
-x_udivide:
-	cmp	a1,#1
-	bcc	x_overflow
-	beq	x_divide_l0
-	mov	ip,#0
-	movs	a2,a2
-	bpl	x_divide_l1
-	orr	ip,ip,#0x20000000	/* ip bit 0x20000000 = -ve a2 */
-	movs	a2,a2,lsr #1
-	orrcs	ip,ip,#0x10000000	/* ip bit 0x10000000 = bit 0 of a2 */
-	b	x_divide_l1
-
-x_divide_l0:				/* a1 == 1 */
-	mov	a1,a2
-	mov	a2,#0
-	mov	pc,lr
-
-	.global	x_divide		/* a1 = a2 / a1; a2 = a2 % a1 */
-x_divide:
-	cmp	a1,#1
-	bcc	x_overflow
-	beq	x_divide_l0
-	ands	ip,a1,#0x80000000
-	rsbmi	a1,a1,#0
-	ands	a3,a2,#0x80000000
-	eor	ip,ip,a3
-	rsbmi	a2,a2,#0
-	orr	ip,a3,ip,lsr #1	/* ip bit 0x40000000 = -ve division */
-				/* ip bit 0x80000000 = -ve remainder */
-
-x_divide_l1:
-	mov	a3,#1
-	mov	a4,#0
-
-	cmp	a2,a1
-	bcc	x_divide_b0
-	cmp	a2,a1,lsl #1
-	bcc	x_divide_b1
-	cmp	a2,a1,lsl #2
-	bcc	x_divide_b2
-	cmp	a2,a1,lsl #3
-	bcc	x_divide_b3
-	cmp	a2,a1,lsl #4
-	bcc	x_divide_b4
-	cmp	a2,a1,lsl #5
-	bcc	x_divide_b5
-	cmp	a2,a1,lsl #6
-	bcc	x_divide_b6
-	cmp	a2,a1,lsl #7
-	bcc	x_divide_b7
-	cmp	a2,a1,lsl #8
-	bcc	x_divide_b8
-	cmp	a2,a1,lsl #9
-	bcc	x_divide_b9
-	cmp	a2,a1,lsl #10
-	bcc	x_divide_b10
-	cmp	a2,a1,lsl #11
-	bcc	x_divide_b11
-	cmp	a2,a1,lsl #12
-	bcc	x_divide_b12
-	cmp	a2,a1,lsl #13
-	bcc	x_divide_b13
-	cmp	a2,a1,lsl #14
-	bcc	x_divide_b14
-	cmp	a2,a1,lsl #15
-	bcc	x_divide_b15
-	cmp	a2,a1,lsl #16
-	bcc	x_divide_b16
-	cmp	a2,a1,lsl #17
-	bcc	x_divide_b17
-	cmp	a2,a1,lsl #18
-	bcc	x_divide_b18
-	cmp	a2,a1,lsl #19
-	bcc	x_divide_b19
-	cmp	a2,a1,lsl #20
-	bcc	x_divide_b20
-	cmp	a2,a1,lsl #21
-	bcc	x_divide_b21
-	cmp	a2,a1,lsl #22
-	bcc	x_divide_b22
-	cmp	a2,a1,lsl #23
-	bcc	x_divide_b23
-	cmp	a2,a1,lsl #24
-	bcc	x_divide_b24
-	cmp	a2,a1,lsl #25
-	bcc	x_divide_b25
-	cmp	a2,a1,lsl #26
-	bcc	x_divide_b26
-	cmp	a2,a1,lsl #27
-	bcc	x_divide_b27
-	cmp	a2,a1,lsl #28
-	bcc	x_divide_b28
-	cmp	a2,a1,lsl #29
-	bcc	x_divide_b29
-	cmp	a2,a1,lsl #30
-	bcc	x_divide_b30
-	cmp	a2,a1,lsl #31
-	subhs	a2,a2,a1,lsl #31
-	addhs	a4,a4,a3,lsl #31
-	cmp	a2,a1,lsl #30
-	subhs	a2,a2,a1,lsl #30
-	addhs	a4,a4,a3,lsl #30
-x_divide_b30:
-	cmp	a2,a1,lsl #29
-	subhs	a2,a2,a1,lsl #29
-	addhs	a4,a4,a3,lsl #29
-x_divide_b29:
-	cmp	a2,a1,lsl #28
-	subhs	a2,a2,a1,lsl #28
-	addhs	a4,a4,a3,lsl #28
-x_divide_b28:
-	cmp	a2,a1,lsl #27
-	subhsS	a2,a2,a1,lsl #27
-	addhs	a4,a4,a3,lsl #27
-x_divide_b27:
-	cmp	a2,a1,lsl #26
-	subhs	a2,a2,a1,lsl #26
-	addhs	a4,a4,a3,lsl #26
-x_divide_b26:
-	cmp	a2,a1,lsl #25
-	subhs	a2,a2,a1,lsl #25
-	addhs	a4,a4,a3,lsl #25
-x_divide_b25:
-	cmp	a2,a1,lsl #24
-	subhs	a2,a2,a1,lsl #24
-	addhs	a4,a4,a3,lsl #24
-x_divide_b24:
-	cmp	a2,a1,lsl #23
-	subhs	a2,a2,a1,lsl #23
-	addhs	a4,a4,a3,lsl #23
-x_divide_b23:
-	cmp	a2,a1,lsl #22
-	subhs	a2,a2,a1,lsl #22
-	addhs	a4,a4,a3,lsl #22
-x_divide_b22:
-	cmp	a2,a1,lsl #21
-	subhs	a2,a2,a1,lsl #21
-	addhs	a4,a4,a3,lsl #21
-x_divide_b21:
-	cmp	a2,a1,lsl #20
-	subhs	a2,a2,a1,lsl #20
-	addhs	a4,a4,a3,lsl #20
-x_divide_b20:
-	cmp	a2,a1,lsl #19
-	subhs	a2,a2,a1,lsl #19
-	addhs	a4,a4,a3,lsl #19
-x_divide_b19:
-	cmp	a2,a1,lsl #18
-	subhs	a2,a2,a1,lsl #18
-	addhs	a4,a4,a3,lsl #18
-x_divide_b18:
-	cmp	a2,a1,lsl #17
-	subhs	a2,a2,a1,lsl #17
-	addhs	a4,a4,a3,lsl #17
-x_divide_b17:
-	cmp	a2,a1,lsl #16
-	subhs	a2,a2,a1,lsl #16
-	addhs	a4,a4,a3,lsl #16
-x_divide_b16:
-	cmp	a2,a1,lsl #15
-	subhs	a2,a2,a1,lsl #15
-	addhs	a4,a4,a3,lsl #15
-x_divide_b15:
-	cmp	a2,a1,lsl #14
-	subhs	a2,a2,a1,lsl #14
-	addhs	a4,a4,a3,lsl #14
-x_divide_b14:
-	cmp	a2,a1,lsl #13
-	subhs	a2,a2,a1,lsl #13
-	addhs	a4,a4,a3,lsl #13
-x_divide_b13:
-	cmp	a2,a1,lsl #12
-	subhs	a2,a2,a1,lsl #12
-	addhs	a4,a4,a3,lsl #12
-x_divide_b12:
-	cmp	a2,a1,lsl #11
-	subhs	a2,a2,a1,lsl #11
-	addhs	a4,a4,a3,lsl #11
-x_divide_b11:
-	cmp	a2,a1,lsl #10
-	subhs	a2,a2,a1,lsl #10
-	addhs	a4,a4,a3,lsl #10
-x_divide_b10:
-	cmp	a2,a1,lsl #9
-	subhs	a2,a2,a1,lsl #9
-	addhs	a4,a4,a3,lsl #9
-x_divide_b9:
-	cmp	a2,a1,lsl #8
-	subhs	a2,a2,a1,lsl #8
-	addhs	a4,a4,a3,lsl #8
-x_divide_b8:
-	cmp	a2,a1,lsl #7
-	subhs	a2,a2,a1,lsl #7
-	addhs	a4,a4,a3,lsl #7
-x_divide_b7:
-	cmp	a2,a1,lsl #6
-	subhs	a2,a2,a1,lsl #6
-	addhs	a4,a4,a3,lsl #6
-x_divide_b6:
-	cmp	a2,a1,lsl #5
-	subhs	a2,a2,a1,lsl #5
-	addhs	a4,a4,a3,lsl #5
-x_divide_b5:
-	cmp	a2,a1,lsl #4
-	subhs	a2,a2,a1,lsl #4
-	addhs	a4,a4,a3,lsl #4
-x_divide_b4:
-	cmp	a2,a1,lsl #3
-	subhs	a2,a2,a1,lsl #3
-	addhs	a4,a4,a3,lsl #3
-x_divide_b3:
-	cmp	a2,a1,lsl #2
-	subhs	a2,a2,a1,lsl #2
-	addhs	a4,a4,a3,lsl #2
-x_divide_b2:
-	cmp	a2,a1,lsl #1
-	subhs	a2,a2,a1,lsl #1
-	addhs	a4,a4,a3,lsl #1
-x_divide_b1:
-	cmp	a2,a1
-	subhs	a2,a2,a1
-	addhs	a4,a4,a3
-x_divide_b0:
-
-	tst	ip,#0x20000000
-	bne	x_udivide_l1
-	mov	a1,a4
-	cmp	ip,#0
-	rsbmi	a2,a2,#0
-	movs	ip,ip,lsl #1
-	rsbmi	a1,a1,#0
-	mov	pc,lr
-
-x_udivide_l1:
-	tst	ip,#0x10000000
-	mov	a2,a2,lsl #1
-	orrne	a2,a2,#1
-	mov	a4,a4,lsl #1
-	cmp	a2,a1
-	subhs	a2,a2,a1
-	addhs	a4,a4,a3
-	mov	a1,a4
-	mov	pc,lr
-
diff --git a/sys/lib/libkern/arch/ns32k/DEFS.h b/sys/lib/libkern/arch/ns32k/DEFS.h
deleted file mode 100644
index 3d861f16f15..00000000000
--- a/sys/lib/libkern/arch/ns32k/DEFS.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$OpenBSD: DEFS.h,v 1.2 1997/11/07 15:57:23 niklas Exp $	*/
-/*	$NetBSD: DEFS.h,v 1.2 1994/10/26 06:39:41 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)DEFS.h	5.1 (Berkeley) 4/23/90
- */
-
-#ifdef PROF
-#define	ENTRY(x)	.globl _/**/x; _/**/x:  \
-			.data; 1:; .long 0; .text; addr 1b,tos ; bsr mcount
-#define	ASENTRY(x)	.globl x; x: \
-			.data; 1:; .long 0; .text; addr 1b,tos ; bsr mcount
-#else
-#define	ENTRY(x)	.globl _/**/x; _/**/x: 
-#define	ASENTRY(x)	.globl x; x: 
-#endif
diff --git a/sys/lib/libkern/arch/ns32k/Makefile.inc b/sys/lib/libkern/arch/ns32k/Makefile.inc
deleted file mode 100644
index e4617579b19..00000000000
--- a/sys/lib/libkern/arch/ns32k/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.6 2000/12/18 18:40:46 provos Exp $
-#	$NetBSD: Makefile.inc,v 1.7 1996/04/13 01:17:50 cgd Exp $
-
-SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
-	memchr.S memcmp.c \
-	bcmp.c ffs.c strcat.c strcmp.c strcpy.c strlcat.c strlcpy.c \
-	strlen.c strncmp.c strncpy.c \
-	scanc.c skpc.c locc.c strncasecmp.c \
-	htonl.S htons.S ntohl.S ntohs.S
diff --git a/sys/lib/libkern/arch/ns32k/SYS.h b/sys/lib/libkern/arch/ns32k/SYS.h
deleted file mode 100644
index 4ff7b4cb889..00000000000
--- a/sys/lib/libkern/arch/ns32k/SYS.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$OpenBSD: SYS.h,v 1.3 2001/08/12 12:03:03 heko Exp $	*/
-/*	$NetBSD: SYS.h,v 1.2 1994/10/26 06:39:44 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- */
-
-#include <sys/syscall.h>
-
-#ifdef PROF
-#define	ENTRY(x)	.globl _/**/x; \
-			.data; 1:; .long 0; .text; .align 1; _/**/x: \
-			addr $1b,tos; bsr mcount
-#else
-#define	ENTRY(x)	.globl _/**/x; .text; .align 1; _/**/x: 
-#endif /* PROF */
-
-#define	SYSCALL(x)	ENTRY(x); movd SYS_/**/x, r0; svc; bcs cerror
-#define	RSYSCALL(x)	SYSCALL(x); ret 0
-#define	PSEUDO(x,y)	ENTRY(x); movd SYS_/**/y, r0; svc; ret 0
-#define	CALL(x,y)	bsr _/**/y; adjspd -4*x
-
-#define	ASMSTR		.asciz
-
-	.globl	cerror
-
-#define SVC	svc
-
-#define S_ARG0	4(sp)
-#define S_ARG1	8(sp)
-#define S_ARG2	12(sp)
-#define S_ARG3	16(sp)
-
diff --git a/sys/lib/libkern/arch/ns32k/htonl.S b/sys/lib/libkern/arch/ns32k/htonl.S
deleted file mode 100644
index fc1a5bc83fc..00000000000
--- a/sys/lib/libkern/arch/ns32k/htonl.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$OpenBSD: htonl.S,v 1.2 1997/11/07 15:57:25 niklas Exp $	*/
-/*	$NetBSD: htonl.S,v 1.2 1994/10/26 06:39:45 cgd Exp $	*/
-
-/* 
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON AND HELSINKI UNIVERSITY OF TECHNOLOGY ALLOW FREE USE
- * OF THIS SOFTWARE IN ITS "AS IS" CONDITION.  CARNEGIE MELLON AND
- * HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIM ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
- * the rights to redistribute these changes.
- */
-/*
- * HISTORY
- * 11-May-92  Johannes Helander (jvh) at Helsinki University of Technology
- *	Created.
- */
-
-#include <machine/asm.h>
-
-	.text
-ENTRY(htonl)
-	movd	S_ARG0,r0
-	rotw	8,r0
-	rotd	16,r0
-	rotw	8,r0
-	ret	0
diff --git a/sys/lib/libkern/arch/ns32k/htons.S b/sys/lib/libkern/arch/ns32k/htons.S
deleted file mode 100644
index 9989b956fb2..00000000000
--- a/sys/lib/libkern/arch/ns32k/htons.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$OpenBSD: htons.S,v 1.2 1997/11/07 15:57:26 niklas Exp $	*/
-/*	$NetBSD: htons.S,v 1.2 1994/10/26 06:39:46 cgd Exp $	*/
-
-/* 
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON AND HELSINKI UNIVERSITY OF TECHNOLOGY ALLOW FREE USE
- * OF THIS SOFTWARE IN ITS "AS IS" CONDITION.  CARNEGIE MELLON AND
- * HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIM ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
- * the rights to redistribute these changes.
- */
-/*
- * HISTORY
- * 11-May-92  Johannes Helander (jvh) at Helsinki University of Technology
- *	Created.
- */
-
-#include <machine/asm.h>
-
-	.text
-ENTRY(htons)
-	movzwd	S_ARG0,r0
-	rotw	8,r0
-	ret	0
diff --git a/sys/lib/libkern/arch/ns32k/memchr.S b/sys/lib/libkern/arch/ns32k/memchr.S
deleted file mode 100644
index ce1c105a232..00000000000
--- a/sys/lib/libkern/arch/ns32k/memchr.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/*	$OpenBSD: memchr.S,v 1.1 1997/11/04 19:08:13 chuck Exp $	*/
-
-/* 
- * Written by Matthias Pfaller, 1996
- * Public domain.
- */
-
-#include <machine/asm.h>
-
-
-/*
- * void *
- * memchr (const void *b, int c, size_t len)
- *	locate the first occurrence of c in string b.
- */
-
-ENTRY(memchr)
-	enter	[r4],0
-	movd	B_ARG2,r0
-	movb	B_ARG1,r4
-	movd	B_ARG0,r1
-	skpsb	u
-	bfc	0f
-	movd	r1,r0
-0:	exit	[r4]
-	ret	0
diff --git a/sys/lib/libkern/arch/ns32k/ntohl.S b/sys/lib/libkern/arch/ns32k/ntohl.S
deleted file mode 100644
index acef5f6f500..00000000000
--- a/sys/lib/libkern/arch/ns32k/ntohl.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$OpenBSD: ntohl.S,v 1.2 1997/11/07 15:57:27 niklas Exp $	*/
-/*	$NetBSD: ntohl.S,v 1.2 1994/10/26 06:39:47 cgd Exp $	*/
-
-/* 
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON AND HELSINKI UNIVERSITY OF TECHNOLOGY ALLOW FREE USE
- * OF THIS SOFTWARE IN ITS "AS IS" CONDITION.  CARNEGIE MELLON AND
- * HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIM ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
- * the rights to redistribute these changes.
- */
-/*
- * HISTORY
- * 11-May-92  Johannes Helander (jvh) at Helsinki University of Technology
- *	Created.
- */
-
-#include <machine/asm.h>
-
-	.text
-ENTRY(ntohl)
-	movd	S_ARG0,r0
-	rotw	8,r0
-	rotd	16,r0
-	rotw	8,r0
-	ret	0
diff --git a/sys/lib/libkern/arch/ns32k/ntohs.S b/sys/lib/libkern/arch/ns32k/ntohs.S
deleted file mode 100644
index 4e701df53ed..00000000000
--- a/sys/lib/libkern/arch/ns32k/ntohs.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$OpenBSD: ntohs.S,v 1.2 1997/11/07 15:57:28 niklas Exp $	*/
-/*	$NetBSD: ntohs.S,v 1.2 1994/10/26 06:39:48 cgd Exp $	*/
-
-/* 
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON AND HELSINKI UNIVERSITY OF TECHNOLOGY ALLOW FREE USE
- * OF THIS SOFTWARE IN ITS "AS IS" CONDITION.  CARNEGIE MELLON AND
- * HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIM ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- * 
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- * 
- * any improvements or extensions that they make and grant Carnegie Mellon 
- * the rights to redistribute these changes.
- */
-/*
- * HISTORY
- * 11-May-92  Johannes Helander (jvh) at Helsinki University of Technology
- *	Created.
- */
-
-#include <machine/asm.h>
-
-	.text
-ENTRY(ntohs)
-	movzwd	S_ARG0,r0
-	rotw	8,r0
-	ret	0
diff --git a/sys/lib/libkern/arch/ns32k/setjmp.S b/sys/lib/libkern/arch/ns32k/setjmp.S
deleted file mode 100644
index e9e85ffdd43..00000000000
--- a/sys/lib/libkern/arch/ns32k/setjmp.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$OpenBSD: setjmp.S,v 1.2 1997/11/07 15:57:28 niklas Exp $	*/
-/*	$NetBSD: setjmp.S,v 1.3 1995/11/30 01:00:12 jtc Exp $	*/
-
-/* 
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- * 
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * HELSINKI UNIVERSITY OF TECHNOLOGY ALLOWS FREE USE OF THIS SOFTWARE IN
- * ITS "AS IS" CONDITION. HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIMS ANY
- * LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
- * USE OF THIS SOFTWARE.
- */
-/*
- * HISTORY
- * 29-Apr-92  Johannes Helander (jvh) at Helsinki University of Technology
- *	Created.
- */
-
-#include <machine/asm.h>
-#include <machine/jmpbuf.h>
-
-ENTRY(setjmp)
-	movqd	0, tos
-	bsr	EX(sigblock)
-	adjspb	-4
-	movd	4(sp), r2		/* jmp_buf */
-	movd	0(sp), JMP_BUF_PC(r2)	/* pc of caller */
-	movd	r0, JMP_BUF_SIGMASK(r2)	/* save mask */
-
-	sprd	sp, JMP_BUF_SP(r2)
-	sprd	fp, JMP_BUF_FP(r2)
-	sprd	sb, JMP_BUF_SB(r2)
-	movd	r3, JMP_BUF_R3(r2)	/* save registers r3-r7 */
-	movd	r4, JMP_BUF_R4(r2)
-	movd	r5, JMP_BUF_R5(r2)
-	movd	r6, JMP_BUF_R6(r2)
-	movd	r7, JMP_BUF_R7(r2)
-
-	movqd	0, r0
-	ret	0
-
-ENTRY(longjmp)
-	movd	4(sp),r2		/* jmp_buf */
-	movd	JMP_BUF_SIGMASK(r2), tos /* restore mask */
-	bsr	EX(sigsetmask)
-	adjspb	-4
-	movd	4(sp), r2		/* jmp_buf */
-	movd	8(sp), r0		/* value */
-
-	lprd	sp, JMP_BUF_SP(r2)
-	lprd	fp, JMP_BUF_FP(r2)
-	lprd	sb, JMP_BUF_SB(r2)
-	movd	JMP_BUF_R3(r2), r3	/* load registers r3-r7 */
-	movd	JMP_BUF_R4(r2), r4
-	movd	JMP_BUF_R5(r2), r5
-	movd	JMP_BUF_R6(r2), r6
-	movd	JMP_BUF_R7(r2), r7
-	movd	JMP_BUF_PC(r2),	0(sp)	/* patch return pc */
-
-	cmpqd	0, r0
-	bne	nonzero
-	movqd	1, r0
-nonzero:
-	ret	0
-