Subject: Re: ldconfig and ld.aout_so on m68k ELF
To: None <port-m68k@netbsd.org>
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
List: port-m68k
Date: 04/01/2001 00:39:07
In <Pine.NEB.4.33.0103192205010.6938-100000@oor-wullie.mctavish.co.uk>
steve@mctavish.co.uk wrote:

> On Tue, 20 Mar 2001, Izumi Tsutsui wrote:
> > BTW, is there any easy way to disable only alternate path search
> > on COMPAT_AOUT_M68K? (Just to remove all CHECK_ALT_* macros?)
> 
> Not that I'm aware of. As you say, just delete the macros.

I've made a patch to allow enabling/disabling alternate
/emul/aout path search by options COMPAT_AOUT_ALTPATH.
ld.aout_so seems to work properly on it without changes.
(i.e. it can find shlibs under /emul/aout/usr/lib.)

Any comments/suggestions are appreciate.
---
Izumi Tsutsui
tsutsui@ceres.dti.ne.jp

Index: aoutm68k_stat.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/aoutm68k_stat.c,v
retrieving revision 1.2
diff -u -r1.2 aoutm68k_stat.c
--- aoutm68k_stat.c	2000/12/06 21:25:39	1.2
+++ aoutm68k_stat.c	2001/03/31 15:15:57
@@ -79,7 +79,9 @@
 	int error;
 
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
+#ifdef COMPAT_AOUT_ALTPATH
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+#endif
 	SCARG(&cup, path) = SCARG(uap, path);
 
 	if ((error = compat_43_sys_stat(p, &cup, retval)) != 0 ||
@@ -130,7 +132,9 @@
 	int error;
 
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
+#ifdef COMPAT_AOUT_ALTPATH
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+#endif
 	SCARG(&cup, path) = SCARG(uap, path);
 
 	if ((error = compat_43_sys_lstat(p, &cup, retval)) != 0 ||
@@ -158,7 +162,9 @@
 	int error;
 
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
+#ifdef COMPAT_AOUT_ALTPATH
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+#endif
 	SCARG(&cup, path) = SCARG(uap, path);
 
 	if ((error = compat_12_sys_stat(p, &cup, retval)) != 0 ||
@@ -209,7 +215,9 @@
 	int error;
 
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
+#ifdef COMPAT_AOUT_ALTPATH
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+#endif
 	SCARG(&cup, path) = SCARG(uap, path);
 
 	if ((error = compat_12_sys_lstat(p, &cup, retval)) != 0 ||
@@ -236,7 +244,9 @@
 	int error;
 
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
+#ifdef COMPAT_AOUT_ALTPATH
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+#endif
 	SCARG(&cup, path) = SCARG(uap, path);
 
 	if ((error = sys___stat13(p, &cup, retval)) != 0 ||
@@ -288,7 +298,9 @@
 	int error;
 
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
+#ifdef COMPAT_AOUT_ALTPATH
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
+#endif
 	SCARG(&cup, path) = SCARG(uap, path);
 
 	if ((error = sys___lstat13(p, &cup, retval)) != 0 ||
Index: aoutm68k_syscall.h
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/aoutm68k_syscall.h,v
retrieving revision 1.5
diff -u -r1.5 aoutm68k_syscall.h
--- aoutm68k_syscall.h	2001/01/27 07:52:20	1.5
+++ aoutm68k_syscall.h	2001/03/31 15:15:59
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_syscall.h,v 1.5 2001/01/27 07:52:20 thorpej Exp $ */
+/* $NetBSD$ */
 
 /*
  * System call numbers.
@@ -411,6 +411,7 @@
 #define	AOUTM68K_SYS_oftruncate	130
 
 				/* 129 is excluded aoutm68k_compat_43_sys_truncate */
+				/* 129 is excluded compat_43_sys_truncate */
 				/* 130 is excluded compat_43_sys_ftruncate */
 /* syscall: "flock" ret: "int" args: "int" "int" */
 #define	AOUTM68K_SYS_flock	131
Index: aoutm68k_syscallargs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/aoutm68k_syscallargs.h,v
retrieving revision 1.5
diff -u -r1.5 aoutm68k_syscallargs.h
--- aoutm68k_syscallargs.h	2001/01/27 07:52:20	1.5
+++ aoutm68k_syscallargs.h	2001/03/31 15:16:01
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_syscallargs.h,v 1.5 2001/01/27 07:52:20 thorpej Exp $ */
+/* $NetBSD$ */
 
 /*
  * System call argument lists.
@@ -226,20 +226,38 @@
 int	sys_fork(struct proc *, void *, register_t *);
 int	sys_read(struct proc *, void *, register_t *);
 int	sys_write(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_open(struct proc *, void *, register_t *);
+#else
+int	sys_open(struct proc *, void *, register_t *);
+#endif
 int	sys_close(struct proc *, void *, register_t *);
 int	sys_wait4(struct proc *, void *, register_t *);
 #ifdef COMPAT_43
 int	compat_43_sys_creat(struct proc *, void *, register_t *);
 #else
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_link(struct proc *, void *, register_t *);
 int	aoutm68k_sys_unlink(struct proc *, void *, register_t *);
+#else
+int	sys_link(struct proc *, void *, register_t *);
+int	sys_unlink(struct proc *, void *, register_t *);
+#endif
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_chdir(struct proc *, void *, register_t *);
+#else
+int	sys_chdir(struct proc *, void *, register_t *);
+#endif
 int	sys_fchdir(struct proc *, void *, register_t *);
 int	sys_mknod(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_chmod(struct proc *, void *, register_t *);
 int	aoutm68k_sys_chown(struct proc *, void *, register_t *);
+#else
+int	sys_chmod(struct proc *, void *, register_t *);
+int	sys_chown(struct proc *, void *, register_t *);
+#endif
 int	sys_obreak(struct proc *, void *, register_t *);
 int	sys_getfsstat(struct proc *, void *, register_t *);
 #ifdef COMPAT_43
@@ -259,8 +277,13 @@
 int	sys_accept(struct proc *, void *, register_t *);
 int	sys_getpeername(struct proc *, void *, register_t *);
 int	sys_getsockname(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_access(struct proc *, void *, register_t *);
 int	aoutm68k_sys_chflags(struct proc *, void *, register_t *);
+#else
+int	sys_access(struct proc *, void *, register_t *);
+int	sys_chflags(struct proc *, void *, register_t *);
+#endif
 int	sys_fchflags(struct proc *, void *, register_t *);
 int	sys_sync(struct proc *, void *, register_t *);
 int	sys_kill(struct proc *, void *, register_t *);
@@ -303,12 +326,23 @@
 int	compat_12_sys_reboot(struct proc *, void *, register_t *);
 #else
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_revoke(struct proc *, void *, register_t *);
 int	aoutm68k_sys_symlink(struct proc *, void *, register_t *);
 int	aoutm68k_sys_readlink(struct proc *, void *, register_t *);
 int	aoutm68k_sys_execve(struct proc *, void *, register_t *);
+#else
+int	sys_revoke(struct proc *, void *, register_t *);
+int	sys_symlink(struct proc *, void *, register_t *);
+int	sys_readlink(struct proc *, void *, register_t *);
+int	sys_execve(struct proc *, void *, register_t *);
+#endif
 int	sys_umask(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_chroot(struct proc *, void *, register_t *);
+#else
+int	sys_chroot(struct proc *, void *, register_t *);
+#endif
 #ifdef COMPAT_43
 int	aoutm68k_compat_43_sys_fstat(struct proc *, void *, register_t *);
 int	compat_43_sys_getkerninfo(struct proc *, void *, register_t *);
@@ -405,20 +439,36 @@
 #endif
 int	sys_setreuid(struct proc *, void *, register_t *);
 int	sys_setregid(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_rename(struct proc *, void *, register_t *);
+#else
+int	sys_rename(struct proc *, void *, register_t *);
+#endif
 #ifdef COMPAT_43
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_compat_43_sys_truncate(struct proc *, void *, register_t *);
+#else
+int	compat_43_sys_truncate(struct proc *, void *, register_t *);
+#endif
 int	compat_43_sys_ftruncate(struct proc *, void *, register_t *);
 #else
+#ifdef COMPAT_AOUT_ALTPATH
+#else
 #endif
+#endif
 int	sys_flock(struct proc *, void *, register_t *);
 int	sys_mkfifo(struct proc *, void *, register_t *);
 int	sys_sendto(struct proc *, void *, register_t *);
 int	sys_shutdown(struct proc *, void *, register_t *);
 int	sys_socketpair(struct proc *, void *, register_t *);
 int	sys_mkdir(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_rmdir(struct proc *, void *, register_t *);
 int	aoutm68k_sys_utimes(struct proc *, void *, register_t *);
+#else
+int	sys_rmdir(struct proc *, void *, register_t *);
+int	sys_utimes(struct proc *, void *, register_t *);
+#endif
 int	sys_adjtime(struct proc *, void *, register_t *);
 #ifdef COMPAT_43
 int	compat_43_sys_getpeername(struct proc *, void *, register_t *);
@@ -444,12 +494,20 @@
 int	compat_43_sys_getdirentries(struct proc *, void *, register_t *);
 #else
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_statfs(struct proc *, void *, register_t *);
+#else
+int	sys_statfs(struct proc *, void *, register_t *);
+#endif
 int	sys_fstatfs(struct proc *, void *, register_t *);
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_getfh(struct proc *, void *, register_t *);
 #else
+int	sys_getfh(struct proc *, void *, register_t *);
 #endif
+#else
+#endif
 #ifdef COMPAT_09
 int	compat_09_sys_getdomainname(struct proc *, void *, register_t *);
 int	compat_09_sys_setdomainname(struct proc *, void *, register_t *);
@@ -492,7 +550,11 @@
 int	aoutm68k_compat_12_sys_lstat(struct proc *, void *, register_t *);
 #else
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_pathconf(struct proc *, void *, register_t *);
+#else
+int	sys_pathconf(struct proc *, void *, register_t *);
+#endif
 int	sys_fpathconf(struct proc *, void *, register_t *);
 int	sys_getrlimit(struct proc *, void *, register_t *);
 int	sys_setrlimit(struct proc *, void *, register_t *);
@@ -502,12 +564,20 @@
 #endif
 int	sys_mmap(struct proc *, void *, register_t *);
 int	sys_lseek(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_truncate(struct proc *, void *, register_t *);
+#else
+int	sys_truncate(struct proc *, void *, register_t *);
+#endif
 int	sys_ftruncate(struct proc *, void *, register_t *);
 int	sys___sysctl(struct proc *, void *, register_t *);
 int	sys_mlock(struct proc *, void *, register_t *);
 int	sys_munlock(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_undelete(struct proc *, void *, register_t *);
+#else
+int	sys_undelete(struct proc *, void *, register_t *);
+#endif
 int	sys_futimes(struct proc *, void *, register_t *);
 int	sys_getpgid(struct proc *, void *, register_t *);
 int	sys_reboot(struct proc *, void *, register_t *);
@@ -562,20 +632,34 @@
 int	sys_fdatasync(struct proc *, void *, register_t *);
 int	sys_mlockall(struct proc *, void *, register_t *);
 int	sys_munlockall(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys___posix_rename(struct proc *, void *, register_t *);
+#else
+int	sys___posix_rename(struct proc *, void *, register_t *);
+#endif
 int	sys_swapctl(struct proc *, void *, register_t *);
 int	sys_getdents(struct proc *, void *, register_t *);
 int	sys_minherit(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys_lchmod(struct proc *, void *, register_t *);
 int	aoutm68k_sys_lchown(struct proc *, void *, register_t *);
 int	aoutm68k_sys_lutimes(struct proc *, void *, register_t *);
+#else
+int	sys_lchmod(struct proc *, void *, register_t *);
+int	sys_lchown(struct proc *, void *, register_t *);
+int	sys_lutimes(struct proc *, void *, register_t *);
+#endif
 int	sys___msync13(struct proc *, void *, register_t *);
 int	aoutm68k_sys___stat13(struct proc *, void *, register_t *);
 int	aoutm68k_sys___fstat13(struct proc *, void *, register_t *);
 int	aoutm68k_sys___lstat13(struct proc *, void *, register_t *);
 int	sys___sigaltstack14(struct proc *, void *, register_t *);
 int	sys___vfork14(struct proc *, void *, register_t *);
+#ifdef COMPAT_AOUT_ALTPATH
 int	aoutm68k_sys___posix_chown(struct proc *, void *, register_t *);
+#else
+int	sys___posix_chown(struct proc *, void *, register_t *);
+#endif
 int	sys___posix_fchown(struct proc *, void *, register_t *);
 int	sys___posix_lchown(struct proc *, void *, register_t *);
 int	sys_getsid(struct proc *, void *, register_t *);
Index: aoutm68k_syscalls.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/aoutm68k_syscalls.c,v
retrieving revision 1.5
diff -u -r1.5 aoutm68k_syscalls.c
--- aoutm68k_syscalls.c	2001/01/27 07:52:20	1.5
+++ aoutm68k_syscalls.c	2001/03/31 15:16:03
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_syscalls.c,v 1.5 2001/01/27 07:52:20 thorpej Exp $ */
+/* $NetBSD$ */
 
 /*
  * System call names.
@@ -32,7 +32,11 @@
 	"fork",			/* 2 = fork */
 	"read",			/* 3 = read */
 	"write",			/* 4 = write */
+#ifdef COMPAT_AOUT_ALTPATH
 	"open",			/* 5 = open */
+#else
+	"open",			/* 5 = open */
+#endif
 	"close",			/* 6 = close */
 	"wait4",			/* 7 = wait4 */
 #ifdef COMPAT_43
@@ -40,14 +44,28 @@
 #else
 	"#8 (excluded compat_43_sys_creat)",		/* 8 = excluded compat_43_sys_creat */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 	"link",			/* 9 = link */
 	"unlink",			/* 10 = unlink */
+#else
+	"link",			/* 9 = link */
+	"unlink",			/* 10 = unlink */
+#endif
 	"#11 (obsolete execv)",		/* 11 = obsolete execv */
+#ifdef COMPAT_AOUT_ALTPATH
+	"chdir",			/* 12 = chdir */
+#else
 	"chdir",			/* 12 = chdir */
+#endif
 	"fchdir",			/* 13 = fchdir */
 	"mknod",			/* 14 = mknod */
+#ifdef COMPAT_AOUT_ALTPATH
+	"chmod",			/* 15 = chmod */
+	"chown",			/* 16 = chown */
+#else
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
+#endif
 	"break",			/* 17 = break */
 	"getfsstat",			/* 18 = getfsstat */
 #ifdef COMPAT_43
@@ -68,8 +86,13 @@
 	"accept",			/* 30 = accept */
 	"getpeername",			/* 31 = getpeername */
 	"getsockname",			/* 32 = getsockname */
+#ifdef COMPAT_AOUT_ALTPATH
+	"access",			/* 33 = access */
+	"chflags",			/* 34 = chflags */
+#else
 	"access",			/* 33 = access */
 	"chflags",			/* 34 = chflags */
+#endif
 	"fchflags",			/* 35 = fchflags */
 	"sync",			/* 36 = sync */
 	"kill",			/* 37 = kill */
@@ -120,12 +143,23 @@
 #else
 	"#55 (excluded compat_12_sys_reboot)",		/* 55 = excluded compat_12_sys_reboot */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
+	"revoke",			/* 56 = revoke */
+	"symlink",			/* 57 = symlink */
+	"readlink",			/* 58 = readlink */
+	"execve",			/* 59 = execve */
+#else
 	"revoke",			/* 56 = revoke */
 	"symlink",			/* 57 = symlink */
 	"readlink",			/* 58 = readlink */
 	"execve",			/* 59 = execve */
+#endif
 	"umask",			/* 60 = umask */
+#ifdef COMPAT_AOUT_ALTPATH
+	"chroot",			/* 61 = chroot */
+#else
 	"chroot",			/* 61 = chroot */
+#endif
 #ifdef COMPAT_43
 	"fstat43",			/* 62 = fstat43 */
 	"ogetkerninfo",			/* 63 = ogetkerninfo */
@@ -253,12 +287,24 @@
 #endif
 	"setreuid",			/* 126 = setreuid */
 	"setregid",			/* 127 = setregid */
+#ifdef COMPAT_AOUT_ALTPATH
+	"rename",			/* 128 = rename */
+#else
 	"rename",			/* 128 = rename */
+#endif
 #ifdef COMPAT_43
+#ifdef COMPAT_AOUT_ALTPATH
+	"otruncate",			/* 129 = otruncate */
+#else
 	"otruncate",			/* 129 = otruncate */
+#endif
 	"oftruncate",			/* 130 = oftruncate */
 #else
+#ifdef COMPAT_AOUT_ALTPATH
 	"#129 (excluded aoutm68k_compat_43_sys_truncate)",		/* 129 = excluded aoutm68k_compat_43_sys_truncate */
+#else
+	"#129 (excluded compat_43_sys_truncate)",		/* 129 = excluded compat_43_sys_truncate */
+#endif
 	"#130 (excluded compat_43_sys_ftruncate)",		/* 130 = excluded compat_43_sys_ftruncate */
 #endif
 	"flock",			/* 131 = flock */
@@ -267,8 +313,13 @@
 	"shutdown",			/* 134 = shutdown */
 	"socketpair",			/* 135 = socketpair */
 	"mkdir",			/* 136 = mkdir */
+#ifdef COMPAT_AOUT_ALTPATH
+	"rmdir",			/* 137 = rmdir */
+	"utimes",			/* 138 = utimes */
+#else
 	"rmdir",			/* 137 = rmdir */
 	"utimes",			/* 138 = utimes */
+#endif
 	"#139 (obsolete 4.2 sigreturn)",		/* 139 = obsolete 4.2 sigreturn */
 	"adjtime",			/* 140 = adjtime */
 #ifdef COMPAT_43
@@ -309,12 +360,20 @@
 #else
 	"#156 (excluded compat_43_sys_getdirentries)",		/* 156 = excluded compat_43_sys_getdirentries */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
+	"statfs",			/* 157 = statfs */
+#else
 	"statfs",			/* 157 = statfs */
+#endif
 	"fstatfs",			/* 158 = fstatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
+#ifdef COMPAT_AOUT_ALTPATH
+	"getfh",			/* 161 = getfh */
+#else
 	"getfh",			/* 161 = getfh */
+#endif
 #else
 	"#161 (excluded getfh)",		/* 161 = excluded getfh */
 #endif
@@ -382,7 +441,11 @@
 	"#189 (excluded aoutm68k_compat_12_sys_fstat)",		/* 189 = excluded aoutm68k_compat_12_sys_fstat */
 	"#190 (excluded aoutm68k_compat_12_sys_lstat)",		/* 190 = excluded aoutm68k_compat_12_sys_lstat */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 	"pathconf",			/* 191 = pathconf */
+#else
+	"pathconf",			/* 191 = pathconf */
+#endif
 	"fpathconf",			/* 192 = fpathconf */
 	"#193 (unimplemented)",		/* 193 = unimplemented */
 	"getrlimit",			/* 194 = getrlimit */
@@ -395,12 +458,20 @@
 	"mmap",			/* 197 = mmap */
 	"__syscall",			/* 198 = __syscall */
 	"lseek",			/* 199 = lseek */
+#ifdef COMPAT_AOUT_ALTPATH
+	"truncate",			/* 200 = truncate */
+#else
 	"truncate",			/* 200 = truncate */
+#endif
 	"ftruncate",			/* 201 = ftruncate */
 	"__sysctl",			/* 202 = __sysctl */
 	"mlock",			/* 203 = mlock */
 	"munlock",			/* 204 = munlock */
+#ifdef COMPAT_AOUT_ALTPATH
+	"undelete",			/* 205 = undelete */
+#else
 	"undelete",			/* 205 = undelete */
+#endif
 	"futimes",			/* 206 = futimes */
 	"getpgid",			/* 207 = getpgid */
 	"reboot",			/* 208 = reboot */
@@ -511,20 +582,34 @@
 	"#267 (unimplemented)",		/* 267 = unimplemented */
 	"#268 (unimplemented)",		/* 268 = unimplemented */
 	"#269 (unimplemented)",		/* 269 = unimplemented */
+#ifdef COMPAT_AOUT_ALTPATH
+	"__posix_rename",			/* 270 = __posix_rename */
+#else
 	"__posix_rename",			/* 270 = __posix_rename */
+#endif
 	"swapctl",			/* 271 = swapctl */
 	"getdents",			/* 272 = getdents */
 	"minherit",			/* 273 = minherit */
+#ifdef COMPAT_AOUT_ALTPATH
 	"lchmod",			/* 274 = lchmod */
 	"lchown",			/* 275 = lchown */
 	"lutimes",			/* 276 = lutimes */
+#else
+	"lchmod",			/* 274 = lchmod */
+	"lchown",			/* 275 = lchown */
+	"lutimes",			/* 276 = lutimes */
+#endif
 	"__msync13",			/* 277 = __msync13 */
 	"__stat13",			/* 278 = __stat13 */
 	"__fstat13",			/* 279 = __fstat13 */
 	"__lstat13",			/* 280 = __lstat13 */
 	"__sigaltstack14",			/* 281 = __sigaltstack14 */
 	"__vfork14",			/* 282 = __vfork14 */
+#ifdef COMPAT_AOUT_ALTPATH
+	"__posix_chown",			/* 283 = __posix_chown */
+#else
 	"__posix_chown",			/* 283 = __posix_chown */
+#endif
 	"__posix_fchown",			/* 284 = __posix_fchown */
 	"__posix_lchown",			/* 285 = __posix_lchown */
 	"getsid",			/* 286 = getsid */
Index: aoutm68k_sysent.c
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/aoutm68k_sysent.c,v
retrieving revision 1.5
diff -u -r1.5 aoutm68k_sysent.c
--- aoutm68k_sysent.c	2001/01/27 07:52:20	1.5
+++ aoutm68k_sysent.c	2001/03/31 15:16:06
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_sysent.c,v 1.5 2001/01/27 07:52:20 thorpej Exp $ */
+/* $NetBSD$ */
 
 /*
  * System call switch table.
@@ -37,8 +37,13 @@
 	    sys_read },				/* 3 = read */
 	{ 3, s(struct sys_write_args), 0,
 	    sys_write },			/* 4 = write */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 3, s(struct aoutm68k_sys_open_args), 0,
 	    aoutm68k_sys_open },		/* 5 = open */
+#else
+	{ 3, s(struct sys_open_args), 0,
+	    sys_open },				/* 5 = open */
+#endif
 	{ 1, s(struct sys_close_args), 0,
 	    sys_close },			/* 6 = close */
 	{ 4, s(struct sys_wait4_args), 0,
@@ -50,22 +55,41 @@
 	{ 0, 0, 0,
 	    sys_nosys },			/* 8 = excluded compat_43_sys_creat */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_link_args), 0,
 	    aoutm68k_sys_link },		/* 9 = link */
 	{ 1, s(struct aoutm68k_sys_unlink_args), 0,
 	    aoutm68k_sys_unlink },		/* 10 = unlink */
+#else
+	{ 2, s(struct sys_link_args), 0,
+	    sys_link },				/* 9 = link */
+	{ 1, s(struct sys_unlink_args), 0,
+	    sys_unlink },			/* 10 = unlink */
+#endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 11 = obsolete execv */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 1, s(struct aoutm68k_sys_chdir_args), 0,
 	    aoutm68k_sys_chdir },		/* 12 = chdir */
+#else
+	{ 1, s(struct sys_chdir_args), 0,
+	    sys_chdir },			/* 12 = chdir */
+#endif
 	{ 1, s(struct sys_fchdir_args), 0,
 	    sys_fchdir },			/* 13 = fchdir */
 	{ 3, s(struct sys_mknod_args), 0,
 	    sys_mknod },			/* 14 = mknod */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_chmod_args), 0,
 	    aoutm68k_sys_chmod },		/* 15 = chmod */
 	{ 3, s(struct aoutm68k_sys_chown_args), 0,
 	    aoutm68k_sys_chown },		/* 16 = chown */
+#else
+	{ 2, s(struct sys_chmod_args), 0,
+	    sys_chmod },			/* 15 = chmod */
+	{ 3, s(struct sys_chown_args), 0,
+	    sys_chown },			/* 16 = chown */
+#endif
 	{ 1, s(struct sys_obreak_args), 0,
 	    sys_obreak },			/* 17 = break */
 	{ 3, s(struct sys_getfsstat_args), 0,
@@ -103,10 +127,17 @@
 	    sys_getpeername },			/* 31 = getpeername */
 	{ 3, s(struct sys_getsockname_args), 0,
 	    sys_getsockname },			/* 32 = getsockname */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_access_args), 0,
 	    aoutm68k_sys_access },		/* 33 = access */
 	{ 2, s(struct aoutm68k_sys_chflags_args), 0,
 	    aoutm68k_sys_chflags },		/* 34 = chflags */
