remove unused bits and pieces.

--
Ok'd by art@

81 files changed, 2 insertions, 3921 deletions

diff --git a/lib/csu/Makefile b/lib/csu/Makefile
index a14d8885b48..f74e4141a13 100644
--- a/lib/csu/Makefile
+++ b/lib/csu/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.6 2001/08/19 19:58:43 mickey Exp $
+#	$OpenBSD: Makefile,v 1.7 2001/08/19 20:44:31 brad Exp $
 
 .if make(obj)
-SUBDIR= alpha hppa i386 m68k m88k ns32k powerpc sparc vax
+SUBDIR= alpha hppa i386 m68k m88k powerpc sparc vax
 .else
 SUBDIR= ${MACHINE_ARCH}
 .endif
diff --git a/lib/csu/ns32k/Makefile b/lib/csu/ns32k/Makefile
deleted file mode 100644
index 9d470afb158..00000000000
--- a/lib/csu/ns32k/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#	$OpenBSD: Makefile,v 1.5 2001/03/24 18:40:21 tholo Exp $
-#	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-
-CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
-OBJS=		crt0.o gcrt0.o scrt0.o
-SRCS=		crt0.c
-
-all: ${OBJS}
-
-crt0.o: ${SRCS}
-	@echo "${COMPILE.c} -DCRT0 -DDYNAMIC ${.CURDIR}/${SRCS} -o ${.TARGET}"
-	@${COMPILE.c} -DCRT0 -DDYNAMIC ${.CURDIR}/${SRCS} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-gcrt0.o: ${SRCS}
-	@echo "${COMPILE.c} -DMCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}"
-	@${COMPILE.c} -DMCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-scrt0.o: ${SRCS}
-	@echo "${COMPILE.c} -DSCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}"
-	@${COMPILE.c} -DSCRT0 ${.CURDIR}/${SRCS} -o ${.TARGET}.o
-	@${LD} -x -r ${.TARGET}.o -o ${.TARGET}
-	@rm -f ${.TARGET}.o
-
-realinstall:
-	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
-	    ${DESTDIR}/usr/lib
-
-.if make(depend)
-CPPFLAGS+= -DDYNAMIC
-.endif
-
-afterdepend: .depend
-	@(TMP=/tmp/_depend$$$$; \
-		sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o s\1.o:/' \
-		< .depend > $$TMP; \
-	mv $$TMP .depend)
-
-.include <bsd.prog.mk>
diff --git a/lib/csu/ns32k/crt0.c b/lib/csu/ns32k/crt0.c
deleted file mode 100644
index 1417a43b004..00000000000
--- a/lib/csu/ns32k/crt0.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*	$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $	*/
-/*	$NetBSD: crt0.c,v 1.7 1995/06/03 13:16:15 pk Exp $	*/
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * All rights reserved.
- *
- * 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 Paul Kranenburg.
- * 4. The name of the author may not 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.
- *
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: crt0.c,v 1.4 2001/08/12 12:03:01 heko Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/param.h>
-#include <stdlib.h>
-
-#include "common.h"
-
-extern void	start __P((long)) asm("start");
-
-void
-start(param)
-	long param;
-{
-	struct kframe {
-		int	kargc;
-		char	*kargv[1];	/* size depends on kargc */
-		char	kargstr[1];	/* size varies */
-		char	kenvstr[1];	/* size varies */
-	};
-	/*
-	 *	ALL REGISTER VARIABLES!!!
-	 */
-	register struct kframe *kfp;
-	register char **argv, *ap;
-
-	/* just above the saved frame pointer */
-	kfp = (struct kframe *) (&param-1);
-	argv = &kfp->kargv[0];
-	environ = argv + kfp->kargc + 1;
-
-	if (ap = argv[0])
-		if ((__progname = _strrchr(ap, '/')) == NULL)
-			__progname = ap;
-		else
-			++__progname;
-
-#ifdef DYNAMIC
-	/* ld(1) convention: if DYNAMIC = 0 then statically linked */
-#ifdef stupid_gcc
-	if (&_DYNAMIC)
-#else
-	if ( ({volatile caddr_t x = (caddr_t)&_DYNAMIC; x; }) )
-#endif
-		__load_rtld(&_DYNAMIC);
-#endif /* DYNAMIC */
-
-asm("eprol:");
-
-#ifdef MCRT0
-	atexit(_mcleanup);
-	monstartup((u_long)&eprol, (u_long)&etext);
-#endif /* MCRT0 */
-
-asm ("__callmain:");		/* Defined for the benefit of debuggers */
-	exit(main(kfp->kargc, argv, environ));
-}
-
-#ifdef DYNAMIC
-	asm("	___syscall:");
-	asm("		movd tos,r1");		/* return address */
-	asm("		movd tos,r0");		/* syscall number */
-	asm("		movd r1,tos");
-	asm("		svc");			/* do system call */
-	asm("		bcc 1f");		/* check error */
-	asm("		movqd -1,r0");
-	asm("	1:	jump 0(0(sp))");	/* return */
-
-#ifndef ntohl
-	asm("   _ntohl:	movd 4(sp),r0");
-	asm("		rotw 8,r0");
-	asm("		rotd 16,r0");
-	asm("		rotw 8,r0");
-	asm("		ret 0");
-#endif
-
-#endif /* DYNAMIC */
-
-#include "common.c"
-
-#ifdef MCRT0
-asm ("	.text");
-asm ("_eprol:");
-#endif
diff --git a/lib/libc/arch/arm32/DEFS.h b/lib/libc/arch/arm32/DEFS.h
deleted file mode 100644
index 0fcb92de97c..00000000000
--- a/lib/libc/arch/arm32/DEFS.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: DEFS.h,v 1.2 1996/08/19 08:11:23 tholo Exp $ */
-
-#include <machine/asm.h>
diff --git a/lib/libc/arch/arm32/Makefile.inc b/lib/libc/arch/arm32/Makefile.inc
deleted file mode 100644
index e0e9b8bd8cf..00000000000
--- a/lib/libc/arch/arm32/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:11:24 tholo Exp $
-
-KMINCLUDES=
-KMSRCS=
diff --git a/lib/libc/arch/arm32/SYS.h b/lib/libc/arch/arm32/SYS.h
deleted file mode 100644
index b214eea71fe..00000000000
--- a/lib/libc/arch/arm32/SYS.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $OpenBSD: SYS.h,v 1.3 1996/08/19 08:11:25 tholo 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.
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define SYSCALL(x)	.text; .align 0; ENTRY(x) ; swi SYS_ ## x; bcs cerror;
-#define RSYSCALL(x)	SYSCALL(x) ; mov r15, r14
-#define PSEUDO(x, y)	.text; .align 0; ENTRY(x); swi SYS_ ## y; mov r15, r14
-
-#if 0
-#define	SYSCALL(x)	.text; .align 2; 2: jmp PIC_PLT(cerror); ENTRY(x); movl $(SYS_/**/x),%eax; int $0x80; jc 2b
-#define	RSYSCALL(x)	SYSCALL(x); ret
-#define	PSEUDO(x,y)	ENTRY(x); movl $(SYS_/**/y),%eax; int $0x80; ret
-#define	CALL(x,y)	call PIC_PLT(_/**/y); addl $4*x,%esp
-
-#endif
-
-	.globl	cerror
diff --git a/lib/libc/arch/arm32/gen/Makefile.inc b/lib/libc/arch/arm32/gen/Makefile.inc
deleted file mode 100644
index dff9b5f4927..00000000000
--- a/lib/libc/arch/arm32/gen/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:11:27 tholo Exp $
-
-SRCS+=	_setjmp.S alloca.S \
-	fabs.c flt_rounds.c fpgetround.c fpsetround.c \
-	fpgetmask.c fpsetmask.c fpgetsticky.c fpsetsticky.c \
-	infinity.c isinf.c frexp.c ldexp.c modf.c \
-	setjmp.S sigsetjmp.S
diff --git a/lib/libc/arch/arm32/gen/_setjmp.S b/lib/libc/arch/arm32/gen/_setjmp.S
deleted file mode 100644
index 38e6c2e1aae..00000000000
--- a/lib/libc/arch/arm32/gen/_setjmp.S
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: _setjmp.S,v 1.4 1997/07/23 20:55:18 kstailey Exp $"
-#endif
-
-	.text
-	.align	0
-
-ENTRY(_setjmp)
-/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
-	LDR	a4,[a4,#0]
-	CMP	a4,#0
-	ADDEQ	a1,a1,#48
-	BEQ	|__setjmp_l1|
-	STFE	f4,[a1],#12
-	STFE	f5,[a1],#12
-	STFE	f6,[a1],#12
-	STFE	f7,[a1],#12
-|__setjmp_l1|*/
-	add	r0, r0, #48
-	stmia	r0, {r1-r12, r13, r14}
-	mov	r0, #0x00000000
-	mov	r15, r14
-
-ENTRY(_longjmp)
-	ldr	r2, L_longjmpret
-	str	r1, [r2]
-/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
-	LDR	a4,[a4,#0]
-	CMP	a4,#0
-	ADDEQ	a1,a1,#48
-	BEQ	|__longjmp_l1|
-	LDFE	f4,[a1],#12
-	LDFE	f5,[a1],#12
-	LDFE	f6,[a1],#12
-	LDFE	f7,[a1],#12
-|__longjmp_l1|*/
-	add	r0, r0, #48
-	ldmia	r0, {r1-r12, r13, r14}
-	ldr	r0, L_longjmpret
-	ldr	r0, [r0]
-	teq	r0, #0x00000000
-	moveq	r0, #0x00000001
-	mov	r15, r14
-
-L_longjmpret:
-	.word	_longjmpret
-
-	.data
-	.align	0
-
-_longjmpret:
-	.word	0x00000000
diff --git a/lib/libc/arch/arm32/gen/alloca.S b/lib/libc/arch/arm32/gen/alloca.S
deleted file mode 100644
index 90dee1a598f..00000000000
--- a/lib/libc/arch/arm32/gen/alloca.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-/* like alloc, but automatic automatic free in return */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: alloca.S,v 1.3 1996/08/19 08:11:30 tholo Exp $"
-#endif
-
-	.text
-	.align	0
-
-ENTRY(alloca)
-	add	r0, r0, #0x00000003	/* round up to next word */
-	bic	r0, r0, #0x00000003
-	sub	r13, r13, r0		/* Adjust the stack pointer */
-	mov	r0, r13			/* r0 = base of new space */
-	mov	r15, r14		/* return */ 
diff --git a/lib/libc/arch/arm32/gen/div.S b/lib/libc/arch/arm32/gen/div.S
deleted file mode 100644
index 6fa746556b4..00000000000
--- a/lib/libc/arch/arm32/gen/div.S
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
- * 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 RiscBSD kernel team
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: div.S,v 1.3 1996/08/19 08:11:31 tholo Exp $"
-#endif
-
-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	r2, r0
-	MOV	r0, r1
-	MOV	r1, r2
-	B	x_uremainder
-
-	.global	___udivsi3
-___udivsi3:
-	MOV	r2, r0
-	MOV	r0, r1
-	MOV	r1, r2
-	B	x_udivide
-
-	.global	___modsi3
-___modsi3:
-	MOV	r2, r0
-	MOV	r0, r1
-	MOV	r1, r2
-	B	x_remainder
-
-	.global	___divsi3
-___divsi3:
-	MOV	r2, r0
-	MOV	r0, r1
-	MOV	r1, r2
-	B	x_divide
-
-	.global	x_divtest
-x_divtest:
-	MOV	pc,lr
-
-	.global	x_remainder
-x_remainder:
-	STMFD	sp!,{lr}
-	BL	x_divide
-	MOV	r0,r1
-	LDMFD	sp!,{pc}
-
-	.global	x_uremainder
-x_uremainder:
-	STMFD	sp!,{lr}
-	BL	x_udivide
-	MOV	r0,r1
-	LDMFD	sp!,{pc}
-
-x_overflow:
-	MVN	r0,#0
-	MOV	pc,lr
-
-	.global	x_udivide		/* r0 = r1 / r0; r1 = r1 % r0 */
-x_udivide:
-	CMP	r0,#1
-	BCC	x_overflow
-	BEQ	x_divide_l0
-	MOV	ip,#0
-	MOVS	r1,r1
-	BPL	x_divide_l1
-	ORR	ip,ip,#0x20000000	/* ip bit 0x20000000 = -ve r1 */
-	MOVS	r1,r1,lsr #1
-	ORRCS	ip,ip,#0x10000000	/* ip bit 0x10000000 = bit 0 of r1 */
-	B	x_divide_l1
-
-x_divide_l0:				/* r0 == 1 */
-	MOV	r0,r1
-	MOV	r1,#0
-	MOV	pc,lr
-
-	.global	x_divide		/* r0 = r1 / r0; r1 = r1 % r0 */
-x_divide:
-	CMP	r0,#1
-	BCC	x_overflow
-	BEQ	x_divide_l0
-	ANDS	ip,r0,#0x80000000
-	RSBMI	r0,r0,#0
-	ANDS	r2,r1,#0x80000000
-	EOR	ip,ip,r2
-	RSBMI	r1,r1,#0
-	ORR	ip,r2,ip,lsr #1	/* ip bit 0x40000000 = -ve division */
-				/* ip bit 0x80000000 = -ve remainder */
-
-x_divide_l1:
-	MOV	r2,#1
-	MOV	r3,#0
-
-	CMP	r1,r0
-	BCC	x_divide_b0
-	CMP	r1,r0,lsl #1
-	BCC	x_divide_b1
-	CMP	r1,r0,lsl #2
-	BCC	x_divide_b2
-	CMP	r1,r0,lsl #3
-	BCC	x_divide_b3
-	CMP	r1,r0,lsl #4
-	BCC	x_divide_b4
-	CMP	r1,r0,lsl #5
-	BCC	x_divide_b5
-	CMP	r1,r0,lsl #6
-	BCC	x_divide_b6
-	CMP	r1,r0,lsl #7
-	BCC	x_divide_b7
-	CMP	r1,r0,lsl #8
-	BCC	x_divide_b8
-	CMP	r1,r0,lsl #9
-	BCC	x_divide_b9
-	CMP	r1,r0,lsl #10
-	BCC	x_divide_b10
-	CMP	r1,r0,lsl #11
-	BCC	x_divide_b11
-	CMP	r1,r0,lsl #12
-	BCC	x_divide_b12
-	CMP	r1,r0,lsl #13
-	BCC	x_divide_b13
-	CMP	r1,r0,lsl #14
-	BCC	x_divide_b14
-	CMP	r1,r0,lsl #15
-	BCC	x_divide_b15
-	CMP	r1,r0,lsl #16
-	BCC	x_divide_b16
-	CMP	r1,r0,lsl #17
-	BCC	x_divide_b17
-	CMP	r1,r0,lsl #18
-	BCC	x_divide_b18
-	CMP	r1,r0,lsl #19
-	BCC	x_divide_b19
-	CMP	r1,r0,lsl #20
-	BCC	x_divide_b20
-	CMP	r1,r0,lsl #21
-	BCC	x_divide_b21
-	CMP	r1,r0,lsl #22
-	BCC	x_divide_b22
-	CMP	r1,r0,lsl #23
-	BCC	x_divide_b23
-	CMP	r1,r0,lsl #24
-	BCC	x_divide_b24
-	CMP	r1,r0,lsl #25
-	BCC	x_divide_b25
-	CMP	r1,r0,lsl #26
-	BCC	x_divide_b26
-	CMP	r1,r0,lsl #27
-	BCC	x_divide_b27
-	CMP	r1,r0,lsl #28
-	BCC	x_divide_b28
-	CMP	r1,r0,lsl #29
-	BCC	x_divide_b29
-	CMP	r1,r0,lsl #30
-	BCC	x_divide_b30
-	CMP	r1,r0,lsl #31
-	SUBHS	r1,r1,r0,lsl #31
-	ADDHS	r3,r3,r2,lsl #31
-	CMP	r1,r0,lsl #30
-	SUBHS	r1,r1,r0,lsl #30
-	ADDHS	r3,r3,r2,lsl #30
-x_divide_b30:
-	CMP	r1,r0,lsl #29
-	SUBHS	r1,r1,r0,lsl #29
-	ADDHS	r3,r3,r2,lsl #29
-x_divide_b29:
-	CMP	r1,r0,lsl #28
-	SUBHS	r1,r1,r0,lsl #28
-	ADDHS	r3,r3,r2,lsl #28
-x_divide_b28:
-	CMP	r1,r0,lsl #27
-	SUBHSS	r1,r1,r0,lsl #27
-	ADDHS	r3,r3,r2,lsl #27
-x_divide_b27:
-	CMP	r1,r0,lsl #26
-	SUBHS	r1,r1,r0,lsl #26
-	ADDHS	r3,r3,r2,lsl #26
-x_divide_b26:
-	CMP	r1,r0,lsl #25
-	SUBHS	r1,r1,r0,lsl #25
-	ADDHS	r3,r3,r2,lsl #25
-x_divide_b25:
-	CMP	r1,r0,lsl #24
-	SUBHS	r1,r1,r0,lsl #24
-	ADDHS	r3,r3,r2,lsl #24
-x_divide_b24:
-	CMP	r1,r0,lsl #23
-	SUBHS	r1,r1,r0,lsl #23
-	ADDHS	r3,r3,r2,lsl #23
-x_divide_b23:
-	CMP	r1,r0,lsl #22
-	SUBHS	r1,r1,r0,lsl #22
-	ADDHS	r3,r3,r2,lsl #22
-x_divide_b22:
-	CMP	r1,r0,lsl #21
-	SUBHS	r1,r1,r0,lsl #21
-	ADDHS	r3,r3,r2,lsl #21
-x_divide_b21:
-	CMP	r1,r0,lsl #20
-	SUBHS	r1,r1,r0,lsl #20
-	ADDHS	r3,r3,r2,lsl #20
-x_divide_b20:
-	CMP	r1,r0,lsl #19
-	SUBHS	r1,r1,r0,lsl #19
-	ADDHS	r3,r3,r2,lsl #19
-x_divide_b19:
-	CMP	r1,r0,lsl #18
-	SUBHS	r1,r1,r0,lsl #18
-	ADDHS	r3,r3,r2,lsl #18
-x_divide_b18:
-	CMP	r1,r0,lsl #17
-	SUBHS	r1,r1,r0,lsl #17
-	ADDHS	r3,r3,r2,lsl #17
-x_divide_b17:
-	CMP	r1,r0,lsl #16
-	SUBHS	r1,r1,r0,lsl #16
-	ADDHS	r3,r3,r2,lsl #16
-x_divide_b16:
-	CMP	r1,r0,lsl #15
-	SUBHS	r1,r1,r0,lsl #15
-	ADDHS	r3,r3,r2,lsl #15
-x_divide_b15:
-	CMP	r1,r0,lsl #14
-	SUBHS	r1,r1,r0,lsl #14
-	ADDHS	r3,r3,r2,lsl #14
-x_divide_b14:
-	CMP	r1,r0,lsl #13
-	SUBHS	r1,r1,r0,lsl #13
-	ADDHS	r3,r3,r2,lsl #13
-x_divide_b13:
-	CMP	r1,r0,lsl #12
-	SUBHS	r1,r1,r0,lsl #12
-	ADDHS	r3,r3,r2,lsl #12
-x_divide_b12:
-	CMP	r1,r0,lsl #11
-	SUBHS	r1,r1,r0,lsl #11
-	ADDHS	r3,r3,r2,lsl #11
-x_divide_b11:
-	CMP	r1,r0,lsl #10
-	SUBHS	r1,r1,r0,lsl #10
-	ADDHS	r3,r3,r2,lsl #10
-x_divide_b10:
-	CMP	r1,r0,lsl #9
-	SUBHS	r1,r1,r0,lsl #9
-	ADDHS	r3,r3,r2,lsl #9
-x_divide_b9:
-	CMP	r1,r0,lsl #8
-	SUBHS	r1,r1,r0,lsl #8
-	ADDHS	r3,r3,r2,lsl #8
-x_divide_b8:
-	CMP	r1,r0,lsl #7
-	SUBHS	r1,r1,r0,lsl #7
-	ADDHS	r3,r3,r2,lsl #7
-x_divide_b7:
-	CMP	r1,r0,lsl #6
-	SUBHS	r1,r1,r0,lsl #6
-	ADDHS	r3,r3,r2,lsl #6
-x_divide_b6:
-	CMP	r1,r0,lsl #5
-	SUBHS	r1,r1,r0,lsl #5
-	ADDHS	r3,r3,r2,lsl #5
-x_divide_b5:
-	CMP	r1,r0,lsl #4
-	SUBHS	r1,r1,r0,lsl #4
-	ADDHS	r3,r3,r2,lsl #4
-x_divide_b4:
-	CMP	r1,r0,lsl #3
-	SUBHS	r1,r1,r0,lsl #3
-	ADDHS	r3,r3,r2,lsl #3
-x_divide_b3:
-	CMP	r1,r0,lsl #2
-	SUBHS	r1,r1,r0,lsl #2
-	ADDHS	r3,r3,r2,lsl #2
-x_divide_b2:
-	CMP	r1,r0,lsl #1
-	SUBHS	r1,r1,r0,lsl #1
-	ADDHS	r3,r3,r2,lsl #1
-x_divide_b1:
-	CMP	r1,r0
-	SUBHS	r1,r1,r0
-	ADDHS	r3,r3,r2
-x_divide_b0:
-
-	TST	ip,#0x20000000
-	BNE	x_udivide_l1
-	MOV	r0,r3
-	CMP	ip,#0
-	RSBMI	r1,r1,#0
-	MOVS	ip,ip,lsl #1
-	RSBMI	r0,r0,#0
-	MOV	pc,lr
-
-x_udivide_l1:
-	TST	ip,#0x10000000
-	MOV	r1,r1,lsl #1
-	ORRNE	r1,r1,#1
-	MOV	r3,r3,lsl #1
-	CMP	r1,r0
-	SUBHS	r1,r1,r0
-	ADDHS	r3,r3,r2
-	MOV	r0,r3
-	MOV	pc,lr
-
diff --git a/lib/libc/arch/arm32/gen/fabs.c b/lib/libc/arch/arm32/gen/fabs.c
deleted file mode 100644
index 98a22bc1c8f..00000000000
--- a/lib/libc/arch/arm32/gen/fabs.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- *
- * 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 Mark Brinicombe
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fabs.c,v 1.2 1996/08/19 08:11:32 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * fabs(x) returns the absolute value of x.
- */
-
-#ifdef __STDC__
-	double fabs(double x)
-#else
-	double fabs(x)
-	double x;
-#endif
-{
-	if (x < 0)
-		x = -x;
-	return(x);
-}
diff --git a/lib/libc/arch/arm32/gen/flt_rounds.c b/lib/libc/arch/arm32/gen/flt_rounds.c
deleted file mode 100644
index ea370502546..00000000000
--- a/lib/libc/arch/arm32/gen/flt_rounds.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: flt_rounds.c,v 1.3 1997/08/01 21:36:27 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	2,	/* round to positive infinity */
-	3,	/* round to negative infinity */
-	0	/* round to zero */
-};
-
-/*
- * Return the current FP rounding mode
- *
- * Returns:
- *	0 - round to zero
- *	1 - round to nearest
- *	2 - round to postive infinity
- *	3 - round to negative infinity
- *
- * ok all we need to do is get the current FP rounding mode
- * index our map table and return the appropriate value.
- *
- * HOWEVER:
- * The ARM FPA codes the rounding mode into the actual FP instructions
- * so there is no such thing as a global rounding mode.
- * The default is round to nearest if rounding is not explictly specified.
- * FP instructions generated by GCC will not explicitly specify a rounding
- * mode.
- *
- * So the best we can do it to return the rounding mode FP instructions
- * use if rounding is not specified which is round to nearest.
- *
- * This could change in the future with new floating point emulators or
- * soft float FP libraries.
- */
-
-int
-__flt_rounds()
-{
-	return(map[0]);
-}
diff --git a/lib/libc/arch/arm32/gen/fpgetmask.c b/lib/libc/arch/arm32/gen/fpgetmask.c
deleted file mode 100644
index 85e4f151648..00000000000
--- a/lib/libc/arch/arm32/gen/fpgetmask.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpgetmask.c,v 1.2 1996/08/19 08:11:34 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/*
- * Return the current FP exception mask
- */
-
-fp_except
-fpgetmask()
-{
-	abort();
-}
diff --git a/lib/libc/arch/arm32/gen/fpgetround.c b/lib/libc/arch/arm32/gen/fpgetround.c
deleted file mode 100644
index c3e6b99f0fe..00000000000
--- a/lib/libc/arch/arm32/gen/fpgetround.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpgetround.c,v 1.2 1996/08/19 08:11:35 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/*
- * Return the current FP rounding mode
- *
- * ok all we need to do is return the current FP rounding mode
- *
- * HOWEVER:
- * The ARM FPA codes the rounding mode into the actual FP instructions
- * so there is no such thing as a global rounding mode.
- * The default is round to nearest if rounding is not explictly specified.
- * FP instructions generated by GCC will not explicitly specify a rounding
- * mode.
- *
- * So the best we can do it to return the rounding mode FP instructions
- * use if rounding is not specified which is round to nearest.
- *
- * This could change in the future with new floating point emulators or
- * soft float FP libraries.
- */
-
-fp_rnd
-fpgetround()
-{
-	return(FP_RN);
-}
diff --git a/lib/libc/arch/arm32/gen/fpgetsticky.c b/lib/libc/arch/arm32/gen/fpgetsticky.c
deleted file mode 100644
index ddf3c8bbb4b..00000000000
--- a/lib/libc/arch/arm32/gen/fpgetsticky.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpgetsticky.c,v 1.2 1996/08/19 08:11:36 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/*
- * Return the current FP exception mask
- */
-
-fp_except
-fpgetsticky()
-{
-	abort();
-}
diff --git a/lib/libc/arch/arm32/gen/fpsetmask.c b/lib/libc/arch/arm32/gen/fpsetmask.c
deleted file mode 100644
index c7d3730966c..00000000000
--- a/lib/libc/arch/arm32/gen/fpsetmask.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpsetmask.c,v 1.2 1996/08/19 08:11:38 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/*
- * Sets the FP exception mask
- */
-
-fp_except
-fpsetmask(mask)
-	fp_except mask;
-{
-	abort();
-}
diff --git a/lib/libc/arch/arm32/gen/fpsetround.c b/lib/libc/arch/arm32/gen/fpsetround.c
deleted file mode 100644
index dee6f5fa6d2..00000000000
--- a/lib/libc/arch/arm32/gen/fpsetround.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpsetround.c,v 1.2 1996/08/19 08:11:38 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/*
- * Return the current FP rounding mode
- *
- * ok all we need to do is return the current FP rounding mode
- *
- * HOWEVER:
- * The ARM FPA codes the rounding mode into the actual FP instructions
- * so there is no such thing as a global rounding mode.
- * The default is round to nearest if rounding is not explictly specified.
- * FP instructions generated by GCC will not explicitly specify a rounding
- * mode.
- *
- * All we can do is abort
- *
- * This could change in the future with new floating point emulators or
- * soft float FP libraries.
- */
-
-fp_rnd
-fpsetround(rnd_dir)
-	fp_rnd rnd_dir;
-{
-	abort();
-}
diff --git a/lib/libc/arch/arm32/gen/fpsetsticky.c b/lib/libc/arch/arm32/gen/fpsetsticky.c
deleted file mode 100644
index 0c1bfedfe81..00000000000
--- a/lib/libc/arch/arm32/gen/fpsetsticky.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. The name of the author may not 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: fpsetsticky.c,v 1.2 1996/08/19 08:11:39 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-/*
- * Sets the FP exception mask
- */
-
-fp_except
-fpsetsticky(sticky)
-	fp_except sticky;
-{
-	abort();
-}
diff --git a/lib/libc/arch/arm32/gen/frexp.c b/lib/libc/arch/arm32/gen/frexp.c
deleted file mode 100644
index 0770b6f8e4e..00000000000
--- a/lib/libc/arch/arm32/gen/frexp.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: frexp.c,v 1.3 1997/07/23 20:55:18 kstailey Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-
-/*
- * Split the given value into a fraction in the range [0.5, 1.0) and
- * an exponent, such that frac * (2^exp) == value.  If value is 0,
- * return 0.
- */
-double
-frexp(value, eptr)
-	double value;
-	int *eptr;
-{
-	union {
-		double v;
-		struct ieee_double s;
-	} u;
-
-	if (value) {
-		/*
-		 * Fractions in [0.5..1.0) have an exponent of 2^-1.
-		 * Leave Inf and NaN alone, however.
-		 * WHAT ABOUT DENORMS?
-		 */
-		u.v = value;
-		if (u.s.dbl_exp != DBL_EXP_INFNAN) {
-			*eptr = u.s.dbl_exp - (DBL_EXP_BIAS - 1);
-			u.s.dbl_exp = DBL_EXP_BIAS - 1;
-		}
-		return (u.v);
-	} else {
-		*eptr = 0;
-		return ((double)0);
-	}
-}
diff --git a/lib/libc/arch/arm32/gen/infinity.c b/lib/libc/arch/arm32/gen/infinity.c
deleted file mode 100644
index 60372d7c10b..00000000000
--- a/lib/libc/arch/arm32/gen/infinity.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe.
- *
- * 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 Mark Brinicombe
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: infinity.c,v 1.3 1996/08/19 08:11:41 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-/* Bytes for +infinity on an arm32 (IEEE double precision) */
-
-char __infinity[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
diff --git a/lib/libc/arch/arm32/gen/isinf.c b/lib/libc/arch/arm32/gen/isinf.c
deleted file mode 100644
index de8fff3e68e..00000000000
--- a/lib/libc/arch/arm32/gen/isinf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1996 Mark Brinicombe
- *
- * 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 Mark Brinicombe
- *	for the NetBSD project.
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: isinf.c,v 1.3 1996/08/19 08:11:42 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <math.h>
-
-int
-isnan(d)
-	double d;
-{
-	register struct ieee_double *p = (struct ieee_double *)&d;
-
-	return(p->dbl_exp == DBL_EXP_INFNAN && (p->dbl_frach || p->dbl_fracl));
-}
-
-int
-isinf(d)
-	double d;
-{
-	register struct ieee_double *p = (struct ieee_double *)&d;
-
-	return(p->dbl_exp == DBL_EXP_INFNAN && !p->dbl_frach && !p->dbl_fracl);
-}
diff --git a/lib/libc/arch/arm32/gen/ldexp.c b/lib/libc/arch/arm32/gen/ldexp.c
deleted file mode 100644
index 45741b386c3..00000000000
--- a/lib/libc/arch/arm32/gen/ldexp.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: ldexp.c,v 1.2 1996/08/19 08:11:43 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <errno.h>
-
-/*
- * double ldexp(double val, int exp)
- * returns: val * (2**exp)
- */
-double
-ldexp(val, exp)
-	double val;
-	int exp;
-{
-	register int oldexp, newexp, mulexp;
-	union doub {
-		double v;
-		struct ieee_double s;
-	} u, mul;
-
-	/*
-	 * If input is zero, or no change, just return input.
-	 * Likewise, if input is Inf or NaN, just return it.
-	 */
-	u.v = val;
-	oldexp = u.s.dbl_exp;
-	if (val == 0 || exp == 0 || oldexp == DBL_EXP_INFNAN)
-		return (val);
-
-	/*
-	 * Compute new exponent and check for over/under flow.
-	 * Underflow, unfortunately, could mean switching to denormal.
-	 * If result out of range, set ERANGE and return 0 if too small
-	 * or Inf if too big, with the same sign as the input value.
-	 */
-	newexp = oldexp + exp;
-	if (newexp >= DBL_EXP_INFNAN) {
-		/* u.s.dbl_sign = val < 0; -- already set */
-		u.s.dbl_exp = DBL_EXP_INFNAN;
-		u.s.dbl_frach = u.s.dbl_fracl = 0;
-		errno = ERANGE;
-		return (u.v);		/* Inf */
-	}
-	if (newexp <= 0) {
-		/*
-		 * The output number is either a denormal or underflows
-		 * (see comments in machine/ieee.h).
-		 */
-		if (newexp <= -DBL_FRACBITS) {
-			/* u.s.dbl_sign = val < 0; -- already set */
-			u.s.dbl_exp = 0;
-			u.s.dbl_frach = u.s.dbl_fracl = 0;
-			errno = ERANGE;
-			return (u.v);		/* zero */
-		}
-		/*
-		 * We are going to produce a denorm.  Our `exp' argument
-		 * might be as small as -2097, and we cannot compute
-		 * 2^-2097, so we may have to do this as many as three
-		 * steps (not just two, as for positive `exp's below).
-		 */
-		mul.v = 0;
-		while (exp <= -DBL_EXP_BIAS) {
-			mul.s.dbl_exp = 1;
-			val *= mul.v;
-			exp += DBL_EXP_BIAS - 1;
-		}
-		mul.s.dbl_exp = exp + DBL_EXP_BIAS;
-		val *= mul.v;
-		return (val);
-	}
-
-	/*
-	 * Newexp is positive.
-	 *
-	 * If oldexp is zero, we are starting with a denorm, and simply
-	 * adjusting the exponent will produce bogus answers.  We need
-	 * to fix that first.
-	 */
-	if (oldexp == 0) {
-		/*
-		 * Multiply by 2^mulexp to make the number normalizable.
-		 * We cannot multiply by more than 2^1023, but `exp'
-		 * argument might be as large as 2046.  A single
-		 * adjustment, however, will normalize the number even
-		 * for huge `exp's, and then we can use exponent
-		 * arithmetic just as for normal `double's.
-		 */
-		mulexp = exp <= DBL_EXP_BIAS ? exp : DBL_EXP_BIAS;
-		mul.v = 0;
-		mul.s.dbl_exp = mulexp + DBL_EXP_BIAS;
-		val *= mul.v;
-		if (mulexp == exp)
-			return (val);
-		u.v = val;
-		newexp -= mulexp;
-	}
-
-	/*
-	 * Both oldexp and newexp are positive; just replace the
-	 * old exponent with the new one.
-	 */
-	u.s.dbl_exp = newexp;
-	return (u.v);
-}
diff --git a/lib/libc/arch/arm32/gen/modf.c b/lib/libc/arch/arm32/gen/modf.c
deleted file mode 100644
index 62ff1d20f56..00000000000
--- a/lib/libc/arch/arm32/gen/modf.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * 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 ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS 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 the
- * rights to redistribute these changes.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: modf.c,v 1.2 1996/08/19 08:11:44 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/types.h>
-#include <machine/ieee.h>
-#include <errno.h>
-#include <math.h>
-
-/*
- * double modf(double val, double *iptr)
- * returns: f and i such that |f| < 1.0, (f + i) = val, and
- *	sign(f) == sign(i) == sign(val).
- *
- * Beware signedness when doing subtraction, and also operand size!
- */
-double
-modf(val, iptr)
-	double val, *iptr;
-{
-	union doub {
-		double v;
-		struct ieee_double s;
-	} u, v;
-	u_int64_t frac;
-
-	/*
-	 * If input is Inf or NaN, return it and leave i alone.
-	 */
-	u.v = val;
-	if (u.s.dbl_exp == DBL_EXP_INFNAN)
-		return (u.v);
-
-	/*
-	 * If input can't have a fractional part, return
-	 * (appropriately signed) zero, and make i be the input.
-	 */
-	if ((int)u.s.dbl_exp - DBL_EXP_BIAS > DBL_FRACBITS - 1) {
-		*iptr = u.v;
-		v.v = 0.0;
-		v.s.dbl_sign = u.s.dbl_sign;
-		return (v.v);
-	}
-
-	/*
-	 * If |input| < 1.0, return it, and set i to the appropriately
-	 * signed zero.
-	 */
-	if (u.s.dbl_exp < DBL_EXP_BIAS) {
-		v.v = 0.0;
-		v.s.dbl_sign = u.s.dbl_sign;
-		*iptr = v.v;
-		return (u.v);
-	}
-
-	/*
-	 * There can be a fractional part of the input.
-	 * If you look at the math involved for a few seconds, it's
-	 * plain to see that the integral part is the input, with the
-	 * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed,
-	 * the the fractional part is the part with the rest of the
-	 * bits zeroed.  Just zeroing the high bits to get the
-	 * fractional part would yield a fraction in need of
-	 * normalization.  Therefore, we take the easy way out, and
-	 * just use subtraction to get the fractional part.
-	 */
-	v.v = u.v;
-	/* Zero the low bits of the fraction, the sleazy way. */
-	frac = ((u_int64_t)v.s.dbl_frach << 32) + v.s.dbl_fracl;
-	frac >>= DBL_FRACBITS - (u.s.dbl_exp - DBL_EXP_BIAS);
-	frac <<= DBL_FRACBITS - (u.s.dbl_exp - DBL_EXP_BIAS);
-	v.s.dbl_fracl = frac & 0xffffffff;
-	v.s.dbl_frach = frac >> 32;
-	*iptr = v.v;
-
-	u.v -= v.v;
-	u.s.dbl_sign = v.s.dbl_sign;
-	return (u.v);
-}
diff --git a/lib/libc/arch/arm32/gen/setjmp.S b/lib/libc/arch/arm32/gen/setjmp.S
deleted file mode 100644
index 04e67780dee..00000000000
--- a/lib/libc/arch/arm32/gen/setjmp.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: setjmp.S,v 1.4 1997/07/23 20:55:19 kstailey Exp $"
-#endif
-
-	.text
-	.align	0
-
-ENTRY(setjmp)
-	stmfd	r13!, {r0, r14}
-	mov	r0, #0x00000000
-
-	bl	_sigblock
-	mov	r1, r0
-
-	ldmfd	r13!, {r0, r14}
-
-	str	r1, [r0], #0x0004
- 
-/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
-	LDR	a4,[a4,#0]
-	CMP	a4,#0
-	ADDEQ	a1,a1,#48
-	BEQ	|__setjmp_l1|
-	STFE	f4,[a1],#12
-	STFE	f5,[a1],#12
-	STFE	f6,[a1],#12
-	STFE	f7,[a1],#12
-|__setjmp_l1|*/
-	add	r0, r0, #48
-	stmia	r0, {r4-r9, r11, r13, r14}
-	mov	r0, #0x00000000
-	mov	r15, r14
-
-ENTRY(longjmp)
-	ldr	r2, [r0], #0x0004
-	stmfd	r13!, {r0, r1, r14}
-
-	mov	r0, r2
-	bl	_sigsetmask
-
-	ldmfd	r13!, {r0, r1, r14} 
-/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
-	LDR	a4,[a4,#0]
-	CMP	a4,#0
-	ADDEQ	a1,a1,#48
-	BEQ	|__longjmp_l1|
-	LDFE	f4,[a1],#12
-	LDFE	f5,[a1],#12
-	LDFE	f6,[a1],#12
-	LDFE	f7,[a1],#12
-|__longjmp_l1|*/
-	add	r2, r0, #48
-	ldmia	r2, {r4-r9, r11, r13, r14}
-	mov	r0, r1
-	teq	r0, #0x00000000
-	moveq	r0, #0x00000001
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/gen/sigsetjmp.S b/lib/libc/arch/arm32/gen/sigsetjmp.S
deleted file mode 100644
index 6744c63e49e..00000000000
--- a/lib/libc/arch/arm32/gen/sigsetjmp.S
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * All rights reserved.
- *
- * 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 Mark Brinicombe
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-#include "DEFS.h"
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigsetjmp.S,v 1.4 1997/07/23 20:55:19 kstailey Exp $"
-#endif
-
-	.text
-	.align	0
-
-ENTRY(sigsetjmp)
-/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
-	LDR	a4,[a4,#0]
-	CMP	a4,#0
-	ADDEQ	a1,a1,#48
-	BEQ	|__sigsetjmp_l1|
-	STFE	f4,[a1],#12
-	STFE	f5,[a1],#12
-	STFE	f6,[a1],#12
-	STFE	f7,[a1],#12
-|__sigsetjmp_l1|*/
-	add	r0, r0, #48
-	stmia	r0, {r1-r12, r13, r14}
-	mov	r0, #0x00000000
-	mov	r15, r14
-
-ENTRY(siglongjmp)
-	ldr	r2, L_siglongjmpret
-	str	r1, [r2]
-/*	  LDR	  a4,[pc,#|__fpflag_ptr|-.-8]
-	LDR	a4,[a4,#0]
-	CMP	a4,#0
-	ADDEQ	a1,a1,#48
-	BEQ	|__siglongjmp_l1|
-	LDFE	f4,[a1],#12
-	LDFE	f5,[a1],#12
-	LDFE	f6,[a1],#12
-	LDFE	f7,[a1],#12
-|__siglongjmp_l1|*/
-	add	r0, r0, #48
-	ldmia	r0, {r1-r12, r13, r14}
-	ldr	r0, L_siglongjmpret
-	ldr	r0, [r0]
-	teq	r0, #0x00000000
-	moveq	r0, #0x00000001
-	mov	r15, r14
-
-L_siglongjmpret:
-	.word	_siglongjmpret
-
-	.data
-	.align	0
-
-_siglongjmpret:
-	.word	0x00000000
diff --git a/lib/libc/arch/arm32/net/Makefile.inc b/lib/libc/arch/arm32/net/Makefile.inc
deleted file mode 100644
index 657a156fff5..00000000000
--- a/lib/libc/arch/arm32/net/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.2 1996/08/19 08:11:48 tholo Exp $
-
-SRCS+= htonl.c htons.c ntohl.c ntohs.c
diff --git a/lib/libc/arch/arm32/string/Makefile.inc b/lib/libc/arch/arm32/string/Makefile.inc
deleted file mode 100644
index 8c2cf082942..00000000000
--- a/lib/libc/arch/arm32/string/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.3 1999/04/25 00:23:57 millert Exp $
-
-SRCS+=	bcmp.c bcopy.c bzero.c ffs.c index.c memchr.c memcmp.c memset.c \
-	rindex.c strcat.c strcmp.c strcpy.c strcspn.c strlcpy.c strlen.c \
-	strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
-	strspn.c strstr.c swab.c
diff --git a/lib/libc/arch/arm32/sys/Ovfork.S b/lib/libc/arch/arm32/sys/Ovfork.S
deleted file mode 100644
index b9fd24a2065..00000000000
--- a/lib/libc/arch/arm32/sys/Ovfork.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: Ovfork.S,v 1.3 1996/08/19 08:11:51 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-/*
- * pid = vfork();
- */
-	.text
-	.align	0
-
-ENTRY(vfork)
-	mov	r2, r14
-	swi	SYS_vfork
-	bcs	cerror
-	sub	r1, r1, #0x00000001
-	and	r0, r0, r1
-	mov	r15, r2
diff --git a/lib/libc/arch/arm32/sys/brk.S b/lib/libc/arch/arm32/sys/brk.S
deleted file mode 100644
index b39063560b8..00000000000
--- a/lib/libc/arch/arm32/sys/brk.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: brk.S,v 1.3 1996/08/19 08:11:52 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.globl	_end
-	.globl	minbrk
-	.globl	curbrk
-
-	.data
-minbrk:	.long	_end
-	.text
-	.align	0
-
-ENTRY(brk)
-	ldr	r1, Lminbrk
-	cmp	r0, r1
-	movlt	r0, r1
-	mov	r2, r0
-	swi	SYS_break
-	bcs	cerror
-	mov	r0, #0x00000000
-	ldr	r1, Lcurbrk
-	str	r2, [r1]
-	mov	r15, r14
-
-Lminbrk:
-	.word	minbrk
-
-Lcurbrk:
-	.word	curbrk
diff --git a/lib/libc/arch/arm32/sys/cerror.S b/lib/libc/arch/arm32/sys/cerror.S
deleted file mode 100644
index 31ff79cd1cc..00000000000
--- a/lib/libc/arch/arm32/sys/cerror.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: cerror.S,v 1.4 1996/08/19 08:11:53 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.text
-	.align	0
-
-	.globl	_errno
-cerror:
-	ldr	r1, Lerrno
-	str	r0, [r1]
-	mvn	r0, #0x00000000
-	mvn	r1, #0x00000000
-	mov	r15, r14
-
-Lerrno:
-	.word	_errno
diff --git a/lib/libc/arch/arm32/sys/exect.S b/lib/libc/arch/arm32/sys/exect.S
deleted file mode 100644
index ce0e55700d6..00000000000
--- a/lib/libc/arch/arm32/sys/exect.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: exect.S,v 1.3 1996/08/19 08:11:54 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.text
-	.align	0
-
-ENTRY(exect)
-	swi	SYS_execve
-	bcs	cerror
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/sys/fork.S b/lib/libc/arch/arm32/sys/fork.S
deleted file mode 100644
index 72b2c6422e7..00000000000
--- a/lib/libc/arch/arm32/sys/fork.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fork.S,v 1.3 1996/08/19 08:11:55 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-SYSCALL(fork)
-	sub	r1, r1, #0x00000001
-	and	r0, r0, r1
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/sys/sbrk.S b/lib/libc/arch/arm32/sys/sbrk.S
deleted file mode 100644
index ba7b0ecb56b..00000000000
--- a/lib/libc/arch/arm32/sys/sbrk.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sbrk.S,v 1.3 1996/08/19 08:12:00 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-	.globl	_end
-	.globl	curbrk
-
-	.data
-curbrk:	.long	_end
-	.text
-	.align	0
-
-ENTRY(sbrk)
-	ldr	r2, Lcurbrk
-	ldr	r1, [r2]
-	mov	r3, r0
-	add	r0, r0, r1
-	swi	SYS_break
-	bcs	cerror
-	ldr	r0, [r2]
-	add	r1, r0, r3
-	str	r1, [r2]
-	mov	r15, r14
-
-Lcurbrk:
-	.word	curbrk
diff --git a/lib/libc/arch/arm32/sys/setlogin.S b/lib/libc/arch/arm32/sys/setlogin.S
deleted file mode 100644
index 27ac52bb615..00000000000
--- a/lib/libc/arch/arm32/sys/setlogin.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: setlogin.S,v 1.3 1996/08/19 08:12:01 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-	.globl	___logname_valid	/* in getlogin() */
-
-SYSCALL(setlogin)
-	mov	r0, #0x00000000
-	ldr	r1, Llogname
-	str	r0, [r1]
-	mov	r15, r14
-
-Llogname:
-	.word	___logname_valid
diff --git a/lib/libc/arch/arm32/sys/sigpending.S b/lib/libc/arch/arm32/sys/sigpending.S
deleted file mode 100644
index f6a890b0039..00000000000
--- a/lib/libc/arch/arm32/sys/sigpending.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigpending.S,v 1.3 1996/08/19 08:12:02 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-	.text
-	.align	0
-
-ENTRY(sigpending)
-	mov	r2, r0
-	swi	SYS_sigpending
-	bcs	cerror
-	str	r0, [r2]
-	mov	r0, #0x00000000
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/sys/sigprocmask.S b/lib/libc/arch/arm32/sys/sigprocmask.S
deleted file mode 100644
index 2f912a4ecab..00000000000
--- a/lib/libc/arch/arm32/sys/sigprocmask.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigprocmask.S,v 1.3 1996/08/19 08:12:03 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-	.text
-	.align	0
-
-ENTRY(sigprocmask)
-	teq	r1, #0x00000000
-	moveq	r0, #0x00000001
-	moveq	r1, #0x00000000
-	ldrne	r1, [r1]
-	swi	SYS_sigprocmask
-	bcs	cerror
-	teq	r2, #0x00000000
-	strne	r0, [r2]
-	mov	r0, #0x00000000
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/sys/sigreturn.S b/lib/libc/arch/arm32/sys/sigreturn.S
deleted file mode 100644
index 22eec041872..00000000000
--- a/lib/libc/arch/arm32/sys/sigreturn.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigreturn.S,v 1.3 1996/08/19 08:12:05 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-/* I must code this bit ... - mark */
-
-#if 0
-#ifdef PROF
-#undef ENTRY
-#define	ENTRY(x) \
-	.globl _/**/x; .align 2; _/**/x:  pusha ; \
-	.data; 1:; .long 0; .text; movl $1b,%eax; call mcount; popa ; nop
-#endif /* PROF */
-#endif
-
-SYSCALL(sigreturn)
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/sys/sigsuspend.S b/lib/libc/arch/arm32/sys/sigsuspend.S
deleted file mode 100644
index 234da140554..00000000000
--- a/lib/libc/arch/arm32/sys/sigsuspend.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigsuspend.S,v 1.3 1996/08/19 08:12:06 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-	.text
-	.align	0
-
-ENTRY(sigsuspend)
-	ldr	r0, [r0]
-	swi	SYS_sigsuspend
-	bcs	cerror
-	mov	r0, #0x00000000
-	mov	r15, r14
diff --git a/lib/libc/arch/arm32/sys/syscall.S b/lib/libc/arch/arm32/sys/syscall.S
deleted file mode 100644
index e6678f283d3..00000000000
--- a/lib/libc/arch/arm32/sys/syscall.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: syscall.S,v 1.3 1996/08/19 08:12:07 tholo Exp $"
-#endif /* SYSLIB_SCCS */
-
-	.text
-	.align	0
-
-ENTRY(syscall)
-	swi	0x00000000
-	bcs	cerror
-	mov	r15, r14
diff --git a/lib/libc/arch/ns32k/DEFS.h b/lib/libc/arch/ns32k/DEFS.h
deleted file mode 100644
index fbb8485e659..00000000000
--- a/lib/libc/arch/ns32k/DEFS.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * 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.
- *
- *	$OpenBSD: DEFS.h,v 1.2 1996/08/19 08:16:31 tholo Exp $
- *
- *  Modified for the ns532 by Phil Nelson, 12/1/92
- */
-
-#include <machine/asm.h>
diff --git a/lib/libc/arch/ns32k/Makefile.inc b/lib/libc/arch/ns32k/Makefile.inc
deleted file mode 100644
index f71da131ab3..00000000000
--- a/lib/libc/arch/ns32k/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/08/19 08:16:32 tholo Exp $
-
-KMINCLUDES= arch/ns32k/SYS.h arch/ns32k/DEFS.h
-KMSRCS=	setjmp.S htonl.S htons.S ntohl.S ntohs.S
diff --git a/lib/libc/arch/ns32k/SYS.h b/lib/libc/arch/ns32k/SYS.h
deleted file mode 100644
index a5d23afdb91..00000000000
--- a/lib/libc/arch/ns32k/SYS.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * 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.
- *
- *	$OpenBSD: SYS.h,v 1.2 1996/08/19 08:16:33 tholo Exp $
- *
- *  Modified for the ns532 by Phil Nelson, 12/1/92
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define	SYSCALL(x) \
-	ENTRY(x); \
-	movd CAT(SYS_,x),r0; \
-	SVC; \
-	bcs cerror
-
-#define	RSYSCALL(x) \
-	SYSCALL(x); \
-	ret 0
-
-#define	PSEUDO(x,y) \
-	ENTRY(x); \
-	movd CAT(SYS_,y),r0; \
-	SVC; \
-	ret 0
-
-#define	CALL(x,y) \
-	bsr CAT(_,y); \
-	adjspd -4*x
-
-	.globl	cerror
diff --git a/lib/libc/arch/ns32k/gen/Makefile.inc b/lib/libc/arch/ns32k/gen/Makefile.inc
deleted file mode 100644
index fc9ef41b215..00000000000
--- a/lib/libc/arch/ns32k/gen/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:16:34 tholo Exp $
-
-SRCS+=	__main.c _setjmp.S alloca.S fabs.S frexp.S infinity.c isinf.c
-SRCS+=	ldexp.S modf.S setjmp.S sigsetjmp.S
-SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-	fpsetround.c fpsetsticky.c
diff --git a/lib/libc/arch/ns32k/gen/__main.c b/lib/libc/arch/ns32k/gen/__main.c
deleted file mode 100644
index 97012af6aec..00000000000
--- a/lib/libc/arch/ns32k/gen/__main.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: __main.c,v 1.2 1996/08/19 08:16:36 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-__main(){}
diff --git a/lib/libc/arch/ns32k/gen/_setjmp.S b/lib/libc/arch/ns32k/gen/_setjmp.S
deleted file mode 100644
index 7bb03bde8e4..00000000000
--- a/lib/libc/arch/ns32k/gen/_setjmp.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-#include <machine/jmpbuf.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: _setjmp.S,v 1.2 1996/08/19 08:16:37 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(_setjmp)
-	movd	4(sp), r2		/* jmp_buf */
-	movd	0(sp), JMP_BUF_PC(r2)	/* pc of caller */
-
-	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	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
-
diff --git a/lib/libc/arch/ns32k/gen/alloca.S b/lib/libc/arch/ns32k/gen/alloca.S
deleted file mode 100644
index ba8700bf7a9..00000000000
--- a/lib/libc/arch/ns32k/gen/alloca.S
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 
- * 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.
- *
- * Note: Saved registers are accessed through the frame pointer so 
- * no special magic is required here.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: alloca.S,v 1.2 1996/08/19 08:16:37 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(alloca)
-	movd	tos,r2		/* get return address */
-	movd	tos,r1		/* get length */
-	sprd	sp,r0
-	subd	r1,r0
-	lprd	sp,r0
-	movd	r1,tos
-	jump	0(r2)
diff --git a/lib/libc/arch/ns32k/gen/fabs.S b/lib/libc/arch/ns32k/gen/fabs.S
deleted file mode 100644
index 19b4041b03a..00000000000
--- a/lib/libc/arch/ns32k/gen/fabs.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fabs.S,v 1.2 1996/08/19 08:16:39 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(fabs)
-	absl	S_ARG0,f0
-	ret	0
diff --git a/lib/libc/arch/ns32k/gen/flt_rounds.c b/lib/libc/arch/ns32k/gen/flt_rounds.c
deleted file mode 100644
index 3795f2f348e..00000000000
--- a/lib/libc/arch/ns32k/gen/flt_rounds.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 28, 1995
- * Public domain.
- */
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: flt_rounds.c,v 1.3 1997/08/01 21:36:31 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds()
-{
-	int x;
-
-	__asm__("sfsr %0" : "=r" (x));
-	return map[(x >> 7) & 0x03];
-}
diff --git a/lib/libc/arch/ns32k/gen/fpgetmask.c b/lib/libc/arch/ns32k/gen/fpgetmask.c
deleted file mode 100644
index 5b8ff91f4f3..00000000000
--- a/lib/libc/arch/ns32k/gen/fpgetmask.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpgetmask.c,v 1.2 1996/08/19 08:16:41 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ieeefp.h>
-#include <machine/cpufunc.h>
-#include <machine/fpu.h>
-
-fp_except
-fpgetmask()
-{
-	fp_except x;
-	fp_except ebits = FPC_IEN | FPC_OVE | FPC_IVE | FPC_DZE | FPC_UNDE;
-
-	sfsr(x);
-
-	return x & ebits;
-}
diff --git a/lib/libc/arch/ns32k/gen/fpgetround.c b/lib/libc/arch/ns32k/gen/fpgetround.c
deleted file mode 100644
index 4ec51c765d5..00000000000
--- a/lib/libc/arch/ns32k/gen/fpgetround.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 28, 1995
- * Public domain.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpgetround.c,v 1.2 1996/08/19 08:16:42 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ieeefp.h>
-
-fp_rnd
-fpgetround()
-{
-	int x;
-
-	__asm__("sfsr %0" : "=r" (x));
-	return (x >> 7) & 0x03;
-}
diff --git a/lib/libc/arch/ns32k/gen/fpgetsticky.c b/lib/libc/arch/ns32k/gen/fpgetsticky.c
deleted file mode 100644
index a22c6eb874f..00000000000
--- a/lib/libc/arch/ns32k/gen/fpgetsticky.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpgetsticky.c,v 1.2 1996/08/19 08:16:43 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ieeefp.h>
-#include <machine/cpufunc.h>
-#include <machine/fpu.h>
-
-fp_except
-fpgetsticky()
-{
-	fp_except x;
-	fp_except ebits = FPC_IEN | FPC_OVE | FPC_IVE | FPC_DZE | FPC_UNDE;
-
-	sfsr(x);
-	/* Map FPC_UF to soft underflow enable */
-	if (x & FPC_UF)
-		x |= FPC_UNDE << 1;
-	else
-		x &= ~(FPC_UNDE << 1);
-	x >>= 1;
-
-	return x & ebits;
-}
diff --git a/lib/libc/arch/ns32k/gen/fpsetmask.c b/lib/libc/arch/ns32k/gen/fpsetmask.c
deleted file mode 100644
index d874a18d8b3..00000000000
--- a/lib/libc/arch/ns32k/gen/fpsetmask.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpsetmask.c,v 1.2 1996/08/19 08:16:43 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ieeefp.h>
-#include <machine/cpufunc.h>
-#include <machine/fpu.h>
-
-fp_except
-fpsetmask(mask)
-	fp_except mask;
-{
-	fp_except old;
-	fp_except new;
-	fp_except ebits = FPC_IEN | FPC_OVE | FPC_IVE | FPC_DZE | FPC_UNDE;
-
-	sfsr(old);
-
-	new = old;
-	new &= ~ebits;
-	new |= mask & ebits;
-
-	lfsr(new);
-
-	return old & ebits;
-}
diff --git a/lib/libc/arch/ns32k/gen/fpsetround.c b/lib/libc/arch/ns32k/gen/fpsetround.c
deleted file mode 100644
index 0341521dc1b..00000000000
--- a/lib/libc/arch/ns32k/gen/fpsetround.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 28, 1995
- * Public domain.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpsetround.c,v 1.2 1996/08/19 08:16:45 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ieeefp.h>
-
-fp_rnd
-fpsetround(rnd_dir)
-	fp_rnd rnd_dir;
-{
-	fp_rnd old;
-	fp_rnd new;
-
-	__asm__("sfsr %0" : "=r" (old));
-
-	new = old;
-	new &= ~(0x03 << 7); 
-	new |= ((rnd_dir & 0x03) << 7);
-
-	__asm__("lfsr %0" : : "r" (new));
-
-	return (old >> 7) & 0x03;
-}
diff --git a/lib/libc/arch/ns32k/gen/fpsetsticky.c b/lib/libc/arch/ns32k/gen/fpsetsticky.c
deleted file mode 100644
index 2dc71aa3e7d..00000000000
--- a/lib/libc/arch/ns32k/gen/fpsetsticky.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: fpsetsticky.c,v 1.2 1996/08/19 08:16:45 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <ieeefp.h>
-#include <machine/cpufunc.h>
-#include <machine/fpu.h>
-
-fp_except
-fpsetsticky(sticky)
-	fp_except sticky;
-{
-	fp_except old;
-	fp_except new;
-	fp_except ebits = FPC_IEN | FPC_OVE | FPC_IVE | FPC_DZE | FPC_UEN | FPC_UNDE;
-
-	if (sticky & FPC_UNDE) {
-		sticky |= FPC_UEN;
-		sticky &= ~FPC_UNDE;
-	}
-
-	sfsr(old);
-
-	new = old;
-	new &= ebits;
-	new |= (sticky & ebits) << 1;
-
-	lfsr(new);
-
-	/* Map FPC_UF to soft underflow enable */
-	if (old & FPC_UF) {
-		old |= FPC_UNDE << 1;
-		old &= FPC_UF;
-	} else
-		old &= ~(FPC_UNDE << 1);
-	old >>= 1;
-
-	return old & ebits;
-}
diff --git a/lib/libc/arch/ns32k/gen/frexp.S b/lib/libc/arch/ns32k/gen/frexp.S
deleted file mode 100644
index ad8f6913414..00000000000
--- a/lib/libc/arch/ns32k/gen/frexp.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: frexp.S,v 1.2 1996/08/19 08:16:47 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(frexp)
-	enter	[],8
-	movd	12(fp),r1	/* value, high 32 bit */
-	cmpd	0,r1		/* check if 0 */ 
-	beq	frexp_zero	/* we do not support denormalized values */
-	movd	r1,r2
-	bicd	0x7ff00000,r2	/* clear exponent */
-	ord	0x3fe00000,r2	/* set it to 1024 == exponent -11 == .5-1 */
-	lshd	-20,r1		/* extract exponent */
-	andd	0x7ff,r1	/* 11 lower bits */
-	subd	1022,r1		/* unbias exponent */
-	movd	r1,0(16(fp))
-	movd	8(fp),-8(fp)	/* value, low 32 bit */
-	movd	r2,-4(fp)	/* value without exponent, high 32 bit */
-	movl	-8(fp),f0	/* load return value */
-	exit	[]
-	ret	0
-frexp_zero:
-	movqd	0,0(16(fp))	/* return exp = 0, mantissa = 9 */
-	movdl	0,f0
-	exit	[]
-	ret	0
-
diff --git a/lib/libc/arch/ns32k/gen/infinity.c b/lib/libc/arch/ns32k/gen/infinity.c
deleted file mode 100644
index 539abd9a2b4..00000000000
--- a/lib/libc/arch/ns32k/gen/infinity.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* infinity.c */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: infinity.c,v 1.3 1996/08/19 08:16:47 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <math.h>
-
-/* bytes for +Infinity on a ns32k */
-char __infinity[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
diff --git a/lib/libc/arch/ns32k/gen/isinf.c b/lib/libc/arch/ns32k/gen/isinf.c
deleted file mode 100644
index 8ec97b5ac7b..00000000000
--- a/lib/libc/arch/ns32k/gen/isinf.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: isinf.c,v 1.3 1996/08/19 08:16:48 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-/* I have not verified that this is correct for the ns32532 -- PAN */
-
-#include <sys/types.h>
-
-int
-isnan(d)
-	double d;
-{
-	register struct IEEEdp {
-		u_int manl : 32;
-		u_int manh : 20;
-		u_int  exp : 11;
-		u_int sign :  1;
-	} *p = (struct IEEEdp *)&d;
-
-	return(p->exp == 2047 && (p->manh || p->manl));
-}
-
-int
-isinf(d)
-	double d;
-{
-	register struct IEEEdp {
-		u_int manl : 32;
-		u_int manh : 20;
-		u_int  exp : 11;
-		u_int sign :  1;
-	} *p = (struct IEEEdp *)&d;
-
-	return(p->exp == 2047 && !p->manh && !p->manl);
-}
diff --git a/lib/libc/arch/ns32k/gen/ldexp.S b/lib/libc/arch/ns32k/gen/ldexp.S
deleted file mode 100644
index 6c97051be50..00000000000
--- a/lib/libc/arch/ns32k/gen/ldexp.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: ldexp.S,v 1.2 1996/08/19 08:16:49 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-#define ERANGE 34
-
-	.globl  _errno
-
-ENTRY(ldexp)
-	enter	[],8
-	movd	12(fp),r1	/* get value, high 32 bit */
-	lshd	-20,r1		/* extract exponent */
-	andd	0x7ff,r1	/* 11 lower bits */
-	subd	1023,r1		/* unbias exponent */
-	movd	16(fp),r0	/* get exp */
-	addd	r1,r0		/* add exponents */
-	cmpd	r0,1023		/* most positive exponent */
-	bgt	ldexp_overflow	/* too large */
-	cmpd	r0,-1022	/* most negative exponent */
-	blt	ldexp_underflow /* too small */
-	addd	1023,r0		/* bias exponent */
-	lshd	20,r0		/* convert exponent back to its place */
-	movd	12(fp),r1	/* get value high 32 bit */
-	bicd	0x7ff00000,r1	/* clear exponent */
-	ord	r0,r1		/* insert exponent */
-	movd	r1,-4(fp)	/* put high 32 bit to local variable */
-	movd	8(fp),-8(fp)	/* value low 32 bit to local variable */
-	movl	-8(fp),f0	/* return value * 2**exp */
-	exit	[]
-	ret	0		/* neither */
-ldexp_underflow:
-	movdl	0d0e0,f0	/* if underflow return 0, set errno */
-	PIC_PROLOGUE
-	movd	ERANGE,PIC_GOT(_errno)	/* set errno */
-	PIC_EPILOGUE
-	exit	[]
-	ret	0
-ldexp_overflow:
-	movl	huge(pc),f0	/* if overflow return HUGE */
-	movdl	0d0e0,f2
-	cmpl	f2,8(fp)	/* check original sign */
-	bgt	ldexp_positive
-	negl	f0,f0		/* if negative, return -HUGE */
-ldexp_positive:
-	PIC_PROLOGUE
-	movd	ERANGE,PIC_GOT(_errno)	/* set errno */
-	PIC_EPILOGUE
-	exit	[]
-	ret	0
-	
-huge:	.long	0xffffffff	/* the largest number that can */
-	.long	0x7fefffff	/* be represented in a long floating */
-				/* number.  This is given in hex in order */
-				/* to avoid floating conversions */
diff --git a/lib/libc/arch/ns32k/gen/modf.S b/lib/libc/arch/ns32k/gen/modf.S
deleted file mode 100644
index 96ba6873ed5..00000000000
--- a/lib/libc/arch/ns32k/gen/modf.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: modf.S,v 1.2 1996/08/19 08:16:50 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(modf)
-	FRAME
-	movl	8(fp),f0	/* value */
-	movd	12(fp),r0	/* higher 32 bit of value */
-	lshd	-20,r0		/* extract exponent */
-	andd	0x7ff,r0	/* 11 lower bits */
-	cmpd	r0,1023+30	/* compare if it's int part can fit in int */
-	bgt	modf_overflow	/* nope else it's ok to truncld it to int*/
-	truncld	f0,r0		/* get integer part */
-	movdl	r0,f2		/* convert back to float */
-	movl	f2,0(16(fp))	/* move integer part to *iptr */
-	subl	f2,f0		/* return fract. part = value - *iptr */
-	EMARF
-	ret	0
-modf_overflow:
-	subd	1023+20,r0	/* bias 1023, and upper part of
-				   floating point mantissa part */
-	movqd	-1,r2		/* generate mask to get fract. part */
-	cmpd	r0,32		/* if value > 2^52 (20+32) then all int part */
-	bhi	modf_all_ip
-	negd	r0,r0		/* shift right */
-	lshd	r0,r2		/* here */
-	comd	r2,r2		/* get fractional part complement mask */
-	movd	8(fp),r1	/* get lower 32 bit of value */
-	andd	r2,r1		/* mask fractional part off leave ip part */
-	movd	r1,0(16(fp))	/* store ip part to *iptr */
-	movd	12(fp),4(16(fp)) /* store other half to *iptr */
-	subl	0(16(fp)),f0	/* return fract. part = value - *iptr */
-	EMARF
-	ret	0
-modf_all_ip:
-	movl	8(fp),0(16(fp))	/* copy value to *iptr */
-	movdl	0,f0		/* return 0 for fract. part */
-	EMARF
-	ret	0
diff --git a/lib/libc/arch/ns32k/gen/setjmp.S b/lib/libc/arch/ns32k/gen/setjmp.S
deleted file mode 100644
index 48ff6f6f2c3..00000000000
--- a/lib/libc/arch/ns32k/gen/setjmp.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-#include <machine/jmpbuf.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: setjmp.S,v 1.2 1996/08/19 08:16:51 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(setjmp)
-	movqd	0, tos
-	bsr	_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	_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
-
diff --git a/lib/libc/arch/ns32k/gen/sigsetjmp.S b/lib/libc/arch/ns32k/gen/sigsetjmp.S
deleted file mode 100644
index 22064022469..00000000000
--- a/lib/libc/arch/ns32k/gen/sigsetjmp.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-#include <machine/jmpbuf.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigsetjmp.S,v 1.2 1996/08/19 08:16:52 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(sigsetjmp)
-	movd	4(sp), r2		/* jmp_buf */
-	movd	0(sp), JMP_BUF_PC(r2)	/* pc of caller */
-	movd	8(sp), r1		/* savemask */
-	movd	r1, JMP_BUF_SIGMASK+4(r2)
-	cmpqd	0, r1
-	beq	1f
-	movqd	0, tos
-	bsr	_sigblock
-	adjspb	-4
-	movd	4(sp), r2		/* jmp_buf */
-
-	movd	r0, JMP_BUF_SIGMASK(r2)	/* save mask */
-
-1:	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(siglongjmp)
-	movd	4(sp),r2		/* jmp_buf */
-	cmpqd	0, JMP_BUF_SIGMASK+4(r2)
-	beq	1f
-
-	movd	JMP_BUF_SIGMASK(r2), tos /* restore mask */
-	bsr	_sigsetmask
-	adjspb	-4
-	movd	4(sp), r2		/* jmp_buf */
-
-1:	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
-
diff --git a/lib/libc/arch/ns32k/net/Makefile.inc b/lib/libc/arch/ns32k/net/Makefile.inc
deleted file mode 100644
index 7bcc81ac78e..00000000000
--- a/lib/libc/arch/ns32k/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.3 1996/08/19 08:16:54 tholo Exp $
-
-SRCS+=  htonl.S htons.S ntohl.S ntohs.S
-LSRCS+=	htonl.c htons.c ntohl.c ntohs.c
diff --git a/lib/libc/arch/ns32k/net/htonl.S b/lib/libc/arch/ns32k/net/htonl.S
deleted file mode 100644
index 7620ac776af..00000000000
--- a/lib/libc/arch/ns32k/net/htonl.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: htonl.S,v 1.2 1996/08/19 08:16:55 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-	.text
-ENTRY(htonl)
-	movd	S_ARG0,r0
-	rotw	8,r0
-	rotd	16,r0
-	rotw	8,r0
-	ret	0
diff --git a/lib/libc/arch/ns32k/net/htons.S b/lib/libc/arch/ns32k/net/htons.S
deleted file mode 100644
index eb7825381c7..00000000000
--- a/lib/libc/arch/ns32k/net/htons.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: htons.S,v 1.2 1996/08/19 08:16:56 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-	.text
-ENTRY(htons)
-	movzwd	S_ARG0,r0
-	rotw	8,r0
-	ret	0
diff --git a/lib/libc/arch/ns32k/net/ntohl.S b/lib/libc/arch/ns32k/net/ntohl.S
deleted file mode 100644
index 3df515b6b3e..00000000000
--- a/lib/libc/arch/ns32k/net/ntohl.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: ntohl.S,v 1.2 1996/08/19 08:16:57 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-	.text
-ENTRY(ntohl)
-	movd	S_ARG0,r0
-	rotw	8,r0
-	rotd	16,r0
-	rotw	8,r0
-	ret	0
diff --git a/lib/libc/arch/ns32k/net/ntohs.S b/lib/libc/arch/ns32k/net/ntohs.S
deleted file mode 100644
index bc50be095a2..00000000000
--- a/lib/libc/arch/ns32k/net/ntohs.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: ntohs.S,v 1.2 1996/08/19 08:16:58 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-	.text
-ENTRY(ntohs)
-	movzwd	S_ARG0,r0
-	rotw	8,r0
-	ret	0
diff --git a/lib/libc/arch/ns32k/stdlib/abs.S b/lib/libc/arch/ns32k/stdlib/abs.S
deleted file mode 100644
index 6adcf04e59d..00000000000
--- a/lib/libc/arch/ns32k/stdlib/abs.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
- * 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.
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: abs.S,v 1.2 1996/08/19 08:17:00 tholo Exp $"
-#endif /* LIBC_SCCS */
-
-ENTRY(abs)
-	absd	S_ARG0,r0
-	ret 0
diff --git a/lib/libc/arch/ns32k/string/Makefile.inc b/lib/libc/arch/ns32k/string/Makefile.inc
deleted file mode 100644
index b6fb14c7a9d..00000000000
--- a/lib/libc/arch/ns32k/string/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1999/04/25 00:23:58 millert Exp $
-
-SRCS+=	bcmp.c bcopy.c bzero.c ffs.c index.c memchr.c memcmp.c memset.c \
-	rindex.c strcat.c strcmp.c strcpy.c strcspn.c strlcpy.c strlen.c \
-	strncat.c strncmp.c strncpy.c strpbrk.c strsep.c \
-	strspn.c strstr.c swab.c
diff --git a/lib/libc/arch/ns32k/string/bzero.c b/lib/libc/arch/ns32k/string/bzero.c
deleted file mode 100644
index 0e43bf36216..00000000000
--- a/lib/libc/arch/ns32k/string/bzero.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * 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 ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: bzero.c,v 1.2 1996/08/19 08:17:02 tholo Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-void
-bzero(addr, bcount)
-	register unsigned addr;
-	register unsigned bcount;
-{
-	register int    i;
-
-	if (bcount == 0)	/* sanity */
-		return;
-	switch (addr & 3) {
-	    case 1:
-		*((char *) addr++) = 0;
-		if (--bcount == 0)
-			return;
-	    case 2:
-		*((char *) addr++) = 0;
-		if (--bcount == 0)
-			return;
-	    case 3:
-		*((char *) addr++) = 0;
-		if (--bcount == 0)
-			return;
-	    default:
-		break;
-	}
-
-	for (i = bcount >> 2; i; i--, addr += 4)
-		*((int *) addr) = 0;
-
-	switch (bcount & 3) {
-	    case 3: *((char*)addr++) = 0;
-	    case 2: *((char*)addr++) = 0;
-	    case 1: *((char*)addr++) = 0;
-	    default:break;
-	}
-}
diff --git a/lib/libc/arch/ns32k/sys/Ovfork.S b/lib/libc/arch/ns32k/sys/Ovfork.S
deleted file mode 100644
index 4ded9c2a390..00000000000
--- a/lib/libc/arch/ns32k/sys/Ovfork.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: Ovfork.S,v 1.2 1996/08/19 08:17:04 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-/* 
- * r0 = pid of child in parent / pid of parent in child
- * r1 = 0 in parent, 1 in child
- */
-SYSCALL(vfork)
-	cmpqd	0,r1
-	beq	parent
-	movqd	0,r0
-parent:
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/brk.S b/lib/libc/arch/ns32k/sys/brk.S
deleted file mode 100644
index 68497fb4d9d..00000000000
--- a/lib/libc/arch/ns32k/sys/brk.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: brk.S,v 1.2 1996/08/19 08:17:05 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.globl	_curbrk
-	.globl	minbrk
-
-ENTRY(_brk)
-	br	ok2
-
-ENTRY(brk)
-	PIC_PROLOGUE
-	cmpd	PIC_S_ARG0, PIC_GOT(minbrk)
-	bge	ok1
-	movd	PIC_GOT(minbrk), PIC_S_ARG0
-ok1:
-	PIC_EPILOGUE
-ok2:
-	movd	SYS_break, r0
-	SVC
-	bcs	cerror
-	PIC_PROLOGUE
-	movd	PIC_S_ARG0, PIC_GOT(_curbrk)
-	movqd	0, r0
-	PIC_EPILOGUE
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/cerror.S b/lib/libc/arch/ns32k/sys/cerror.S
deleted file mode 100644
index 2381bd9a16e..00000000000
--- a/lib/libc/arch/ns32k/sys/cerror.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: cerror.S,v 1.2 1996/08/19 08:17:06 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.globl  cerror
-	.globl	_errno
-
-cerror:
-	PIC_PROLOGUE
-	movd	r0, PIC_GOT(_errno)
-	PIC_EPILOGUE
-	movqd	-1, r0
-	movqd	-1, r1
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/exect.S b/lib/libc/arch/ns32k/sys/exect.S
deleted file mode 100644
index 88edf4b2436..00000000000
--- a/lib/libc/arch/ns32k/sys/exect.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: exect.S,v 1.2 1996/08/19 08:17:07 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-ENTRY(exect)
-	sprb	us, r0
-	orb	PSL_T, r0
-	lprb	us, r0
-	movd	SYS_execve, r0
-	SVC
-	bcs	cerror
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/fork.S b/lib/libc/arch/ns32k/sys/fork.S
deleted file mode 100644
index a47b9c82d5e..00000000000
--- a/lib/libc/arch/ns32k/sys/fork.S
+++ /dev/null
@@ -1,31 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: fork.S,v 1.2 1996/08/19 08:17:08 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-/* r0  = pid. r1 = 0 in parent, 1 in child */
-
-SYSCALL(fork)
-	cmpqd	0, r1
-	beq	parent
-	movqd	0, r0
-parent:
-	ret	0	/*  pid = fork() */
diff --git a/lib/libc/arch/ns32k/sys/sbrk.S b/lib/libc/arch/ns32k/sys/sbrk.S
deleted file mode 100644
index f3b9e5956e6..00000000000
--- a/lib/libc/arch/ns32k/sys/sbrk.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sbrk.S,v 1.2 1996/08/19 08:17:12 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.data
-	.globl	_end
-	.globl	_curbrk; .type _curbrk, @object; .size _curbrk, 4
-	.globl	minbrk; .type minbrk, @object; .size minbrk, 4
-_curbrk:	.long	_end
-minbrk:		.long	_end
-
-	.text
-
-ENTRY(sbrk)
-	PIC_PROLOGUE
-	addd	PIC_GOT(_curbrk), PIC_S_ARG0
-	PIC_EPILOGUE
-	movd	SYS_break, r0
-	SVC
-	bcs	cerror
-	PIC_PROLOGUE
-	movd	PIC_GOT(_curbrk), r0
-	movd	PIC_S_ARG0, PIC_GOT(_curbrk)	/* XXX check this b */
-	PIC_EPILOGUE
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/setlogin.S b/lib/libc/arch/ns32k/sys/setlogin.S
deleted file mode 100644
index aa1c5ba82f0..00000000000
--- a/lib/libc/arch/ns32k/sys/setlogin.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: setlogin.S,v 1.3 1997/07/23 20:55:27 kstailey Exp $"
-#endif /* SYSLIBC_SCCS */
-
-	.globl	___logname_valid	 /* in getlogin() */
-
-SYSCALL(setlogin)
-	PIC_PROLOGUE
-	movqd	0, PIC_GOT(___logname_valid)
-	PIC_EPILOGUE
-	ret	0			/* setlogin(name) */
diff --git a/lib/libc/arch/ns32k/sys/sigpending.S b/lib/libc/arch/ns32k/sys/sigpending.S
deleted file mode 100644
index becbbe3027f..00000000000
--- a/lib/libc/arch/ns32k/sys/sigpending.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigpending.S,v 1.2 1996/08/19 08:17:14 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-SYSCALL(sigpending)
-	movd	S_ARG1, r1		/* fetch pointer to... */
-	movd	r0, 0(r1)		/* store old mask */
-	movqd	0, r0
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/sigprocmask.S b/lib/libc/arch/ns32k/sys/sigprocmask.S
deleted file mode 100644
index 1bd6fcc00e3..00000000000
--- a/lib/libc/arch/ns32k/sys/sigprocmask.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigprocmask.S,v 1.2 1996/08/19 08:17:15 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-ENTRY(sigprocmask)
-	movd	S_ARG1, r1		/* fetch new sigset pointer */
-	cmpqd	0, r1			/* check new sigset pointer */
-	bne	L1			/* if not null, indirect */
-/*	movqd	0, S_ARG1		/* null mask pointer: block empty set */
-	movqd	1, S_ARG0		/* SIG_BLOCK */
-	br	L2
-L1:	movd	0(r1), r1		/* fetch indirect  ... */
-	movd	r1, S_ARG1		/* to new mask arg */
-L2:	movd	SYS_sigprocmask, r0
-	SVC
-	bcs	cerror
-	movd	S_ARG2, r1		/* fetch old mask requested */
-	cmpqd	0, r1			/* test if old mask requested */
-	beq	out
-	movd	r0, 0(r1)		/* store old mask */
-out:
-	movqd	0, r0
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/sigreturn.S b/lib/libc/arch/ns32k/sys/sigreturn.S
deleted file mode 100644
index fec02b8cc69..00000000000
--- a/lib/libc/arch/ns32k/sys/sigreturn.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigreturn.S,v 1.3 2001/08/12 12:03:01 heko Exp $"
-#endif /* SYSLIBC_SCCS */
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-#ifdef PROF
-#undef ENTRY
-#define	ENTRY(x) \
-	.globl EX(x); \
-	.align ALIGN; \
-	EX(x): save [r0,r1,r2]; \
-	.data; 1:; .long 0; \
-	.text; addr 1b(pc),r0; bsr mcount; \
-	restore [r0,r1,r2]
-#endif /* PROF */
-
-SYSCALL(sigreturn)
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/sigsuspend.S b/lib/libc/arch/ns32k/sys/sigsuspend.S
deleted file mode 100644
index 501f3f5c3fc..00000000000
--- a/lib/libc/arch/ns32k/sys/sigsuspend.S
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: sigsuspend.S,v 1.2 1996/08/19 08:17:18 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-ENTRY(sigsuspend)
-	movd	S_ARG0, r0		/* fetch mask arg */
-	movd	0(r0), r0		/* indirect to mask arg */
-	movd	r0, S_ARG0
-	movd	SYS_sigsuspend, r0
-	SVC
-	bcs	cerror
-	movqd	0, r0			/* shouldn t happen */
-	ret	0
diff --git a/lib/libc/arch/ns32k/sys/syscall.S b/lib/libc/arch/ns32k/sys/syscall.S
deleted file mode 100644
index d5c6fbfeb63..00000000000
--- a/lib/libc/arch/ns32k/sys/syscall.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* 
- * 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.
- */
-
-#include "SYS.h"
-
-#if defined(SYSLIBC_SCCS)
-	.text
-	.asciz "$OpenBSD: syscall.S,v 1.2 1996/08/19 08:17:19 tholo Exp $"
-#endif /* SYSLIBC_SCCS */
-
-ENTRY(syscall)
-	movqd	0, r0	/* Tell system this is syscall! */
-	SVC
-	bcs	cerror
-	ret	0