We are done providing support for the vax.

lots of agreement.

10 files changed, 0 insertions, 547 deletions

diff --git a/lib/libc/arch/vax/string/Makefile.inc b/lib/libc/arch/vax/string/Makefile.inc
deleted file mode 100644
index a246341aed2..00000000000
--- a/lib/libc/arch/vax/string/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2015/05/15 22:29:37 millert Exp $
-
-SRCS+=	bcopy.S memcpy.c memmove.S \
-	bcmp.S bzero.S ffs.S memchr.c memcmp.S \
-	memset.S \
-	strchr.S strrchr.c \
-	strcat.c strcmp.c strcpy.c strcspn.c strlen.c strlcat.c \
-	strlcpy.c strncat.c strncmp.c strncpy.c strpbrk.c \
-	strsep.c strspn.c strstr.c swab.c
diff --git a/lib/libc/arch/vax/string/bcmp.S b/lib/libc/arch/vax/string/bcmp.S
deleted file mode 100644
index c25d46c5102..00000000000
--- a/lib/libc/arch/vax/string/bcmp.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$OpenBSD: bcmp.S,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1983, 1993
- *	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. 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 "DEFS.h"
-
-/* Since "cmpc3" is not portable across VAXen, do it the hard way */
-/*  still, this is four times faster than the generic C version on a uvax2 */
-
-ENTRY(bcmp, 0)
-	movl	12(%ap),%r0	# r0 = n
-	jeql	9f
-	movq	4(%ap),%r1	# r1 = s1, r2 = s2
-	ashl	$-2,%r0,%r3	# convert len to # of long words
-	jeql	2f
-1:
-	cmpl	(%r1)+,(%r2)+	# no "cmpq" alas, so four bytes at a time
-	jneq	9f
-	sobgtr	%r3,1b
-2:
-	bicl3	$-4,%r0,%r3	# handle at most 3 extra bytes
-	jeql	8f
-3:
-	cmpb	(%r1)+,(%r2)+
-	jneq	9f
-	sobgtr	%r3,3b
-8:
-	clrl	%r0		# we have a match!
-9:
-	ret
-END_WEAK(bcmp)
diff --git a/lib/libc/arch/vax/string/bcopy.S b/lib/libc/arch/vax/string/bcopy.S
deleted file mode 100644
index 27d5d8fd24a..00000000000
--- a/lib/libc/arch/vax/string/bcopy.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$OpenBSD: bcopy.S,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1983, 1993
- *	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. 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.
- */
-
-/* bcopy(from, to, size) */
-
-#include "DEFS.h"
-
-ENTRY(bcopy, R2|R3|R4|R5|R6)
-	movl	4(%ap),%r1
-	movl	8(%ap),%r3
-	movl	12(%ap),%r6
-	cmpl	%r1,%r3
-	bgtr	2f		# normal forward case
-	blss	3f		# overlapping, must do backwards
-	ret			# equal, nothing to do
-1:
-	subl2	%r0,%r6
-	movc3	%r0,(%r1),(%r3)
-2:
-	movzwl	$65535,%r0
-	cmpl	%r6,%r0
-	jgtr	1b
-	movc3	%r6,(%r1),(%r3)
-	ret
-3:
-	addl2	%r6,%r1
-	addl2	%r6,%r3
-	movzwl	$65535,%r0
-	jbr	5f
-4:
-	subl2	%r0,%r6
-	subl2	%r0,%r1
-	subl2	%r0,%r3
-	movc3	%r0,(%r1),(%r3)
-	movzwl	$65535,%r0
-	subl2	%r0,%r1
-	subl2	%r0,%r3
-5:
-	cmpl	%r6,%r0
-	jgtr	4b
-	subl2	%r6,%r1
-	subl2	%r6,%r3
-	movc3	%r6,(%r1),(%r3)
-	ret
-END_WEAK(bcopy)
diff --git a/lib/libc/arch/vax/string/bzero.S b/lib/libc/arch/vax/string/bzero.S
deleted file mode 100644
index 0867d3971c3..00000000000
--- a/lib/libc/arch/vax/string/bzero.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$OpenBSD: bzero.S,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1983, 1993
- *	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. 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.
- */
-
-/* bzero(base, length) */
-
-#include "DEFS.h"
-
-ENTRY(bzero, R2|R3|R4|R5)
-	movl	4(%ap),%r3
-	jbr	2f
-1:
-	subl2	%r0,8(%ap)
-	movc5	$0,(%r3),$0,%r0,(%r3)
-2:
-	movzwl	$65535,%r0
-	cmpl	8(%ap),%r0
-	jgtr	1b
-	movc5	$0,(%r3),$0,8(%ap),(%r3)
-	ret
-END_WEAK(bzero)
diff --git a/lib/libc/arch/vax/string/ffs.S b/lib/libc/arch/vax/string/ffs.S
deleted file mode 100644
index 1e75f128a06..00000000000
--- a/lib/libc/arch/vax/string/ffs.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$OpenBSD: ffs.S,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1983, 1993
- *	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. 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.
- */
-
-/* bit = ffs(value) */
-
-#include "DEFS.h"
-
-ENTRY(ffs, 0)
-	ffs	$0,$32,4(%ap),%r0
-	bneq	1f
-	mnegl	$1,%r0
-1:
-	incl	%r0
-	ret
-END_WEAK(ffs)
diff --git a/lib/libc/arch/vax/string/memcmp.S b/lib/libc/arch/vax/string/memcmp.S
deleted file mode 100644
index 8fdf29435bb..00000000000
--- a/lib/libc/arch/vax/string/memcmp.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$OpenBSD: memcmp.S,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990, 1993
- *	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. 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.
- */
-
-/* int memcmp(s1, s2, n) */
-
-#include "DEFS.h"
-
-ENTRY(memcmp, 0)
-	movl	12(%ap),%r0
-	jeql	9f
-	movq	4(%ap),%r1
-	ashl	$-2,%r0,%r3	# convert len to long words
-	jeql	2f
-1:
-	cmpl	(%r1)+,(%r2)+	# no "cmpq" alas
-	jneq	7f
-	sobgtr	%r3,1b
-2:
-	bicl3	$-4,%r0,%r3	# handle at most 3 extra bytes
-	jeql	4f
-3:
-	cmpb	(%r1)+,(%r2)+
-	jneq	8f
-	sobgtr	%r3,3b
-4:
-	clrl	%r0		# we had a match
-	ret
-7:				# backup, and do a byte compare
-	tstl	-(%r1)
-	tstl	-(%r2)
-	movl	$4,%r3
-	jbr	3b
-8:
-	movzbl	-(%r1),%r3
-	movzbl	-(%r2),%r4
-	subl3	%r4,%r3,%r0
-9:
-	ret
-END_STRONG(memcmp)
diff --git a/lib/libc/arch/vax/string/memcpy.S b/lib/libc/arch/vax/string/memcpy.S
deleted file mode 100644
index e13ae0baa24..00000000000
--- a/lib/libc/arch/vax/string/memcpy.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$OpenBSD: memcpy.S,v 1.9 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990, 1993
- *	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. 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.
- */
-
-/*
- * void *memcpy(dst, src, size)
- * returns dst
- *
- * This optimises the usual case (count < 65536) at the expense
- * of some extra memory references and branches when count >= 65536.
- */
-
-#include "DEFS.h"
-
-ENTRY(memcpy, R2|R3|R4|R5)
-	movzwl	$65535,%r0	/* r0 = 64K (needed below) */
-	movq	8(%ap),%r1	/* r1 = src, r2 = length */
-	movl	4(%ap),%r3	/* r3 = dst */
-1:
-	/* copy forward */
-	cmpl	%r2,%r0
-	bgtru	3f		/* stupid movc3 limitation */
-	movc3	%r2,(%r1),(%r3)	/* move it all */
-2:
-	movl	4(%ap),%r0	/* return original dst */
-	ret
-3:
-	subl2	%r0,12(%ap)	/* adjust length by 64K */
-	movc3	%r0,(%r1),(%r3)	/* move 64K */
-	movl	12(%ap),%r2
-	decw	%r0		/* from 0 to 65535 */
-	brb	1b		/* retry */
-END_STRONG(memcpy)
diff --git a/lib/libc/arch/vax/string/memmove.S b/lib/libc/arch/vax/string/memmove.S
deleted file mode 100644
index 3f71d2629c1..00000000000
--- a/lib/libc/arch/vax/string/memmove.S
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$OpenBSD: memmove.S,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990, 1993
- *	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. 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.
- */
-
-/*
- * void *memmove(dst, src, size)
- * returns dst
- *
- * This optimises the usual case (count < 65536) at the expense
- * of some extra memory references and branches when count >= 65536.
- */
-
-#include "DEFS.h"
-
-ENTRY(memmove, R2|R3|R4|R5)
-	movzwl	$65535,%r0	/* r0 = 64K (needed below) */
-	movq	8(%ap),%r1	/* r1 = src, r2 = length */
-	movl	4(%ap),%r3	/* r3 = dst */
-	cmpl	%r1,%r3
-	bgtru	1f		/* normal forward case */
-	beql	2f		/* equal, nothing to do */
-	addl2	%r2,%r1		/* overlaps iff src<dst but src+len>dst */
-	cmpl	%r1,%r3
-	bgtru	4f		/* overlapping, must move backwards */
-	subl2	%r2,%r1
-
-1:	/* move forward */
-	cmpl	%r2,%r0
-	bgtru	3f		/* stupid movc3 limitation */
-	movc3	%r2,(%r1),(%r3)	/* move it all */
-2:
-	movl	4(%ap),%r0	/* return original dst */
-	ret
-3:
-	subl2	%r0,12(%ap)	/* adjust length by 64K */
-	movc3	%r0,(%r1),(%r3)	/* move 64K */
-	movl	12(%ap),%r2
-	decw	%r0		/* from 0 to 65535 */
-	brb	1b		/* retry */
-
-4:	/* move backward */
-	addl2	%r2,%r3
-5:
-	cmpl	%r2,%r0
-	bgtru	6f		/* stupid movc3 limitation */
-	subl2	%r2,%r1
-	subl2	%r2,%r3
-	movc3	%r2,(%r1),(%r3)	/* move it all */
-	movl	4(%ap),%r0	/* return original dst */
-	ret
-6:
-	subl2	%r0,12(%ap)	/* adjust length by 64K */
-	subl2	%r0,%r1
-	subl2	%r0,%r3
-	movc3	%r0,(%r1),(%r3)	/* move 64K */
-	movl	12(%ap),%r2
-	decw	%r0
-	subl2	%r0,%r1
-	subl2	%r0,%r3
-	brb	5b
-END_STRONG(memmove)
diff --git a/lib/libc/arch/vax/string/memset.S b/lib/libc/arch/vax/string/memset.S
deleted file mode 100644
index 40bada34ea7..00000000000
--- a/lib/libc/arch/vax/string/memset.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$OpenBSD: memset.S,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
-/*-
- * Copyright (c) 1990, 1993
- *	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. 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.
- */
-
-/* void *memset(base, c, length) */
-
-#include "DEFS.h"
-
-ENTRY(memset, R2|R3|R4|R5)
-	movl	4(%ap),%r3
-1:
-	movzwl	$65535,%r0
-	movq	8(%ap),%r1
-	cmpl	%r2,%r0
-	jgtru	2f
-	movc5	$0,(%r3),%r1,%r2,(%r3)
-	movl	%r1,%r0
-	ret
-2:
-	subl2	%r0,12(%ap)
-	movc5	$0,(%r3),%r1,%r0,(%r3)
-	jbr	1b
-END_STRONG(memset)
diff --git a/lib/libc/arch/vax/string/strchr.S b/lib/libc/arch/vax/string/strchr.S
deleted file mode 100644
index 7c8b8de57dd..00000000000
--- a/lib/libc/arch/vax/string/strchr.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$OpenBSD: strchr.S,v 1.3 2015/08/31 02:53:57 guenther Exp $ */
-/*
- * Copyright (c) 1980, 1993
- *	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. 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.
- */
-
-/*
- * Find the first occurrence of c in the string cp.
- * Return pointer to match or null pointer.
- *
- * char *strchr(char *cp, char c)
- */
-#include "DEFS.h"
-
-/* Alas not quite twice as fast as the generic C version on a uvax2 */
-
-WEAK_ALIAS(index, strchr)
-ENTRY(strchr, 0)
-	movq	4(%ap),%r0	# r0 = cp; r1 = c
-	tstb	%r1		# special case, looking for '\0'
-	jeql	3f
-1:
-	cmpb	(%r0),%r1
-	jeql	2f
-	tstb	(%r0)+
-	jneq	1b
-	clrl	%r0		# return NULL if no match
-2:
-	ret
-3:
-	tstb	(%r0)+
-	jneq	3b
-	decl	%r0
-	jbr	2b
-END_STRONG(strchr)