Change the 'exit()' system call to 'sys_exit()'. This avoids overlapping
gcc's internal exit() prototypes and the (futile) hackery that we did to try and avoid warnings. main() was renamed for similar reasons. Remove an exit related hack from makesyscalls.sh.
This commit is contained in:
parent
d244b0e95b
commit
ac2b067b9a
@ -32,7 +32,7 @@
|
||||
; #ifdef's, etc. may be included, and are copied to the output files.
|
||||
|
||||
0 STD LINUX { int linux_setup(void); }
|
||||
1 NOPROTO LINUX { void exit(int rval); } exit rexit_args void
|
||||
1 NOPROTO LINUX { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 STD LINUX { int linux_fork(void); }
|
||||
3 NOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); }
|
||||
4 NOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); }
|
||||
|
@ -32,7 +32,7 @@
|
||||
|
||||
|
||||
0 NOPROTO OSF1 { int nosys(void); }
|
||||
1 NOPROTO OSF1 { void exit(int rval); } exit rexit_args void
|
||||
1 NOPROTO OSF1 { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 NOPROTO OSF1 { int fork(void); }
|
||||
3 NOPROTO OSF1 { ssize_t read(int fd, char *buf, ssize_t nbyte); }
|
||||
4 NOPROTO OSF1 { ssize_t write(int fd, char *buf, ssize_t nbyte); }
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <svr4/svr4_proto.h>
|
||||
|
||||
0 UNIMPL SVR4 unused
|
||||
1 NOPROTO POSIX { void exit(int rval); } exit rexit_args void
|
||||
1 NOPROTO POSIX { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 NOPROTO POSIX { int fork(void); }
|
||||
3 NOPROTO POSIX { int read(int fd, char *buf, u_int nbyte); }
|
||||
4 NOPROTO SVR4 { int write(int fd, char *buf, u_int nbyte); }
|
||||
|
@ -32,7 +32,7 @@
|
||||
; #ifdef's, etc. may be included, and are copied to the output files.
|
||||
|
||||
0 NOPROTO NOHIDE { int nosys(void); } syscall nosys_args int
|
||||
1 NOPROTO NOHIDE { void exit(int rval); } exit rexit_args void
|
||||
1 NOPROTO NOHIDE { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 NOPROTO POSIX { int fork(void); }
|
||||
3 STD POSIX { int ibcs2_read(int fd, char *buf, u_int nbytes); }
|
||||
4 NOPROTO POSIX { int write(int fd, char *buf, u_int nbytes); }
|
||||
|
@ -32,7 +32,7 @@
|
||||
; #ifdef's, etc. may be included, and are copied to the output files.
|
||||
|
||||
0 STD LINUX { int linux_setup(void); }
|
||||
1 NOPROTO LINUX { void exit(int rval); } exit rexit_args void
|
||||
1 NOPROTO LINUX { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 STD LINUX { int linux_fork(void); }
|
||||
3 NOPROTO LINUX { int read(int fd, char *buf, u_int nbyte); }
|
||||
4 NOPROTO LINUX { int write(int fd, char *buf, u_int nbyte); }
|
||||
|
@ -93,9 +93,9 @@ static struct exit_list_head exit_list = TAILQ_HEAD_INITIALIZER(exit_list);
|
||||
* Death of process.
|
||||
*/
|
||||
void
|
||||
exit(p, uap)
|
||||
sys_exit(p, uap)
|
||||
struct proc *p;
|
||||
struct rexit_args /* {
|
||||
struct sys_exit_args /* {
|
||||
int rval;
|
||||
} */ *uap;
|
||||
{
|
||||
|
@ -290,8 +290,6 @@ s/\$//g
|
||||
(!lkmnosys || funcname != "lkmnosys")) {
|
||||
printf("%s\t%s __P((struct proc *, struct %s *))",
|
||||
rettype, funcname, argalias) > sysdcl
|
||||
if (funcname == "exit")
|
||||
printf(" __dead2") > sysdcl
|
||||
printf(";\n") > sysdcl
|
||||
}
|
||||
if (funcname == "nosys")
|
||||
|
@ -38,7 +38,7 @@
|
||||
; of the current calls.
|
||||
|
||||
0 STD NOHIDE { int nosys(void); } syscall nosys_args int
|
||||
1 STD NOHIDE { void exit(int rval); } exit rexit_args void
|
||||
1 STD NOHIDE { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 STD POSIX { int fork(void); }
|
||||
3 STD POSIX { ssize_t read(int fd, void *buf, size_t nbyte); }
|
||||
4 STD POSIX { ssize_t write(int fd, const void *buf, size_t nbyte); }
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <svr4/svr4_proto.h>
|
||||
|
||||
0 UNIMPL SVR4 unused
|
||||
1 NOPROTO POSIX { void exit(int rval); } exit rexit_args void
|
||||
1 NOPROTO POSIX { void sys_exit(int rval); } sys_exit sys_exit_args void
|
||||
2 NOPROTO POSIX { int fork(void); }
|
||||
3 NOPROTO POSIX { int read(int fd, char *buf, u_int nbyte); }
|
||||
4 NOPROTO SVR4 { int write(int fd, char *buf, u_int nbyte); }
|
||||
|
Loading…
x
Reference in New Issue
Block a user