bcmp.S bye-bye; use generic bcmp.c version which is as good as this one

2 files changed, 3 insertions, 88 deletions

diff --git a/sys/lib/libkern/arch/hppa/Makefile.inc b/sys/lib/libkern/arch/hppa/Makefile.inc
index 4e344d184f3..8ebc6ee0c5d 100644
--- a/sys/lib/libkern/arch/hppa/Makefile.inc
+++ b/sys/lib/libkern/arch/hppa/Makefile.inc
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile.inc,v 1.10 2000/06/29 16:30:26 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.11 2000/06/29 16:39:47 mickey Exp $
 
 SRCS+=	__main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
 	random.c ashrdi3.c divdi3.c strncpy.c strncmp.c strcmp.c memchr.c \
 	memcmp.c memset.c strlen.c strcpy.c strcat.c skpc.c strncasecmp.c \
-	scanc.c
+	bcmp.c scanc.c
 
-SRCS+=	milli.S bcmp.S ffs.S
+SRCS+=	milli.S ffs.S
 OBJS+=	bzero.o
 
 SRCS+=	bcopy.S spcopy.S
diff --git a/sys/lib/libkern/arch/hppa/bcmp.S b/sys/lib/libkern/arch/hppa/bcmp.S
deleted file mode 100644
index 4ddea040198..00000000000
--- a/sys/lib/libkern/arch/hppa/bcmp.S
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$OpenBSD: bcmp.S,v 1.2 1999/05/09 18:49:10 mickey Exp $	*/
-
-/*
- * Copyright 1996 1995 by Open Software Foundation, Inc.   
- *              All Rights Reserved 
- *  
- * Permission to use, copy, modify, and distribute this software and 
- * its documentation for any purpose and without fee is hereby granted, 
- * provided that the above copyright notice appears in all copies and 
- * that both the copyright notice and this permission notice appear in 
- * supporting documentation. 
- *  
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE 
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- * FOR A PARTICULAR PURPOSE. 
- *  
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR 
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT, 
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION 
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
- */
-/*
- * pmk1.1
- */
-/*
- *  (c) Copyright 1988 HEWLETT-PACKARD COMPANY
- *
- *  To anyone who acknowledges that this file is provided "AS IS"
- *  without any express or implied warranty:
- *      permission to use, copy, modify, and distribute this file
- *  for any purpose is hereby granted without fee, provided that
- *  the above copyright notice and this notice appears in all
- *  copies, and that the name of Hewlett-Packard Company not be
- *  used in advertising or publicity pertaining to distribution
- *  of the software without specific, written prior permission.
- *  Hewlett-Packard Company makes no representations about the
- *  suitability of this software for any purpose.
- */
-
-/*
- * Copyright (c) 1990,1991,1994 The University of Utah and
- * the Computer Systems Laboratory (CSL).  All rights reserved.
- *
- * THE UNIVERSITY OF UTAH AND CSL PROVIDE THIS SOFTWARE IN ITS "AS IS"
- * CONDITION, AND DISCLAIM ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
- * WHATSOEVER RESULTING FROM ITS USE.
- *
- * CSL requests users of this software to return to csl-dist@cs.utah.edu any
- * improvements that they make and grant CSL redistribution rights.
- *
- * 	Utah $Hdr: movc.s 1.26 94/12/14$
- */
-
-#include <machine/asm.h>
-
-	.space	$TEXT$
-
-	.code
-
-/*
- * int
- * bcmp(src, dst, count)
- *	vm_offset_t	src;
- *	vm_offset_t	dst;
- *	int		count;
- */
-ENTRY(bcmp)
-        comb,>= r0,arg2,$bcmp_exit
-	copy	t1,t2
-
-$bcmp_loop
-	ldbs,ma	1(arg0),t1
-	ldbs,ma	1(arg1),t2
-	comb,<>,n t1,t2,$bcmp_exit
-	addib,<> -1,arg2,$bcmp_loop
-	nop
-
-$bcmp_exit
-	bv	0(rp)
-	sub	t1,t2,ret0
-
-EXIT(bcmp)
-
-	.end