Regen.

3 files changed, 36 insertions, 55 deletions

diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index 54851d3..ce56b15 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -24,7 +24,7 @@
 #define	FREEBSD32_SYS_chmod	15
 #define	FREEBSD32_SYS_chown	16
 #define	FREEBSD32_SYS_break	17
-#define	FREEBSD32_SYS_freebsd4_freebsd32_getfsstat	18
+				/* 18 is freebsd4 freebsd32_getfsstat */
 				/* 19 is old freebsd32_lseek */
 #define	FREEBSD32_SYS_getpid	20
 #define	FREEBSD32_SYS_mount	21
@@ -155,8 +155,8 @@
 				/* 149 is obsolete oquota */
 				/* 150 is obsolete ogetsockname */
 				/* 156 is old freebsd32_getdirentries */
-#define	FREEBSD32_SYS_freebsd4_freebsd32_statfs	157
-#define	FREEBSD32_SYS_freebsd4_freebsd32_fstatfs	158
+				/* 157 is freebsd4 freebsd32_statfs */
+				/* 158 is freebsd4 freebsd32_fstatfs */
 #define	FREEBSD32_SYS_getfh	161
 				/* 162 is obsolete getdomainname */
 				/* 163 is obsolete setdomainname */
@@ -166,8 +166,8 @@
 #define	FREEBSD32_SYS_freebsd32_semsys	169
 #define	FREEBSD32_SYS_freebsd32_msgsys	170
 #define	FREEBSD32_SYS_freebsd32_shmsys	171
-#define	FREEBSD32_SYS_freebsd6_freebsd32_pread	173
-#define	FREEBSD32_SYS_freebsd6_freebsd32_pwrite	174
+				/* 173 is freebsd6 freebsd32_pread */
+				/* 174 is freebsd6 freebsd32_pwrite */
 #define	FREEBSD32_SYS_ntp_adjtime	176
 #define	FREEBSD32_SYS_setgid	181
 #define	FREEBSD32_SYS_setegid	182
@@ -180,11 +180,11 @@
 #define	FREEBSD32_SYS_getrlimit	194
 #define	FREEBSD32_SYS_setrlimit	195
 #define	FREEBSD32_SYS_freebsd32_getdirentries	196
-#define	FREEBSD32_SYS_freebsd6_freebsd32_mmap	197
+				/* 197 is freebsd6 freebsd32_mmap */
 #define	FREEBSD32_SYS___syscall	198
-#define	FREEBSD32_SYS_freebsd6_freebsd32_lseek	199
-#define	FREEBSD32_SYS_freebsd6_freebsd32_truncate	200
-#define	FREEBSD32_SYS_freebsd6_freebsd32_ftruncate	201
+				/* 199 is freebsd6 freebsd32_lseek */
+				/* 200 is freebsd6 freebsd32_truncate */
+				/* 201 is freebsd6 freebsd32_ftruncate */
 #define	FREEBSD32_SYS_freebsd32_sysctl	202
 #define	FREEBSD32_SYS_mlock	203
 #define	FREEBSD32_SYS_munlock	204
@@ -234,7 +234,7 @@
 #define	FREEBSD32_SYS_nlstat	280
 #define	FREEBSD32_SYS_freebsd32_preadv	289
 #define	FREEBSD32_SYS_freebsd32_pwritev	290
-#define	FREEBSD32_SYS_freebsd4_freebsd32_fhstatfs	297
+				/* 297 is freebsd4 freebsd32_fhstatfs */
 #define	FREEBSD32_SYS_fhopen	298
 #define	FREEBSD32_SYS_fhstat	299
 #define	FREEBSD32_SYS_modnext	300
@@ -255,9 +255,9 @@
 #define	FREEBSD32_SYS_freebsd32_aio_suspend	315
 #define	FREEBSD32_SYS_aio_cancel	316
 #define	FREEBSD32_SYS_freebsd32_aio_error	317
-#define	FREEBSD32_SYS_freebsd6_freebsd32_aio_read	318
-#define	FREEBSD32_SYS_freebsd6_freebsd32_aio_write	319
-#define	FREEBSD32_SYS_freebsd6_freebsd32_lio_listio	320
+				/* 318 is freebsd6 freebsd32_aio_read */
+				/* 319 is freebsd6 freebsd32_aio_write */
+				/* 320 is freebsd6 freebsd32_lio_listio */
 #define	FREEBSD32_SYS_yield	321
 				/* 322 is obsolete thr_sleep */
 				/* 323 is obsolete thr_wakeup */
