diff options
author | Mark Newton <newton@FreeBSD.org> | 1999-12-08 10:51:17 +0000 |
---|---|---|
committer | Mark Newton <newton@FreeBSD.org> | 1999-12-08 10:51:17 +0000 |
commit | 6d6fd92936c17efcf5e8cb48fda9184f1249ca0f (patch) | |
tree | 2da9f877be42623cbdd58c5750ea7e67fece1728 /sys | |
parent | 2ac0d0a1f7c0ccf73facaa7d05bce5a625b26c0f (diff) | |
download | src-6d6fd92936c17efcf5e8cb48fda9184f1249ca0f.tar.gz src-6d6fd92936c17efcf5e8cb48fda9184f1249ca0f.zip |
SVR4 emulator source files now take their compilation options from
opt_global.h and opt_svr4.h, instead of from the command line. This
brings them in-line with most of the rest of the kernel.
svr4_ioctl.c has also failed to compile with debugging for a while
now; fixed by adding systm.h and socketvar.
Some svr4 source files are automatically generated from syscalls.master;
these have been committed as consequential changes, otherwise everyone
will have to "make svr4_sysent.c".
Changes:
sys/svr4/svr4.h include opt_global.h and opt_svr4.h
sys/svr4/svr4_ioctl.c include svr4.h, sys/systm.h and sys/socketvar.h
sys/svr4/svr4_ipc.c include svr4.h
sys/svr4/svr4_resource.c include svr4.h
sys/svr4/svr4_socket.c include svr4.h
sys/svr4/svr4_ttold.c include svr4.h
sys/svr4/syscalls.master include svr4.h
sys/svr4/svr4_syscallnames.c dependent on syscalls.master
sys/svr4/svr4_sysent.c dependent on syscalls.master
sys/svr4/svr4_syscall.h dependent on syscalls.master
sys/svr4/svr4_proto.h dependent on syscalls.master
sys/modules/svr4/Makefile create opt_global.h and opt_svr4.h
Notes
Notes:
svn path=/head/; revision=54300
Diffstat (limited to 'sys')
-rw-r--r-- | sys/compat/svr4/svr4.h | 3 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_ioctl.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_ipc.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_resource.c | 1 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_socket.c | 1 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_sysent.c | 1 | ||||
-rw-r--r-- | sys/compat/svr4/svr4_ttold.c | 2 | ||||
-rw-r--r-- | sys/compat/svr4/syscalls.master | 1 | ||||
-rw-r--r-- | sys/modules/svr4/Makefile | 28 | ||||
-rw-r--r-- | sys/svr4/svr4.h | 3 | ||||
-rw-r--r-- | sys/svr4/svr4_ioctl.c | 2 | ||||
-rw-r--r-- | sys/svr4/svr4_ipc.c | 2 | ||||
-rw-r--r-- | sys/svr4/svr4_resource.c | 1 | ||||
-rw-r--r-- | sys/svr4/svr4_socket.c | 1 | ||||
-rw-r--r-- | sys/svr4/svr4_sysent.c | 1 | ||||
-rw-r--r-- | sys/svr4/svr4_ttold.c | 2 | ||||
-rw-r--r-- | sys/svr4/syscalls.master | 1 |
17 files changed, 39 insertions, 15 deletions
diff --git a/sys/compat/svr4/svr4.h b/sys/compat/svr4/svr4.h index 52910bf349c3..f9ecd91093a3 100644 --- a/sys/compat/svr4/svr4.h +++ b/sys/compat/svr4/svr4.h @@ -27,6 +27,9 @@ * $FreeBSD$ */ +#include "opt_global.h" +#include "opt_svr4.h" + #if !defined(_SVR4_H) #define _SVR4_H diff --git a/sys/compat/svr4/svr4_ioctl.c b/sys/compat/svr4/svr4_ioctl.c index 183678e05cb4..866f80b03e03 100644 --- a/sys/compat/svr4/svr4_ioctl.c +++ b/sys/compat/svr4/svr4_ioctl.c @@ -35,6 +35,8 @@ #include <sys/fcntl.h> #include <sys/termios.h> #include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/systm.h> #include <net/if.h> diff --git a/sys/compat/svr4/svr4_ipc.c b/sys/compat/svr4/svr4_ipc.c index 4a9f5d7ce3c9..6d250fdee471 100644 --- a/sys/compat/svr4/svr4_ipc.c +++ b/sys/compat/svr4/svr4_ipc.c @@ -83,7 +83,7 @@ #include <sys/proc.h> #include <sys/time.h> - +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_signal.h> #include <svr4/svr4_proto.h> diff --git a/sys/compat/svr4/svr4_resource.c b/sys/compat/svr4/svr4_resource.c index 7c39f44b3a1e..1e5e8fd2691a 100644 --- a/sys/compat/svr4/svr4_resource.c +++ b/sys/compat/svr4/svr4_resource.c @@ -79,6 +79,7 @@ #include <sys/resource.h> #include <sys/resourcevar.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_resource.h> #include <svr4/svr4_signal.h> diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c index 1bcd92da605c..ea172e947cf2 100644 --- a/sys/compat/svr4/svr4_socket.c +++ b/sys/compat/svr4/svr4_socket.c @@ -55,6 +55,7 @@ #include <sys/proc.h> #include <sys/malloc.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_util.h> #include <svr4/svr4_socket.h> diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c index 2f70b4d35b20..84db78b82c10 100644 --- a/sys/compat/svr4/svr4_sysent.c +++ b/sys/compat/svr4/svr4_sysent.c @@ -10,6 +10,7 @@ #include <sys/sysent.h> #include <sys/sysproto.h> #include <netinet/in.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_signal.h> #include <svr4/svr4_proto.h> diff --git a/sys/compat/svr4/svr4_ttold.c b/sys/compat/svr4/svr4_ttold.c index 890b0e8f7b11..8ce2c81731b0 100644 --- a/sys/compat/svr4/svr4_ttold.c +++ b/sys/compat/svr4/svr4_ttold.c @@ -39,7 +39,7 @@ #include <sys/socket.h> #include <net/if.h> - +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_util.h> #include <svr4/svr4_signal.h> diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master index f5fc97e2fdd3..af542181be82 100644 --- a/sys/compat/svr4/syscalls.master +++ b/sys/compat/svr4/syscalls.master @@ -27,6 +27,7 @@ #include <sys/sysproto.h> #include <netinet/in.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_signal.h> #include <svr4/svr4_proto.h> diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile index 1132ab23efb7..9dc7a2c70d25 100644 --- a/sys/modules/svr4/Makefile +++ b/sys/modules/svr4/Makefile @@ -2,27 +2,24 @@ .PATH: ${.CURDIR}/../../i386/svr4 ${.CURDIR}/../../svr4 KMOD= svr4 -SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_vmpage.h vnode_if.h \ - imgact_svr4.c svr4_signal.c svr4_fcntl.c svr4_misc.c svr4_ioctl.c \ - svr4_stat.c svr4_filio.c svr4_ttold.c svr4_termios.c svr4_stream.c \ - svr4_socket.c svr4_sockio.c svr4_machdep.c svr4_resource.c \ - svr4_ipc.c +SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_global.h opt_vmpage.h \ + vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c svr4_misc.c \ + svr4_ioctl.c svr4_stat.c svr4_filio.c svr4_ttold.c svr4_termios.c \ + svr4_stream.c svr4_socket.c svr4_sockio.c svr4_machdep.c \ + svr4_resource.c svr4_ipc.c OBJS= svr4_locore.o NOMAN=1 MAN8= svr4.8 CFLAGS+= -DKERNEL MAINTAINER= newton@freebsd.org -CFLAGS+= -DCOMPAT_SVR4 -.if defined(DEBUG) -CFLAGS+= -DDEBUG_SVR4 -.endif - EXPORT_SYMS=_svr4_mod -CLEANFILES= svr4_assym.h svr4_genassym svr4_genassym.o +CLEANFILES= svr4_assym.h svr4_genassym svr4_genassym.o opt_svr4.h build-tools: svr4_genassym +svr4.h: opt_global.h opt_svr4.h + svr4_assym.h: svr4_genassym ./svr4_genassym > svr4_assym.h @@ -39,6 +36,15 @@ svr4_genassym: svr4_genassym.o opt_compat.h: echo "#define COMPAT_43 1" > opt_compat.h +opt_svr4.h: + echo "#define COMPAT_SVR4 1" > opt_svr4.h +.if defined(DEBUG) + echo "#define DEBUG_SVR4 1" >> opt_svr4.h +.endif + +opt_global.h: + touch opt_global.h + afterinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/svr4.sh ${DESTDIR}/usr/sbin/svr4 diff --git a/sys/svr4/svr4.h b/sys/svr4/svr4.h index 52910bf349c3..f9ecd91093a3 100644 --- a/sys/svr4/svr4.h +++ b/sys/svr4/svr4.h @@ -27,6 +27,9 @@ * $FreeBSD$ */ +#include "opt_global.h" +#include "opt_svr4.h" + #if !defined(_SVR4_H) #define _SVR4_H diff --git a/sys/svr4/svr4_ioctl.c b/sys/svr4/svr4_ioctl.c index 183678e05cb4..866f80b03e03 100644 --- a/sys/svr4/svr4_ioctl.c +++ b/sys/svr4/svr4_ioctl.c @@ -35,6 +35,8 @@ #include <sys/fcntl.h> #include <sys/termios.h> #include <sys/socket.h> +#include <sys/socketvar.h> +#include <sys/systm.h> #include <net/if.h> diff --git a/sys/svr4/svr4_ipc.c b/sys/svr4/svr4_ipc.c index 4a9f5d7ce3c9..6d250fdee471 100644 --- a/sys/svr4/svr4_ipc.c +++ b/sys/svr4/svr4_ipc.c @@ -83,7 +83,7 @@ #include <sys/proc.h> #include <sys/time.h> - +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_signal.h> #include <svr4/svr4_proto.h> diff --git a/sys/svr4/svr4_resource.c b/sys/svr4/svr4_resource.c index 7c39f44b3a1e..1e5e8fd2691a 100644 --- a/sys/svr4/svr4_resource.c +++ b/sys/svr4/svr4_resource.c @@ -79,6 +79,7 @@ #include <sys/resource.h> #include <sys/resourcevar.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_resource.h> #include <svr4/svr4_signal.h> diff --git a/sys/svr4/svr4_socket.c b/sys/svr4/svr4_socket.c index 1bcd92da605c..ea172e947cf2 100644 --- a/sys/svr4/svr4_socket.c +++ b/sys/svr4/svr4_socket.c @@ -55,6 +55,7 @@ #include <sys/proc.h> #include <sys/malloc.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_util.h> #include <svr4/svr4_socket.h> diff --git a/sys/svr4/svr4_sysent.c b/sys/svr4/svr4_sysent.c index 2f70b4d35b20..84db78b82c10 100644 --- a/sys/svr4/svr4_sysent.c +++ b/sys/svr4/svr4_sysent.c @@ -10,6 +10,7 @@ #include <sys/sysent.h> #include <sys/sysproto.h> #include <netinet/in.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_signal.h> #include <svr4/svr4_proto.h> diff --git a/sys/svr4/svr4_ttold.c b/sys/svr4/svr4_ttold.c index 890b0e8f7b11..8ce2c81731b0 100644 --- a/sys/svr4/svr4_ttold.c +++ b/sys/svr4/svr4_ttold.c @@ -39,7 +39,7 @@ #include <sys/socket.h> #include <net/if.h> - +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_util.h> #include <svr4/svr4_signal.h> diff --git a/sys/svr4/syscalls.master b/sys/svr4/syscalls.master index f5fc97e2fdd3..af542181be82 100644 --- a/sys/svr4/syscalls.master +++ b/sys/svr4/syscalls.master @@ -27,6 +27,7 @@ #include <sys/sysproto.h> #include <netinet/in.h> +#include <svr4/svr4.h> #include <svr4/svr4_types.h> #include <svr4/svr4_signal.h> #include <svr4/svr4_proto.h> |