+#else
+	{ 2, s(struct sys_access_args), 0,
+	    sys_access },			/* 33 = access */
+	{ 2, s(struct sys_chflags_args), 0,
+	    sys_chflags },			/* 34 = chflags */
+#endif
 	{ 2, s(struct sys_fchflags_args), 0,
 	    sys_fchflags },			/* 35 = fchflags */
 	{ 0, 0, 0,
@@ -186,6 +217,7 @@
 	{ 0, 0, 0,
 	    sys_nosys },			/* 55 = excluded compat_12_sys_reboot */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 1, s(struct aoutm68k_sys_revoke_args), 0,
 	    aoutm68k_sys_revoke },		/* 56 = revoke */
 	{ 2, s(struct aoutm68k_sys_symlink_args), 0,
@@ -194,10 +226,25 @@
 	    aoutm68k_sys_readlink },		/* 58 = readlink */
 	{ 3, s(struct aoutm68k_sys_execve_args), 0,
 	    aoutm68k_sys_execve },		/* 59 = execve */
+#else
+	{ 1, s(struct sys_revoke_args), 0,
+	    sys_revoke },			/* 56 = revoke */
+	{ 2, s(struct sys_symlink_args), 0,
+	    sys_symlink },			/* 57 = symlink */
+	{ 3, s(struct sys_readlink_args), 0,
+	    sys_readlink },			/* 58 = readlink */
+	{ 3, s(struct sys_execve_args), 0,
+	    sys_execve },			/* 59 = execve */
+#endif
 	{ 1, s(struct sys_umask_args), 0,
 	    sys_umask },			/* 60 = umask */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 1, s(struct aoutm68k_sys_chroot_args), 0,
 	    aoutm68k_sys_chroot },		/* 61 = chroot */
