Remove support for NetBSD syscalls.

9 files changed, 3 insertions, 378 deletions

diff --git a/lib/libc/alpha/gen/Makefile.inc b/lib/libc/alpha/gen/Makefile.inc
index 98e0c2a..3ff99f0 100644
--- a/lib/libc/alpha/gen/Makefile.inc
+++ b/lib/libc/alpha/gen/Makefile.inc
@@ -1,10 +1,7 @@
-#	$Id: Makefile.inc,v 1.2 1998/05/15 12:01:05 jb Exp $
+#	$Id: Makefile.inc,v 1.3 1998/08/08 02:18:07 jb Exp $
 
 SRCS+=	_setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S
 SRCS+=	flt_rounds.c
-.if defined(NETBSD_SYSCALLS)
-SRCS+=	netbsd_getdtablesize.c
-.endif
 
 #SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
 #	fpsetround.c fpsetsticky.c
diff --git a/lib/libc/alpha/gen/netbsd_getdtablesize.c b/lib/libc/alpha/gen/netbsd_getdtablesize.c
deleted file mode 100644
index 9ceb711..0000000
--- a/lib/libc/alpha/gen/netbsd_getdtablesize.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $Id$ */
-/*	From: NetBSD: getdtablesize.c,v 1.5 1997/07/21 14:06:26 jtc Exp	*/
-
-/*
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] =
-		"$Id$";
-#endif /* LIBC_SCCS and not lint */
-
-#include <unistd.h>
-
-int
-getdtablesize()
-{
-	return sysconf(_SC_OPEN_MAX);
-}
diff --git a/lib/libc/alpha/gen/setjmp.S b/lib/libc/alpha/gen/setjmp.S
index a41d4c2..86dbb38 100644
--- a/lib/libc/alpha/gen/setjmp.S
+++ b/lib/libc/alpha/gen/setjmp.S
@@ -68,11 +68,7 @@ LEAF(setjmp, 1)
 	lda	sp, -24(sp)			/* sizeof struct sigaltstack */
 	mov	zero, a0
 	mov	sp, a1
-#ifdef __NETBSD_SYSCALLS
-	CALL(__sigaltstack14)
-#else
 	CALL(sigaltstack)
-#endif
 	ldl	t0, 16(sp)			/* offset of ss_flags */
 	lda	sp, 24(sp)			/* sizeof struct sigaltstack */
 	ldq	ra, ((26 + 4) * 8)(s0)		/* restore return address */
diff --git a/lib/libc/alpha/sys/Makefile.inc b/lib/libc/alpha/sys/Makefile.inc
index 6bb5de3..e016d7d 100644
--- a/lib/libc/alpha/sys/Makefile.inc
+++ b/lib/libc/alpha/sys/Makefile.inc
@@ -1,20 +1,15 @@
-# $Id: Makefile.inc,v 1.1.1.1 1998/03/09 06:34:42 jb Exp $
+# $Id: Makefile.inc,v 1.2 1998/08/08 02:25:46 jb Exp $
 
 MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S pipe.S ptrace.S \
 	sbrk.S setlogin.S sigpending.S sigprocmask.S sigreturn.S \
 	sigsuspend.S syscall.S
 
 # Don't generate default code for these syscalls:
-.ifdef NETBSD_SYSCALLS
-NOASM=	break.o exit.o ftruncate.o lseek.o mmap.o posix_rename.o sstk.o \
-	truncate.o vfork.o vtrace.o
-.else
 NOASM=	__semctl.o break.o exit.o ftruncate.o getdomainname.o getlogin.o \
 	lseek.o mlockall.o mmap.o msgctl.o msgget.o msgrcv.o msgsnd.o \
 	munlockall.o openbsd_poll.o semconfig.o semget.o semop.o \
 	setdomainname.o shmat.o shmctl.o shmdt.o shmget.o sstk.o \
 	thr_sleep.o thr_wakeup.o truncate.o uname.o vfork.o yield.o
-.endif
 
 PSEUDO=	_getlogin.o
 
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 490d1c9..6882621 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,16 +1,12 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-#	$Id: Makefile.inc,v 1.53 1998/05/14 11:36:16 peter Exp $
+#	$Id: Makefile.inc,v 1.54 1998/07/28 03:33:25 jlemon Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys
 
 # Include the generated makefile containing the *complete* list
 # of syscall names in MIASM.
