From nobody Tue Feb 18 22:04:56 2025 X-Original-To: dev-commits-src-all@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 4YyD8n1YDjz5pFQc; Tue, 18 Feb 2025 22:04:57 +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 4YyD8m5Y3nz3TDd; Tue, 18 Feb 2025 22:04:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739916296; 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=HGh3aaZs7SoseNCSbKmj0AZ7kw1JFYmLKv4HmJRT8Ik=; b=G/HBoTmqdD7y9exOJScUV39IH5RWZm+Ss77Y45aEXEv6GxIFbTYRrGYOIAKbwgHW7XU+XT DipeaE8w2ta3VNSGnBH7hRQKDrwGbOEMdxEdkGsBNNK93YVHYXiPUN162ARN9IjEOKuDCe YaT8UnH+ePM0VjsBO+Kzvxm6WX5m0gXe4Q5BOloQp1UVRr3oSqo1iNjezE0XKCTX/c63FE o4dXsX0IGOnl/K1kDkUuv2ajwPd3VBsFABduFESeZFTIp03icZ9yVu5YA4gReEOK9x8fHp WmAFHJxASiMNroTtrOLKMCsEEPBL6PSE723LALHGkVNIJ2zRPyPvit9Z3dJHrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739916296; a=rsa-sha256; cv=none; b=JhsiVuWggvPpp41Ftz7JpmOVdfTwxcj+aO6Y9jxM/RaF+nVGksIZjyBz5BfO5zT/whWQg1 BHf/sE46cur4c221uZEXnE3Qd4infdVS2sXthAEKNS1xc3HPpOQ91GtOZCYCQJgj/J/i3T qtrYN8Y9Ob9FtYdLN+IirLywvTK0HKz108cp20HlFrJhraYJoJMuUiyvVTIbv50UkaJbn/ dhxplTVYUI0WfA/yCUcA//nvn3ZaPvQVztPC+jsBBHz5cZvnogH61z1yWKCCe1EYgAjxlT nptd7EDQwSvL6S2lagyxbqEe3exHc6WBz4SL7VFSlATlxepw2nOpAob1pTMKfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739916296; 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=HGh3aaZs7SoseNCSbKmj0AZ7kw1JFYmLKv4HmJRT8Ik=; b=Ns2l29Nore7bokpMxcnJVRoAA7QTcjPiHB5iYGHshcV+5PxMbwS2b91EpXMfyjShx/91JS k+b5Aaqcb/pP/dTKY/4l1AkgQaqNjJDumBdgcn6an0VyPa/NzJF4upT5hXszNPM6IJoBP0 er+tbTSV7iEKJlJi/BSzjuLhyFSpuqFq//dsA0yIMubJBdn8MWJ5PuAMMyiw3DLettc9xy PAevc4aa0zQZtd4y9Npluw5Ur4ptqeTiHTpTW4usfAJgfQvX20wNW0Az8yVqED/rK+96d4 qH56j62CFdBa3I7rwa9mHKMSAtfvKv8xqvQ01rAzHIOLhwPiTRuawBE0V0VyBw== 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 4YyD8m4zf7zfcT; Tue, 18 Feb 2025 22:04:56 +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 51IM4ugo009416; Tue, 18 Feb 2025 22:04:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IM4uFM009413; Tue, 18 Feb 2025 22:04:56 GMT (envelope-from git) Date: Tue, 18 Feb 2025 22:04:56 GMT Message-Id: <202502182204.51IM4uFM009413@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: daca374bc48b - main - makesyscalls: reduce redundency in syscall.mk code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: daca374bc48b5f6975563ae9ecc227868039e807 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=daca374bc48b5f6975563ae9ecc227868039e807 commit daca374bc48b5f6975563ae9ecc227868039e807 Author: Brooks Davis AuthorDate: 2025-02-18 22:02:19 +0000 Commit: Brooks Davis CommitDate: 2025-02-18 22:03:06 +0000 makesyscalls: reduce redundency in syscall.mk code The two outer blocks had identical contents and the two inner blocks differed in a single location. Reviewed by: kevans Sponsored by: DARPA, AFRL Pull Request: https://github.com/freebsd/freebsd-src/pull/1575 --- sys/tools/syscalls/scripts/syscall_mk.lua | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/tools/syscalls/scripts/syscall_mk.lua b/sys/tools/syscalls/scripts/syscall_mk.lua index 49d3f6f86c20..8f8755af31c0 100755 --- a/sys/tools/syscalls/scripts/syscall_mk.lua +++ b/sys/tools/syscalls/scripts/syscall_mk.lua @@ -43,24 +43,14 @@ function syscall_mk.generate(tbl, config, fh) gen:write("MIASM = \\\n") -- preamble for _, v in pairs(s) do local c = v:compatLevel() + local bs = " \\" idx = idx + 1 - if v:native() and not v.type.NODEF and not v.type.NOLIB then + if (v:native() or c >= 7) and not v.type.NODEF and not v.type.NOLIB then if idx >= size then -- At last system call, no backslash. - gen:write(string.format("\t%s.o\n", v:symbol())) - else - -- Normal behavior. - gen:write(string.format("\t%s.o \\\n", v:symbol())) - end - -- Handle compat (everything >= FREEBSD3): - elseif c >= 7 and not v.type.NODEF and not v.type.NOLIB then - if idx >= size then - -- At last system call, no backslash. - gen:write(string.format("\t%s.o\n", v:symbol())) - else - -- Normal behavior. - gen:write(string.format("\t%s.o \\\n", v:symbol())) + bs = "" end + gen:write(string.format("\t%s.o%s\n", v:symbol(), bs)) end end end