+#else
+	{ 1, s(struct sys_chroot_args), 0,
+	    sys_chroot },			/* 61 = chroot */
+#endif
 #ifdef COMPAT_43
 	{ 2, s(struct aoutm68k_compat_43_sys_fstat_args), 0,
 	    aoutm68k_compat_43_sys_fstat },	/* 62 = fstat43 */
@@ -413,17 +460,32 @@
 	    sys_setreuid },			/* 126 = setreuid */
 	{ 2, s(struct sys_setregid_args), 0,
 	    sys_setregid },			/* 127 = setregid */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_rename_args), 0,
 	    aoutm68k_sys_rename },		/* 128 = rename */
+#else
+	{ 2, s(struct sys_rename_args), 0,
+	    sys_rename },			/* 128 = rename */
+#endif
 #ifdef COMPAT_43
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_compat_43_sys_truncate_args), 0,
 	    aoutm68k_compat_43_sys_truncate },	/* 129 = otruncate */
+#else
+	{ 2, s(struct compat_43_sys_truncate_args), 0,
+	    compat_43_sys_truncate },		/* 129 = otruncate */
+#endif
 	{ 2, s(struct compat_43_sys_ftruncate_args), 0,
 	    compat_43_sys_ftruncate },		/* 130 = oftruncate */
 #else
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 0, 0, 0,
 	    sys_nosys },			/* 129 = excluded aoutm68k_compat_43_sys_truncate */