-.if defined(NETBSD_SYSCALLS)
-.include "${.CURDIR}/../../sys/sys/netbsd_syscall.mk"
-.else
 .include "${.CURDIR}/../../sys/sys/syscall.mk"
-.endif
 
 # Include machine dependent definitions.
 #
@@ -19,12 +15,6 @@
 #
 .include "${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc"
 
-# If using the NetBSD syscall interface add sources that convert
-# the NetBSD interface to the one FreeBSD expects:
-.if defined(NETBSD_SYSCALLS)
-SRCS+=	netbsd_getdirentries.c netbsd_msync.c netbsd_stat.c netbsd_swapon.c
-.endif
-
 # Sources common to both syscall interfaces:
 SRCS+=	ftruncate.c lseek.c mmap.c truncate.c
 
diff --git a/lib/libc/sys/netbsd_getdirentries.c b/lib/libc/sys/netbsd_getdirentries.c
deleted file mode 100644
index 63485ad..0000000
--- a/lib/libc/sys/netbsd_getdirentries.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* $Id: netbsd_getdirentries.c,v 1.1 1998/03/09 07:07:20 jb Exp $ */
-/*	From: NetBSD: getdirentries.c,v 1.1 1997/10/10 02:15:56 fvdl Exp */
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * 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 Frank van der Linden 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.
- */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <dirent.h>
-#include <unistd.h>
-
-int getdents __P((int, char *, size_t));
-
-int
-#ifdef _THREAD_SAFE
-_thread_sys_getdirentries(fd, buf, nbytes, basep)
-#else
-getdirentries(fd, buf, nbytes, basep)
-#endif
-	int fd, nbytes;
-	char *buf;
-	long *basep;
-{
-	*basep = __syscall((quad_t) SYS_lseek,fd, 0, 0, SEEK_CUR);
-	return getdents(fd, buf, nbytes);
-}
diff --git a/lib/libc/sys/netbsd_msync.c b/lib/libc/sys/netbsd_msync.c
deleted file mode 100644
index 4461f22..0000000
--- a/lib/libc/sys/netbsd_msync.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $Id$
- *
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/types.h>
-#include <sys/mman.h>
-
-/* NetBSD uses a different syscall and the flags use different numbers! */
-int	__msync13 __P((void *, size_t, int));
-
-int
-msync(void *addr, size_t size, int nflags)
-{
-	int flags = 0;
-
-	/* Convert FreeBSD flags to NetBSD flags (sigh): */
-	if (nflags & MS_ASYNC)
-		/* MS_ASYNC: */
-		flags |= 0x01;
-	else
-		/* MS_SYNC: */
-		flags |= 0x04;
-	if (nflags & MS_INVALIDATE)
-		flags |= 0x02;
-
-	/* Perform the syscall: */
-	return(__msync13(addr, size, flags));
-}
diff --git a/lib/libc/sys/netbsd_stat.c b/lib/libc/sys/netbsd_stat.c
deleted file mode 100644
index cb93517..0000000
--- a/lib/libc/sys/netbsd_stat.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* $Id: netbsd_stat.c,v 1.1 1998/03/09 07:07:21 jb Exp $
-/*	From: NetBSD: stat.c,v 1.2 1997/10/22 00:56:39 fvdl Exp */
-
-/*
- * Copyright (c) 1997 Frank van der Linden
- * All rights reserved.
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
- * 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 for the NetBSD Project
- *      by Frank van der Linden
- * 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.
- */
-
-/*
- * These are FreeBSD header files. They do not provide NetBSD structure
- * definitions or variable types.
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-
-/*
- * On systems with 8 byte longs and 4 byte time_ts, padding the time_ts
- * is required in order to have a consistent ABI.  This is because the
- * stat structure used to contain timespecs, which had different
- * alignment constraints than a time_t and a long alone.  The padding
- * should be removed the next time the stat structure ABI is changed.
- * (This will happen whever we change to 8 byte time_t.)
- */
-#if defined(__alpha__)			/* XXX XXX XXX */
-#define	__STATPAD(x)	int x;
-#else
-#define	__STATPAD(x)	/* nothing */
-#endif
-
-/*
- * This is the new stat structure that NetBSD added for 1.3.
- * The NetBSD syscalls __stat13, __lstat13 and __fstat13 return
- * information in this format. The functions in this file convert
- * that format to the current FreeBSD stat structure. Yuk.
- */
-struct stat13 {
-	u_int32_t  st_dev;		/* inode's device */
-	u_int32_t  st_ino;		/* inode's number */
-	u_int32_t  st_mode;		/* inode protection mode */
-	u_int32_t  st_nlink;		/* number of hard links */
-	u_int32_t  st_uid;		/* user ID of the file's owner */
-	u_int32_t  st_gid;		/* group ID of the file's group */
-	u_int32_t  st_rdev;		/* device type */
-#ifndef _POSIX_SOURCE
-	struct	  timespec st_atimespec;/* time of last access */
-	struct	  timespec st_mtimespec;/* time of last data modification */
-	struct	  timespec st_ctimespec;/* time of last file status change */
-#else
-	__STATPAD(__pad0)
-	time_t	  st_atime;		/* time of last access */
-	__STATPAD(__pad1)
-	long	  st_atimensec;		/* nsec of last access */
-	time_t	  st_mtime;		/* time of last data modification */
-	__STATPAD(__pad2)
-	long	  st_mtimensec;		/* nsec of last data modification */
-	time_t	  st_ctime;		/* time of last file status change */
-	__STATPAD(__pad3)
-	long	  st_ctimensec;		/* nsec of last file status change */
-#endif
-	u_int64_t st_size;		/* file size, in bytes */
-	int64_t	  st_blocks;		/* blocks allocated for file */
-	u_int32_t st_blksize;		/* optimal blocksize for I/O */
-	u_int32_t st_flags;		/* user defined flags for file */
-	u_int32_t st_gen;		/* file generation number */
-	int64_t	  st_qspare[2];
-};
-
-int     __stat13 __P((const char *, struct stat13 *));
-int     __fstat13 __P((int, struct stat13 *));
-int     __lstat13 __P((const char *, struct stat13 *));
-
-/*
- * Convert from a NetBSD 1.3 stat to a FreeBSD stat structure.
- */
-
-static void cvtstat __P((struct stat13 *, struct stat *));
-
-static void
-cvtstat(st, ost)
-	struct stat13 *st;
-	struct stat *ost;
-{
-
-	ost->st_dev = st->st_dev;
-	ost->st_ino = st->st_ino;
-	ost->st_mode = st->st_mode;
-	if (st->st_nlink >= (1 << 15))
-		ost->st_nlink = (1 << 15) - 1;
-	else
-		ost->st_nlink = st->st_nlink;
-	ost->st_uid = st->st_uid;
-	ost->st_gid = st->st_gid;
-	ost->st_rdev = st->st_rdev;
-	ost->st_atimespec = st->st_atimespec;
-	ost->st_mtimespec = st->st_mtimespec;
-	ost->st_ctimespec = st->st_ctimespec;
-	ost->st_size = st->st_size;
-	ost->st_blocks = st->st_blocks;
-	ost->st_blksize = st->st_blksize;
-	ost->st_flags = st->st_flags;
-	ost->st_gen = st->st_gen;
-}
-
-int
-stat(file, ost)
-	const char *file;
-	struct stat *ost;
-{
-	struct stat13 nst;
-	int ret;
-
-	if ((ret = __stat13(file, &nst)) < 0)
-		return ret;
-	cvtstat(&nst, ost);
-	return ret;
-}
-
-int
-#ifdef	_THREAD_SAFE
-_thread_sys_fstat(f, ost)
-#else
-fstat(f, ost)
-#endif
-	int f;
-	struct stat *ost;
-{
-	struct stat13 nst;
-	int ret;
-
-	if ((ret = __fstat13(f, &nst)) < 0)
-		return ret;
-	cvtstat(&nst, ost);
-	return ret;
-}
-
-int
-lstat(file, ost)
-	const char *file;
-	struct stat *ost;
-{
-	struct stat13 nst;
-	int ret;
-
-	if ((ret = __lstat13(file, &nst)) < 0)
-		return ret;
-	cvtstat(&nst, ost);
-	return ret;
-}
diff --git a/lib/libc/sys/netbsd_swapon.c b/lib/libc/sys/netbsd_swapon.c
deleted file mode 100644
index 39a14a0..0000000
--- a/lib/libc/sys/netbsd_swapon.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* $Id$
- *
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- */
-
-#define	SWAP_ON		1
-
-/* As of 1.3, NetBSD uses swapctl() instead of swapon(). */
-int	swapctl(int, const void *, int);
-
-int
-swapon(const char *name)
-{
-	return (swapctl(SWAP_ON, name, 0));
-}