From cae2b5e563c775a9fa1fb75a4dc35363171b4135 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 1 May 1996 15:17:31 +0000 Subject: [PATCH] sparc needs memset, compiler calls it automatically --- sys/lib/libkern/arch/sparc/Makefile.inc | 6 +-- sys/lib/libkern/arch/sparc/memset.c | 66 +------------------------ 2 files changed, 4 insertions(+), 68 deletions(-) diff --git a/sys/lib/libkern/arch/sparc/Makefile.inc b/sys/lib/libkern/arch/sparc/Makefile.inc index 260b25ab570..2fe78069580 100644 --- a/sys/lib/libkern/arch/sparc/Makefile.inc +++ b/sys/lib/libkern/arch/sparc/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.2 1996/04/21 22:28:01 deraadt Exp $ -# $NetBSD: Makefile.inc,v 1.11 1996/04/13 01:17:53 cgd Exp $ +# $OpenBSD: Makefile.inc,v 1.3 1996/05/01 15:17:31 deraadt Exp $ +# $NetBSD: Makefile.inc,v 1.12 1996/04/23 23:05:22 christos Exp $ SRCS+= __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \ bcmp.c bzero.S strcat.c strcmp.c strcpy.c strlen.S strncmp.c \ - strncpy.c htonl.S htons.S ntohl.S ntohs.S scanc.c skpc.c memset.c \ + strncpy.c htonl.S htons.S ntohl.S ntohs.S scanc.c skpc.c \ strncasecmp.c SRCS+= umul.S mul.S rem.S sdiv.S udiv.S umul.S urem.S diff --git a/sys/lib/libkern/arch/sparc/memset.c b/sys/lib/libkern/arch/sparc/memset.c index af092288f49..f53f078520d 100644 --- a/sys/lib/libkern/arch/sparc/memset.c +++ b/sys/lib/libkern/arch/sparc/memset.c @@ -1,65 +1 @@ -/* $OpenBSD: memset.c,v 1.2 1996/04/19 16:09:46 niklas Exp $ */ -/* $NetBSD: memset.c,v 1.4 1996/03/11 05:46:51 scottr Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * 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) -#ifdef notdef -static char *sccsid = "@(#)memset.c 5.6 (Berkeley) 1/26/91"; -#endif -static char *rcsid = "$NetBSD: memset.c,v 1.4 1996/03/11 05:46:51 scottr Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#include -#include - -void * -memset(dst, c, n) - void *dst; - register int c; - register size_t n; -{ - - if (n != 0) { - register char *d = dst; - - do - *d++ = c; - while (--n != 0); - } - return (dst); -} +/* $OpenBSD: memset.c,v 1.3 1996/05/01 15:17:32 deraadt Exp $ */ -- 2.20.1