+#else
 	{ 0, 0, 0,
+	    sys_nosys },			/* 129 = excluded compat_43_sys_truncate */
+#endif
+	{ 0, 0, 0,
 	    sys_nosys },			/* 130 = excluded compat_43_sys_ftruncate */
 #endif
 	{ 2, s(struct sys_flock_args), 0,
@@ -438,10 +500,17 @@
 	    sys_socketpair },			/* 135 = socketpair */
 	{ 2, s(struct sys_mkdir_args), 0,
 	    sys_mkdir },			/* 136 = mkdir */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 1, s(struct aoutm68k_sys_rmdir_args), 0,
 	    aoutm68k_sys_rmdir },		/* 137 = rmdir */
 	{ 2, s(struct aoutm68k_sys_utimes_args), 0,
 	    aoutm68k_sys_utimes },		/* 138 = utimes */
+#else
+	{ 1, s(struct sys_rmdir_args), 0,
+	    sys_rmdir },			/* 137 = rmdir */
+	{ 2, s(struct sys_utimes_args), 0,
+	    sys_utimes },			/* 138 = utimes */
+#endif
 	{ 0, 0, 0,
 	    sys_nosys },			/* 139 = obsolete 4.2 sigreturn */
 	{ 2, s(struct sys_adjtime_args), 0,
@@ -510,8 +579,13 @@
 	{ 0, 0, 0,
 	    sys_nosys },			/* 156 = excluded compat_43_sys_getdirentries */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_statfs_args), 0,
 	    aoutm68k_sys_statfs },		/* 157 = statfs */
