Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Apr 2023 05:39:35 GMT
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 602b575a88ed - main - syscall.master: Remove stray 4.2
Message-ID:  <202304210539.33L5dZ4K065018@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=602b575a88ed4ce12358837daa4d0608a08e03c0

commit 602b575a88ed4ce12358837daa4d0608a08e03c0
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-04-21 05:05:30 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-04-21 05:39:23 +0000

    syscall.master: Remove stray 4.2
    
    Back in 4.3BSD, the system call table wasn't generated, and there was an
    entry:
            "4.2 sigreturn",        /* 139 = old 4.2 sigreturn */
    This got converted to
    139     OBSOL   0 4.2 sigreturn
    in 4.3 RENO. Since it was obsolete, nothing bad happened. In fact,
    there was code in makeyscalls.sh to cope:
            {       comment = $4
                    for (i = 5; i <= NF; i++)
                            comment = comment " " $i
                    if (NF < 5)
                            $5 = $4
            }
    so the generated comment in syscalls.c was almost correct:
            "obs_4.2",                      /* 139 = obsolete 4.2 sigreturn */
    a bug that we have to this very day, despite makesyscalls.sh being
    rewritten in lua.
    
    However, this historical wart is the only place in our current
    syscalls.master file where we have an extra field for the 'not
    generated' class of system calls. Remove the historical wart so that the
    re-write of makesyscalls.lua can be simpler (so, I hope, qemu's bsd-user
    can large swathes of code automatically generated too). This should help
    make things more understandable (changes to simplify makesyscalls.lue
    aren't quite debugged, so have to wait for another day).
    
    There's 3 different obsolete sigreturns (but only 1 that was ever in
    FreeBSD 2.x and newer).
    
    Sponsored by:           Netflix
---
 sys/kern/syscalls.master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index af2f4194e2c5..c3e2a0343fde 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -917,7 +917,7 @@
 		    _In_ _Contains_long_timet_ const struct timeval *tptr
 		);
 	}
-139	AUE_NULL	OBSOL	4.2 sigreturn
+139	AUE_NULL	OBSOL	sigreturn
 140	AUE_ADJTIME	STD {
 		int adjtime(
 		    _In_ _Contains_long_timet_ const struct timeval *delta,



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304210539.33L5dZ4K065018>