@@ -273,14 +273,14 @@
 #define	FREEBSD32_SYS_sched_get_priority_min	333
 #define	FREEBSD32_SYS_sched_rr_get_interval	334
 #define	FREEBSD32_SYS_utrace	335
-#define	FREEBSD32_SYS_freebsd4_freebsd32_sendfile	336
+				/* 336 is freebsd4 freebsd32_sendfile */
 #define	FREEBSD32_SYS_kldsym	337
 #define	FREEBSD32_SYS_freebsd32_jail	338
 #define	FREEBSD32_SYS_sigprocmask	340
 #define	FREEBSD32_SYS_sigsuspend	341
-#define	FREEBSD32_SYS_freebsd4_freebsd32_sigaction	342
+				/* 342 is freebsd4 freebsd32_sigaction */
 #define	FREEBSD32_SYS_sigpending	343
-#define	FREEBSD32_SYS_freebsd4_freebsd32_sigreturn	344
+				/* 344 is freebsd4 freebsd32_sigreturn */
 #define	FREEBSD32_SYS_freebsd32_sigtimedwait	345
 #define	FREEBSD32_SYS_freebsd32_sigwaitinfo	346
 #define	FREEBSD32_SYS___acl_get_file	347
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index ff2e219..fef33b8 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -24,7 +24,7 @@
 #define	SYS_chmod	15
 #define	SYS_chown	16
 #define	SYS_break	17
-#define	SYS_freebsd4_getfsstat	18
+				/* 18 is freebsd4 getfsstat */
 				/* 19 is old lseek */
 #define	SYS_getpid	20
 #define	SYS_mount	21
@@ -157,20 +157,20 @@
 #define	SYS_nlm_syscall	154
 #define	SYS_nfssvc	155
 				/* 156 is old getdirentries */
-#define	SYS_freebsd4_statfs	157
-#define	SYS_freebsd4_fstatfs	158
+				/* 157 is freebsd4 statfs */
+				/* 158 is freebsd4 fstatfs */
 #define	SYS_lgetfh	160
 #define	SYS_getfh	161
-#define	SYS_freebsd4_getdomainname	162
-#define	SYS_freebsd4_setdomainname	163
-#define	SYS_freebsd4_uname	164
+				/* 162 is freebsd4 getdomainname */
+				/* 163 is freebsd4 setdomainname */
+				/* 164 is freebsd4 uname */
 #define	SYS_sysarch	165
 #define	SYS_rtprio	166
 #define	SYS_semsys	169
 #define	SYS_msgsys	170
 #define	SYS_shmsys	171
-#define	SYS_freebsd6_pread	173
-#define	SYS_freebsd6_pwrite	174
+				/* 173 is freebsd6 pread */
+				/* 174 is freebsd6 pwrite */
 #define	SYS_setfib	175
 #define	SYS_ntp_adjtime	176
 #define	SYS_setgid	181
@@ -184,11 +184,11 @@
 #define	SYS_getrlimit	194
 #define	SYS_setrlimit	195
 #define	SYS_getdirentries	196
-#define	SYS_freebsd6_mmap	197
+				/* 197 is freebsd6 mmap */
 #define	SYS___syscall	198
-#define	SYS_freebsd6_lseek	199
-#define	SYS_freebsd6_truncate	200
-#define	SYS_freebsd6_ftruncate	201
+				/* 199 is freebsd6 lseek */
+				/* 200 is freebsd6 truncate */
+				/* 201 is freebsd6 ftruncate */
 #define	SYS___sysctl	202
 #define	SYS_mlock	203
 #define	SYS_munlock	204
@@ -239,7 +239,7 @@
 #define	SYS_nlstat	280
 #define	SYS_preadv	289
 #define	SYS_pwritev	290
-#define	SYS_freebsd4_fhstatfs	297
+				/* 297 is freebsd4 fhstatfs */
 #define	SYS_fhopen	298
 #define	SYS_fhstat	299
 #define	SYS_modnext	300