+#else
+	{ 2, s(struct sys_statfs_args), 0,
+	    sys_statfs },			/* 157 = statfs */
+#endif
 	{ 2, s(struct sys_fstatfs_args), 0,
 	    sys_fstatfs },			/* 158 = fstatfs */
 	{ 0, 0, 0,
@@ -519,9 +593,14 @@
 	{ 0, 0, 0,
 	    sys_nosys },			/* 160 = unimplemented */
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_getfh_args), 0,
 	    aoutm68k_sys_getfh },		/* 161 = getfh */
 #else
+	{ 2, s(struct sys_getfh_args), 0,
+	    sys_getfh },			/* 161 = getfh */
+#endif
+#else
 	{ 0, 0, 0,
 	    sys_nosys },			/* 161 = excluded getfh */
 #endif
@@ -632,8 +711,13 @@
 	{ 0, 0, 0,
 	    sys_nosys },			/* 190 = excluded aoutm68k_compat_12_sys_lstat */
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_pathconf_args), 0,
 	    aoutm68k_sys_pathconf },		/* 191 = pathconf */
+#else
+	{ 2, s(struct sys_pathconf_args), 0,
+	    sys_pathconf },			/* 191 = pathconf */
+#endif
 	{ 2, s(struct sys_fpathconf_args), 0,
 	    sys_fpathconf },			/* 192 = fpathconf */
 	{ 0, 0, 0,
@@ -655,8 +739,13 @@
 	    sys_nosys },			/* 198 = __syscall (indir) */
 	{ 4, s(struct sys_lseek_args), 0,
 	    sys_lseek },			/* 199 = lseek */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 3, s(struct aoutm68k_sys_truncate_args), 0,
 	    aoutm68k_sys_truncate },		/* 200 = truncate */
