From nobody Tue Jun 3 23:02:41 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bBmSy15yfz5yH6x; Tue, 03 Jun 2025 23:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bBmSy0NkJz3hv0; Tue, 03 Jun 2025 23:02:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748991762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=715N/wE2hCgj9lM6Kes0twmG2aQtM1IWD1WHFsDCJsw=; b=M/IoilM3sLo8rSnuEQV2otN47caEr7vr3z1IOMOLAHmMLAs0k6m6bkgiXsHaYDYrZzpN9N SUsACmVh8dps8RO2mKoEcP3fzU4vSqENBVYJDnMLwmM6lpD8ExiG9vTdQJzFgo5AN3cshz TmDDYJiR5mEAWv+PjXyo1e5iJUgM6bpYzuthw75FkuqDgFYngHudLBpGNlP19knRpHE/ee d5nOZkj1mX3+GJIGnM53FmoRde1vYZiB1aEWKcKywJwvAuTAeRQAEkYC3U6nDPNw4joZCm zwLrb66UYwfU9Rsiatva1XcoLeVMso+wP1mOdVs5R64E9PSvq0F9nkybiz/a/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748991762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=715N/wE2hCgj9lM6Kes0twmG2aQtM1IWD1WHFsDCJsw=; b=ecPXFgNcqM5p7cxsP9hV4hI6zgWWY28xKQ8Vioknqa0ixTRDrh9D1L3z2ZXe3owRFhbbJH 5gHbPCh3JzMqQURisdac7uiHfxUX+cyCX1P4N9RjbZS4oAB14YOFx6MsAOXlpKdnfVw1RZ 5UoU+UWDBSd2T5cJyPtGKIwJWwjDLraUEGLd4alNQ5v9StwwTt+6rXVHlPSTW8OJIPLbbb FlWfbuLaVpsPiri0BBy74EWVFsre/zTU+Cy10fpTJbcOSw4+hx+pAHm3IugrBWU+9R+9PS nzEIPE4BaFOoOpL4Q9EE83xH869ABvkg/CVfh/sDJb4/mmWJzERNbHOWpK6+Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748991762; a=rsa-sha256; cv=none; b=J/qnvIFD4qgtR7a3BN18rQ2h/I4EqbmTjSL7Ts/h0+BM/uz1Qj6T4gzVYn+9HF7a6+LRNC q8CSuuRM4RMlDtTB5BTbVRXtnmp7ZIeZPdwybFib6dpesqEbGpWx+UWoTI4QNm4mOF2TpQ OQ6+sGScbo7zU+oJWQVFN4JPRrMwyvyJYojyyAU/dnMd0WHHz7U+aLeMSEbQ9pkqc8ULI8 LNxS0dfFnvzwCjouyazwLJxJntaY84wa7maHU7uQ3NIOthK4sBxzRJ4nk4aQ3qT7srjWiG os+5sOr0mA0EykWo70k0YbMCT2ozyUQ9amNMDcTTHRb/sGwfYV9Po0zR4uvxYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bBmSx71jPzyXr; Tue, 03 Jun 2025 23:02:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 553N2fsu004970; Tue, 3 Jun 2025 23:02:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 553N2f2F004967; Tue, 3 Jun 2025 23:02:41 GMT (envelope-from git) Date: Tue, 3 Jun 2025 23:02:41 GMT Message-Id: <202506032302.553N2f2F004967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 503f752a347f - main - sysent: retire unused SV_IA32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 503f752a347fdd74e406f3700dd2ad3bd770f302 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=503f752a347fdd74e406f3700dd2ad3bd770f302 commit 503f752a347fdd74e406f3700dd2ad3bd770f302 Author: Brooks Davis AuthorDate: 2025-06-03 22:59:30 +0000 Commit: Brooks Davis CommitDate: 2025-06-03 22:59:30 +0000 sysent: retire unused SV_IA32 When COMPAT_IA32 was generaliaed to COMPAT_FREEBSD32 in 2010 (commit 841c0c7ec75b), all runtime uses of SV_IA32 were removed in favor of SV_ILP32 check. Given SV_ILP32's existance it makes no sense to dynamically check for SV_IA32 (even if we had a 32-bit x86 ABI with 64-bit time_t we needed to differentiate, SV_IA32 would be the wrong spelling.) As such, remove SV_IA32 and mark the bit reserved. Reviewed by: kib Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D50672 --- sys/amd64/linux32/linux32_sysvec.c | 2 +- sys/compat/ia32/ia32_sysvec.c | 2 +- sys/i386/i386/elf_machdep.c | 2 +- sys/i386/linux/linux_sysvec.c | 4 ++-- sys/kern/imgact_aout.c | 6 ++---- sys/sys/sysent.h | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index a8cc03ea8c71..d7f87e2fdf34 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -799,7 +799,7 @@ struct sysentvec elf_linux_sysvec = { .sv_setregs = linux_exec_setregs, .sv_fixlimit = linux32_fixlimit, .sv_maxssiz = &linux32_maxssiz, - .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 | SV_SHP | + .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_SHP | SV_SIG_DISCIGN | SV_SIG_WAITNDQ | SV_TIMEKEEP, .sv_set_syscall_retval = linux32_set_syscall_retval, .sv_fetch_syscall_args = linux32_fetch_syscall_args, diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c index 5174438bc40a..0ea7d072e911 100644 --- a/sys/compat/ia32/ia32_sysvec.c +++ b/sys/compat/ia32/ia32_sysvec.c @@ -126,7 +126,7 @@ struct sysentvec ia32_freebsd_sysvec = { .sv_setregs = ia32_setregs, .sv_fixlimit = ia32_fixlimit, .sv_maxssiz = &ia32_maxssiz, - .sv_flags = SV_ABI_FREEBSD | SV_ASLR | SV_IA32 | SV_ILP32 | + .sv_flags = SV_ABI_FREEBSD | SV_ASLR | SV_ILP32 | SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER | SV_DSO_SIG | SV_SIGSYS, .sv_set_syscall_retval = ia32_set_syscall_retval, diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c index eb6ac5735e56..13769af0fbca 100644 --- a/sys/i386/i386/elf_machdep.c +++ b/sys/i386/i386/elf_machdep.c @@ -74,7 +74,7 @@ struct sysentvec elf32_freebsd_sysvec = { .sv_setregs = exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_FREEBSD | SV_ASLR | SV_IA32 | SV_ILP32 | + .sv_flags = SV_ABI_FREEBSD | SV_ASLR | SV_ILP32 | SV_SHP | SV_TIMEKEEP | SV_RNG_SEED_VER | SV_SIGSYS, .sv_set_syscall_retval = cpu_set_syscall_retval, .sv_fetch_syscall_args = cpu_fetch_syscall_args, diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 24f8ec2d7ea8..c68a0e17a8e4 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -596,7 +596,7 @@ struct sysentvec linux_sysvec = { .sv_setregs = linux_exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_LINUX | SV_AOUT | SV_IA32 | SV_ILP32 | + .sv_flags = SV_ABI_LINUX | SV_AOUT | SV_ILP32 | SV_SIG_DISCIGN | SV_SIG_WAITNDQ, .sv_set_syscall_retval = linux_set_syscall_retval, .sv_fetch_syscall_args = linux_fetch_syscall_args, @@ -638,7 +638,7 @@ struct sysentvec elf_linux_sysvec = { .sv_setregs = linux_exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_LINUX | SV_IA32 | SV_ILP32 | SV_SHP | + .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_SHP | SV_SIG_DISCIGN | SV_SIG_WAITNDQ | SV_TIMEKEEP, .sv_set_syscall_retval = linux_set_syscall_retval, .sv_fetch_syscall_args = linux_fetch_syscall_args, diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c index 0ecfaa65c84e..9978c74f0dee 100644 --- a/sys/kern/imgact_aout.c +++ b/sys/kern/imgact_aout.c @@ -90,8 +90,7 @@ struct sysentvec aout_sysvec = { .sv_setregs = exec_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, - .sv_flags = SV_ABI_FREEBSD | SV_AOUT | SV_IA32 | SV_ILP32 | - SV_SIGSYS, + .sv_flags = SV_ABI_FREEBSD | SV_AOUT | SV_ILP32 | SV_SIGSYS, .sv_set_syscall_retval = cpu_set_syscall_retval, .sv_fetch_syscall_args = cpu_fetch_syscall_args, .sv_syscallnames = syscallnames, @@ -140,8 +139,7 @@ struct sysentvec aout_sysvec = { .sv_setregs = ia32_setregs, .sv_fixlimit = ia32_fixlimit, .sv_maxssiz = &ia32_maxssiz, - .sv_flags = SV_ABI_FREEBSD | SV_AOUT | SV_IA32 | SV_ILP32 | - SV_SIGSYS, + .sv_flags = SV_ABI_FREEBSD | SV_AOUT | SV_ILP32 | SV_SIGSYS, .sv_set_syscall_retval = ia32_set_syscall_retval, .sv_fetch_syscall_args = ia32_fetch_syscall_args, .sv_syscallnames = freebsd32_syscallnames, diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index c582ed494be9..dffe77de91d0 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -162,7 +162,7 @@ struct sysentvec { #define SV_ILP32 0x000100 /* 32-bit executable. */ #define SV_LP64 0x000200 /* 64-bit executable. */ -#define SV_IA32 0x004000 /* Intel 32-bit executable. */ +#define SV_RESERVED0 0x004000 /* Formerly SV_IA32 */ #define SV_AOUT 0x008000 /* a.out executable. */ #define SV_SHP 0x010000 /* Shared page. */ #define SV_SIGSYS 0x020000 /* SIGSYS for non-existing syscall */