@@ -260,9 +260,9 @@
 #define	SYS_aio_suspend	315
 #define	SYS_aio_cancel	316
 #define	SYS_aio_error	317
-#define	SYS_freebsd6_aio_read	318
-#define	SYS_freebsd6_aio_write	319
-#define	SYS_freebsd6_lio_listio	320
+				/* 318 is freebsd6 aio_read */
+				/* 319 is freebsd6 aio_write */
+				/* 320 is freebsd6 lio_listio */
 #define	SYS_yield	321
 				/* 322 is obsolete thr_sleep */
 				/* 323 is obsolete thr_wakeup */
@@ -278,15 +278,15 @@
 #define	SYS_sched_get_priority_min	333
 #define	SYS_sched_rr_get_interval	334
 #define	SYS_utrace	335
-#define	SYS_freebsd4_sendfile	336
+				/* 336 is freebsd4 sendfile */
 #define	SYS_kldsym	337
 #define	SYS_jail	338
 #define	SYS_nnpfs_syscall	339
 #define	SYS_sigprocmask	340
 #define	SYS_sigsuspend	341
-#define	SYS_freebsd4_sigaction	342
+				/* 342 is freebsd4 sigaction */
 #define	SYS_sigpending	343
-#define	SYS_freebsd4_sigreturn	344
+				/* 344 is freebsd4 sigreturn */
 #define	SYS_sigtimedwait	345
 #define	SYS_sigwaitinfo	346
 #define	SYS___acl_get_file	347
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index 379dee5..3f62141 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -1,4 +1,4 @@
-# FreeBSD system call names.
+# FreeBSD system call object files.
 # DO NOT EDIT-- this file is automatically generated.
 # $FreeBSD$
 # created from FreeBSD: head/sys/kern/syscalls.master 296572 2016-03-09 19:05:11Z jhb 
@@ -19,7 +19,6 @@ MIASM =  \
 	chmod.o \
 	chown.o \
 	break.o \
-	freebsd4_getfsstat.o \
 	getpid.o \
 	mount.o \
 	unmount.o \
@@ -109,20 +108,13 @@ MIASM =  \
 	quotactl.o \
 	nlm_syscall.o \
 	nfssvc.o \
-	freebsd4_statfs.o \
-	freebsd4_fstatfs.o \
 	lgetfh.o \
 	getfh.o \
-	freebsd4_getdomainname.o \
-	freebsd4_setdomainname.o \
-	freebsd4_uname.o \
 	sysarch.o \
 	rtprio.o \
 	semsys.o \
 	msgsys.o \
 	shmsys.o \
-	freebsd6_pread.o \
-	freebsd6_pwrite.o \
 	setfib.o \
 	ntp_adjtime.o \
 	setgid.o \
@@ -136,11 +128,7 @@ MIASM =  \
 	getrlimit.o \
 	setrlimit.o \
 	getdirentries.o \
-	freebsd6_mmap.o \
 	__syscall.o \
-	freebsd6_lseek.o \
-	freebsd6_truncate.o \
-	freebsd6_ftruncate.o \
 	__sysctl.o \
 	mlock.o \
 	munlock.o \
@@ -191,7 +179,6 @@ MIASM =  \
 	nlstat.o \
 	preadv.o \
 	pwritev.o \
-	freebsd4_fhstatfs.o \
 	fhopen.o \
 	fhstat.o \
 	modnext.o \
@@ -211,9 +198,6 @@ MIASM =  \
 	aio_suspend.o \
 	aio_cancel.o \
 	aio_error.o \
-	freebsd6_aio_read.o \
-	freebsd6_aio_write.o \
-	freebsd6_lio_listio.o \
 	yield.o \
 	mlockall.o \
 	munlockall.o \
@@ -227,15 +211,12 @@ MIASM =  \
 	sched_get_priority_min.o \
 	sched_rr_get_interval.o \
 	utrace.o \
-	freebsd4_sendfile.o \
 	kldsym.o \
 	jail.o \
 	nnpfs_syscall.o \
 	sigprocmask.o \
 	sigsuspend.o \
-	freebsd4_sigaction.o \
 	sigpending.o \
-	freebsd4_sigreturn.o \
 	sigtimedwait.o \
 	sigwaitinfo.o \
 	__acl_get_file.o \