+#else
+	{ 3, s(struct sys_truncate_args), 0,
+	    sys_truncate },			/* 200 = truncate */
+#endif
 	{ 3, s(struct sys_ftruncate_args), 0,
 	    sys_ftruncate },			/* 201 = ftruncate */
 	{ 6, s(struct sys___sysctl_args), 0,
@@ -665,8 +754,13 @@
 	    sys_mlock },			/* 203 = mlock */
 	{ 2, s(struct sys_munlock_args), 0,
 	    sys_munlock },			/* 204 = munlock */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 1, s(struct aoutm68k_sys_undelete_args), 0,
 	    aoutm68k_sys_undelete },		/* 205 = undelete */
+#else
+	{ 1, s(struct sys_undelete_args), 0,
+	    sys_undelete },			/* 205 = undelete */
+#endif
 	{ 2, s(struct sys_futimes_args), 0,
 	    sys_futimes },			/* 206 = futimes */
 	{ 1, s(struct sys_getpgid_args), 0,
@@ -866,20 +960,34 @@
 	    sys_nosys },			/* 268 = unimplemented */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 269 = unimplemented */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys___posix_rename_args), 0,
 	    aoutm68k_sys___posix_rename },	/* 270 = __posix_rename */
+#else
+	{ 2, s(struct sys___posix_rename_args), 0,
+	    sys___posix_rename },		/* 270 = __posix_rename */
+#endif
 	{ 3, s(struct sys_swapctl_args), 0,
 	    sys_swapctl },			/* 271 = swapctl */
 	{ 3, s(struct sys_getdents_args), 0,
 	    sys_getdents },			/* 272 = getdents */
 	{ 3, s(struct sys_minherit_args), 0,
 	    sys_minherit },			/* 273 = minherit */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 2, s(struct aoutm68k_sys_lchmod_args), 0,
 	    aoutm68k_sys_lchmod },		/* 274 = lchmod */
 	{ 3, s(struct aoutm68k_sys_lchown_args), 0,
 	    aoutm68k_sys_lchown },		/* 275 = lchown */
 	{ 2, s(struct aoutm68k_sys_lutimes_args), 0,
 	    aoutm68k_sys_lutimes },		/* 276 = lutimes */
+#else
+	{ 2, s(struct sys_lchmod_args), 0,
+	    sys_lchmod },			/* 274 = lchmod */
+	{ 3, s(struct sys_lchown_args), 0,
+	    sys_lchown },			/* 275 = lchown */
+	{ 2, s(struct sys_lutimes_args), 0,
+	    sys_lutimes },			/* 276 = lutimes */
+#endif
 	{ 3, s(struct sys___msync13_args), 0,
 	    sys___msync13 },			/* 277 = __msync13 */
 	{ 2, s(struct aoutm68k_sys___stat13_args), 0,
@@ -892,8 +1000,13 @@
 	    sys___sigaltstack14 },		/* 281 = __sigaltstack14 */
 	{ 0, 0, 0,
 	    sys___vfork14 },			/* 282 = __vfork14 */
+#ifdef COMPAT_AOUT_ALTPATH
 	{ 3, s(struct aoutm68k_sys___posix_chown_args), 0,
 	    aoutm68k_sys___posix_chown },	/* 283 = __posix_chown */
