From cd77f703cd02aec88313729ee3ab63de55c59f0f Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 10 May 1996 12:50:22 +0000
Subject: [PATCH] simple things

---
 sys/compat/sunos/Makefile     | 13 ++++++++++++-
 sys/compat/sunos/sunos.h      | 10 ++++++++--
 sys/compat/sunos/sunos_exec.c |  6 +++---
 sys/compat/svr4/files.svr4    | 18 +++++++++---------
 4 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/sys/compat/sunos/Makefile b/sys/compat/sunos/Makefile
index 542d4a7d994..458ac6767d0 100644
--- a/sys/compat/sunos/Makefile
+++ b/sys/compat/sunos/Makefile
@@ -1,4 +1,15 @@
-#	$OpenBSD: Makefile,v 1.1 1996/04/18 19:42:30 niklas Exp $
+#	$NetBSD: Makefile,v 1.1 1996/05/05 16:07:42 veego Exp $
+
+DEP=	syscalls.conf syscalls.master ../../kern/makesyscalls.sh
+OBJS=	sunos_sysent.c sunos_syscalls.c sunos_syscall.h sunos_syscallargs.h
+
+${OBJS}: ${DEP}
+	-mv -f sunos_sysent.c sunos_sysent.c.bak
+	-mv -f sunos_syscalls.c sunos_syscalls.c.bak
+	-mv -f sunos_syscall.h sunos_syscall.h.bak
+	-mv -f sunos_syscallargs.h sunos_syscallargs.h.bak
+	sh ../../kern/makesyscalls.sh syscalls.conf syscalls.master
+#	$OpenBSD: Makefile,v 1.2 1996/05/10 12:50:22 deraadt Exp $
 
 DEP=	syscalls.conf syscalls.master ../../kern/makesyscalls.sh
 OBJS=	sunos_sysent.c sunos_syscalls.c sunos_syscall.h sunos_syscallargs.h
diff --git a/sys/compat/sunos/sunos.h b/sys/compat/sunos/sunos.h
index c72d9353b89..154bbda3297 100644
--- a/sys/compat/sunos/sunos.h
+++ b/sys/compat/sunos/sunos.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: sunos.h,v 1.2 1996/04/18 21:21:42 niklas Exp $	*/
-/*	$NetBSD: sunos.h,v 1.6 1996/02/18 14:46:28 pk Exp $	*/
+/*	$OpenBSD: sunos.h,v 1.3 1996/05/10 12:50:22 deraadt Exp $	*/
+/*	$NetBSD: sunos.h,v 1.8 1996/05/05 16:07:43 veego Exp $	*/
 
 #define	SUNM_RDONLY	0x01	/* mount fs read-only */
 #define	SUNM_NOSUID	0x02	/* mount fs with setuid disallowed */
@@ -158,3 +158,9 @@ struct sunos_audio_info {
 #define SUNOS_AUDIO_DEV_SPEAKERBOX		2
 #define SUNOS_AUDIO_DEV_CODEC			3
 
+__BEGIN_DECLS
+/* Defined in arch/m68k/m68k/sunos_machdep.c -- sparc uses regular sendsig() */
+#ifndef sparc
+void	sunos_sendsig __P((sig_t, int, int, u_long));
+#endif
+__END_DECLS
diff --git a/sys/compat/sunos/sunos_exec.c b/sys/compat/sunos/sunos_exec.c
index 7933b652b2d..b07fdc27b67 100644
--- a/sys/compat/sunos/sunos_exec.c
+++ b/sys/compat/sunos/sunos_exec.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: sunos_exec.c,v 1.4 1996/04/18 21:21:43 niklas Exp $	*/
-/*	$NetBSD: sunos_exec.c,v 1.10 1996/03/14 19:33:44 christos Exp $	*/
+/*	$OpenBSD: sunos_exec.c,v 1.5 1996/05/10 12:50:23 deraadt Exp $	*/
+/*	$NetBSD: sunos_exec.c,v 1.11 1996/05/05 12:01:47 briggs Exp $	*/
 
 /*
  * Copyright (c) 1993 Theo de Raadt
@@ -55,6 +55,7 @@
 #include <machine/exec.h>
 
 #include <compat/sunos/exec.h>
+#include <compat/sunos/sunos.h>
 #include <compat/sunos/sunos_syscall.h>
 
 #ifdef sparc
@@ -73,7 +74,6 @@ extern struct sysent sunos_sysent[];
 #ifdef SYSCALL_DEBUG
 extern char *sunos_syscallnames[];
 #endif
-extern void sunos_sendsig __P((sig_t, int, int, u_long));
 extern char sigcode[], esigcode[];
 const char sunos_emul_path[] = "/emul/sunos";
 
diff --git a/sys/compat/svr4/files.svr4 b/sys/compat/svr4/files.svr4
index 123b5c0feef..db858de6377 100644
--- a/sys/compat/svr4/files.svr4
+++ b/sys/compat/svr4/files.svr4
@@ -1,5 +1,5 @@
-#	$OpenBSD: files.svr4,v 1.4 1996/04/25 10:20:16 niklas Exp $
-#	$NetBSD: files.svr4,v 1.6 1996/04/11 12:43:29 christos Exp $
+#	$OpenBSD: files.svr4,v 1.5 1996/05/10 12:50:24 deraadt Exp $
+#	$NetBSD: files.svr4,v 1.7 1996/05/05 17:14:25 mrg Exp $
 #
 # Config.new file description for machine-independent SVR4 compat code.
 # Included by ports that need it.
@@ -7,21 +7,21 @@
 # ports should define any machine-specific files they need in their
 # own file lists.
 
+file	compat/svr4/svr4_error.c	compat_svr4
 file	compat/svr4/svr4_exec.c		compat_svr4
 file	compat/svr4/svr4_fcntl.c	compat_svr4
+file	compat/svr4/svr4_filio.c	compat_svr4
 file	compat/svr4/svr4_ioctl.c	compat_svr4
+file	compat/svr4/svr4_ipc.c		compat_svr4
 file	compat/svr4/svr4_misc.c		compat_svr4
+file	compat/svr4/svr4_net.c		compat_svr4
 file	compat/svr4/svr4_signal.c	compat_svr4
+file	compat/svr4/svr4_socket.c	compat_svr4
+file	compat/svr4/svr4_sockio.c	compat_svr4
 file	compat/svr4/svr4_stat.c		compat_svr4
+file	compat/svr4/svr4_stream.c	compat_svr4
 file	compat/svr4/svr4_syscalls.c	compat_svr4
 file	compat/svr4/svr4_sysent.c	compat_svr4
-file	compat/svr4/svr4_net.c		compat_svr4
 file	compat/svr4/svr4_termios.c	compat_svr4
-file	compat/svr4/svr4_stream.c	compat_svr4
-file	compat/svr4/svr4_socket.c	compat_svr4
 file	compat/svr4/svr4_ttold.c	compat_svr4
-file	compat/svr4/svr4_filio.c	compat_svr4
-file	compat/svr4/svr4_sockio.c	compat_svr4
-file	compat/svr4/svr4_error.c	compat_svr4
-file	compat/svr4/svr4_ipc.c		compat_svr4
 file	compat/svr4/svr4_ncr.c		compat_svr4
-- 
2.20.1