+#else
+	{ 3, s(struct sys___posix_chown_args), 0,
+	    sys___posix_chown },		/* 283 = __posix_chown */
+#endif
 	{ 3, s(struct sys___posix_fchown_args), 0,
 	    sys___posix_fchown },		/* 284 = __posix_fchown */
 	{ 3, s(struct sys___posix_lchown_args), 0,
Index: files.aoutm68k
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/files.aoutm68k,v
retrieving revision 1.1
diff -u -r1.1 files.aoutm68k
--- files.aoutm68k	2000/12/02 20:40:06	1.1
+++ files.aoutm68k	2001/03/31 15:16:06
@@ -7,7 +7,7 @@
 
 file	compat/aoutm68k/aoutm68k_exec.c		compat_aout_m68k
 file	compat/aoutm68k/aoutm68k_ioctl.c	compat_aout_m68k
-file	compat/aoutm68k/aoutm68k_misc.c		compat_aout_m68k
+file	compat/aoutm68k/aoutm68k_misc.c	compat_aout_m68k & compat_aout_altpath
 file	compat/aoutm68k/aoutm68k_stat.c		compat_aout_m68k
 file	compat/aoutm68k/aoutm68k_syscalls.c	compat_aout_m68k
 file	compat/aoutm68k/aoutm68k_sysent.c	compat_aout_m68k
Index: syscalls.master
===================================================================
RCS file: /cvsroot/syssrc/sys/compat/aoutm68k/syscalls.master,v
retrieving revision 1.4
diff -u -r1.4 syscalls.master
--- syscalls.master	2001/01/27 07:51:22	1.4
+++ syscalls.master	2001/03/31 15:16:11
@@ -67,8 +67,13 @@
 3	NOARGS		{ ssize_t sys_read(int fd, void *buf, size_t nbyte); }
 4	NOARGS		{ ssize_t sys_write(int fd, const void *buf, \
 			    size_t nbyte); }
+#ifdef COMPAT_AOUT_ALTPATH
 5	STD		{ int aoutm68k_sys_open(const char *path, \
 			    int flags, ... mode_t mode); }
+#else
+5	NOARGS		{ int sys_open(const char *path, int flags, \
+			    ... mode_t mode); }
+#endif
 6	NOARGS		{ int sys_close(int fd); }
 7	NOARGS		{ int sys_wait4(int pid, int *status, int options, \
 			    struct rusage *rusage); }
@@ -78,18 +83,33 @@
 #else
 8	EXCL		compat_43_sys_creat
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 9	STD		{ int aoutm68k_sys_link(const char *path, \
 			    const char *link); }
 10	STD		{ int aoutm68k_sys_unlink(const char *path); }
+#else
+9	NOARGS		{ int sys_link(const char *path, const char *link); }
+10	NOARGS		{ int sys_unlink(const char *path); }
+#endif
 11	OBSOL		execv
+#ifdef COMPAT_AOUT_ALTPATH
 12	STD		{ int aoutm68k_sys_chdir(const char *path); }
+#else
+12	NOARGS		{ int sys_chdir(const char *path); }
+#endif
 13	NOARGS		{ int sys_fchdir(int fd); }
 14	NOARGS		{ int sys_mknod(const char *path, mode_t mode, \
 			    dev_t dev); }
+#ifdef COMPAT_AOUT_ALTPATH
 15	STD		{ int aoutm68k_sys_chmod(const char *path, \
 			    mode_t mode); }
 16	STD		{ int aoutm68k_sys_chown(const char *path, uid_t uid, \
 			    gid_t gid); }
+#else
+15	NOARGS		{ int sys_chmod(const char *path, mode_t mode); }
+16	NOARGS		{ int sys_chown(const char *path, uid_t uid, \
+			    gid_t gid); }
+#endif
 17	NOARGS		{ int sys_obreak(char *nsize); } break
 18	NOARGS		{ int sys_getfsstat(struct statfs *buf, long bufsize, \
 			    int flags); }
@@ -121,9 +141,14 @@
 			    unsigned int *alen); }
 32	NOARGS		{ int sys_getsockname(int fdes, struct sockaddr *asa, \
 			    unsigned int *alen); }
+#ifdef COMPAT_AOUT_ALTPATH
 33	STD		{ int aoutm68k_sys_access(const char *path, int flags); }
 34	STD		{ int aoutm68k_sys_chflags(const char *path, \
 			    u_long flags); }
+#else
+33	NOARGS		{ int sys_access(const char *path, int flags); }
+34	NOARGS		{ int sys_chflags(const char *path, u_long flags); }
+#endif
 35	NOARGS		{ int sys_fchflags(int fd, u_long flags); }
 36	NOARGS		{ void sys_sync(void); }
 37	NOARGS		{ int sys_kill(int pid, int signum); }
@@ -184,6 +209,7 @@
 #else
 55	EXCL		compat_12_sys_reboot
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 56	STD		{ int aoutm68k_sys_revoke(const char *path); }
 57	STD		{ int aoutm68k_sys_symlink(const char *path, \
 			    const char *link); }
@@ -191,8 +217,21 @@
 			    char *buf, size_t count); }
 59	STD		{ int aoutm68k_sys_execve(const char *path, \
 			    char * const *argp, char * const *envp); }
+#else
+56	NOARGS		{ int sys_revoke(const char *path); }
+57	NOARGS		{ int sys_symlink(const char *path, \
+			    const char *link); }
+58	NOARGS		{ int sys_readlink(const char *path, \
+			    char *buf, size_t count); }
+59	NOARGS		{ int sys_execve(const char *path, \
+			    char * const *argp, char * const *envp); }
+#endif
 60	NOARGS		{ mode_t sys_umask(mode_t newmask); }
+#ifdef COMPAT_AOUT_ALTPATH
 61	STD		{ int aoutm68k_sys_chroot(const char *path); }
+#else
+61	NOARGS		{ int sys_chroot(const char *path); }
+#endif
 #ifdef COMPAT_43
 62	STD		{ int aoutm68k_compat_43_sys_fstat(int fd, \
 			    struct aoutm68k_stat43 *sb); } fstat43
@@ -354,15 +393,28 @@
 #endif
 126	NOARGS		{ int sys_setreuid(uid_t ruid, uid_t euid); }
 127	NOARGS		{ int sys_setregid(gid_t rgid, gid_t egid); }
+#ifdef COMPAT_AOUT_ALTPATH
 128	STD		{ int aoutm68k_sys_rename(const char *from, \
 			    const char *to); }
+#else
+128	NOARGS		{ int sys_rename(const char *from, const char *to); }
+#endif
 #ifdef COMPAT_43
+#ifdef COMPAT_AOUT_ALTPATH
 129	STD		{ int aoutm68k_compat_43_sys_truncate(const char *path, \
 			    long length); } otruncate
+#else
+129	NOARGS		{ int compat_43_sys_truncate(const char *path, \
+			    long length); } otruncate
+#endif
 130	NOARGS		{ int compat_43_sys_ftruncate(int fd, long length); } \
 			    oftruncate
 #else
+#ifdef COMPAT_AOUT_ALTPATH
 129	EXCL		aoutm68k_compat_43_sys_truncate
+#else
+129	EXCL		compat_43_sys_truncate
+#endif
 130	EXCL		compat_43_sys_ftruncate
 #endif
 131	NOARGS		{ int sys_flock(int fd, int how); }
@@ -374,9 +426,15 @@
 135	NOARGS		{ int sys_socketpair(int domain, int type, \
 			    int protocol, int *rsv); }
 136	NOARGS		{ int sys_mkdir(const char *path, mode_t mode); }
+#ifdef COMPAT_AOUT_ALTPATH
 137	STD		{ int aoutm68k_sys_rmdir(const char *path); }
 138	STD		{ int aoutm68k_sys_utimes(const char *path, \
 			    const struct timeval *tptr); }
+#else
+137	NOARGS		{ int sys_rmdir(const char *path); }
+138	NOARGS		{ int sys_utimes(const char *path, \
+			    const struct timeval *tptr); }
+#endif
 139	OBSOL		4.2 sigreturn
 140	NOARGS		{ int sys_adjtime(const struct timeval *delta, \
 			    struct timeval *olddelta); }
@@ -431,15 +489,24 @@
 #else
 156	EXCL		compat_43_sys_getdirentries
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 157	STD		{ int aoutm68k_sys_statfs(const char *path, \
 			    struct statfs *buf); }
+#else
+157	NOARGS		{ int sys_statfs(const char *path, \
+			    struct statfs *buf); }
+#endif
 158	NOARGS		{ int sys_fstatfs(int fd, struct statfs *buf); }
 159	UNIMPL
 160	UNIMPL
 #if defined(NFS) || defined(NFSSERVER) || !defined(_KERNEL)
+#ifdef COMPAT_AOUT_ALTPATH
 161	STD		{ int aoutm68k_sys_getfh(const char *fname, \
 			    fhandle_t *fhp); }
 #else
+161	NOARGS		{ int sys_getfh(const char *fname, fhandle_t *fhp); }
+#endif
+#else
 161	EXCL		getfh
 #endif
 #ifdef COMPAT_09
@@ -526,8 +593,12 @@
 189	EXCL		aoutm68k_compat_12_sys_fstat
 190	EXCL		aoutm68k_compat_12_sys_lstat
 #endif
+#ifdef COMPAT_AOUT_ALTPATH
 191	STD		{ long aoutm68k_sys_pathconf(const char *path, \
 			    int name); }
+#else
+191	NOARGS		{ long sys_pathconf(const char *path, int name); }
+#endif
 192	NOARGS		{ long sys_fpathconf(int fd, int name); }
 193	UNIMPL
 194	NOARGS		{ int sys_getrlimit(int which, \
@@ -545,15 +616,24 @@
 198	INDIR		{ quad_t sys___syscall(quad_t num, ...); }
 199	NOARGS		{ off_t sys_lseek(int fd, int pad, off_t offset, \
 			    int whence); }
+#ifdef COMPAT_AOUT_ALTPATH
 200	STD		{ int aoutm68k_sys_truncate(const char *path, int pad, \
 			    off_t length); }
+#else
+200	NOARGS		{ int sys_truncate(const char *path, int pad, \
+			    off_t length); }
+#endif
 201	NOARGS		{ int sys_ftruncate(int fd, int pad, off_t length); }
 202	NOARGS		{ int sys___sysctl(int *name, u_int namelen, \
 			    void *old, size_t *oldlenp, void *new, \
 			    size_t newlen); }
 203	NOARGS		{ int sys_mlock(const void *addr, size_t len); }
 204	NOARGS		{ int sys_munlock(const void *addr, size_t len); }
+#ifdef COMPAT_AOUT_ALTPATH
 205	STD		{ int aoutm68k_sys_undelete(const char *path); }
+#else
+205	NOARGS		{ int sys_undelete(const char *path); }
+#endif
 206	NOARGS		{ int sys_futimes(int fd, \
 			    const struct timeval *tptr); }
 207	NOARGS		{ pid_t sys_getpgid(pid_t pid); }
@@ -684,18 +764,31 @@
 267	UNIMPL
 268	UNIMPL
 269	UNIMPL
+#ifdef COMPAT_AOUT_ALTPATH
 270	STD		{ int aoutm68k_sys___posix_rename(const char *from, \
 			    const char *to); }
+#else
+270	NOARGS		{ int sys___posix_rename(const char *from, \
+			    const char *to); }
+#endif
 271	NOARGS		{ int sys_swapctl(int cmd, const void *arg, int misc); }
 272	NOARGS		{ int sys_getdents(int fd, char *buf, size_t count); }
 273	NOARGS		{ int sys_minherit(void *addr, size_t len, \
 			    int inherit); }
+#ifdef COMPAT_AOUT_ALTPATH
 274	STD		{ int aoutm68k_sys_lchmod(const char *path, \
 			    mode_t mode); }
 275	STD		{ int aoutm68k_sys_lchown(const char *path, uid_t uid, \
 			    gid_t gid); }
 276	STD		{ int aoutm68k_sys_lutimes(const char *path, \
 			    const struct timeval *tptr); }
+#else
+274	NOARGS		{ int sys_lchmod(const char *path, mode_t mode); }
+275	NOARGS		{ int sys_lchown(const char *path, uid_t uid, \
+			    gid_t gid); }
+276	NOARGS		{ int sys_lutimes(const char *path, \
+			    const struct timeval *tptr); }
+#endif
 277	NOARGS		{ int sys___msync13(void *addr, size_t len, int flags); }
 278	STD		{ int aoutm68k_sys___stat13(const char *path, \
 			    struct aoutm68k_stat *ub); }
@@ -707,8 +800,13 @@
 			    const struct sigaltstack *nss, \
 			    struct sigaltstack *oss); }
 282	NOARGS		{ int sys___vfork14(void); }
+#ifdef COMPAT_AOUT_ALTPATH
 283	STD		{ int aoutm68k_sys___posix_chown(const char *path, \
 			    uid_t uid, gid_t gid); }
+#else
+283	NOARGS		{ int sys___posix_chown(const char *path, uid_t uid, \
+			    gid_t gid); }
+#endif
 284	NOARGS		{ int sys___posix_fchown(int fd, uid_t uid, \
 			    gid_t gid); }
 285	NOARGS		{ int sys___posix_lchown(const char *path, uid_t uid, \