From nobody Thu Oct 26 03:52:21 2023 X-Original-To: dev-commits-src-branches@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 4SGBh61x9Yz4ySWt; Thu, 26 Oct 2023 03:52:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SGBh60hMBz4h8q; Thu, 26 Oct 2023 03:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698292342; 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=F+eSN+kmQlSYJGjGr4SbHCJ0QI66zgATTb/xHHK4qN4=; b=mtYhioLBnwHmoEzNHuzrutsLAKiwyQrQNz4XGx82OZ1Zm5NDzrSeuTzW6Foj4/l0xvs6lE aBO5KvL4BeIhUpl8KkIKIDBDe5NYdqVFovuDfIrtbQXJ74ovsRmXAd8zeSb0b/EMU1yf9v 3IzbcLtMWvR7AtzTnzLVXBjRgqGhH40BYRx8jlakLaU1Rek4tO0NvAMM/E5hzbbtio85xU 0O5uKx0mpySHpCYzWRzPzz00Jnu48s4th2+ziu0xWVAZk60CqgOJo/ty/aXWddijN1QnE+ wxHT9wNCPg7hKF9cZI/jsf47/53qwt87jSF7jsFRSDsY88KtpxlnS4Enibid7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698292342; a=rsa-sha256; cv=none; b=l/CqxryGkasYtJ5VWw2exLRH8hyuLwZ38nlzCXkqVjoVHopATIkYxMVpZv5GyMF7M2wjLP HS6e57FyGHWAh4QvSuHi0Nv4iK7iTJZg6o2Wjr4PIGwH/mgbaEfk4uijNvoB/18kCW6c5U y2nnROD/0w0ZR6XEA6T8iOPLNV3koPcFenx+/UmrVVOSERt8i4PN9JReh5Ud2tohPqxaRf 5jhONWhJvzskAhyzYWwGaTHugr5SiZ7O4Ni4xqnW4bGzpo2gpoNM5rDHUQu3aLPbgWhzeO N5jwqgCWJLIIM15EbtBpdz9NzvkKnm2pwQdmVSv5nSgs28MxodFwtZg1XbDOWQ== 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=1698292342; 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=F+eSN+kmQlSYJGjGr4SbHCJ0QI66zgATTb/xHHK4qN4=; b=tPY6HSDXppmcug/gc0oWZU+/gEUHbMeJT0MxR2LKg3kl44jDK4kClfA7nK3REk7A44OQry lFwW+TK3PdGPbajNxEAKkrVygOW7vxHRYcc6uMMCtNJtTuTWdjr2Rfiae/e+n1V5V/JQAi I9Nyx3gSH3m4ajIaAUmGcqZSRo/Wub0yuO1RIGBp1WX/t2YGJfwDyFpTGR+W+hamvS6xPL raU+4+mksDDxsyXqhUcMUyH/GJ5/ToIHtvWZ3+SXJGH0875zXwMmNjgRjBmU2g7k95WZs1 Z/h6UmqKfvpJ/UtiQiZ1R2JtCKKjIUKYoWY2Ayhgq+/jFYsbUNiAdIprdgzJcA== 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 4SGBh56Xf8z1qm; Thu, 26 Oct 2023 03:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39Q3qLtd021873; Thu, 26 Oct 2023 03:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39Q3qL0N021870; Thu, 26 Oct 2023 03:52:21 GMT (envelope-from git) Date: Thu, 26 Oct 2023 03:52:21 GMT Message-Id: <202310260352.39Q3qL0N021870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c8456bb18643 - stable/13 - makesyscall: Stop generating $FreeBSD$ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8456bb18643d3a8ff79955c10b7242f0a599071 Auto-Submitted: auto-generated The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c8456bb18643d3a8ff79955c10b7242f0a599071 commit c8456bb18643d3a8ff79955c10b7242f0a599071 Author: Warner Losh AuthorDate: 2023-06-09 13:26:07 +0000 Commit: Warner Losh CommitDate: 2023-10-26 03:48:35 +0000 makesyscall: Stop generating $FreeBSD$ With 14 coming, we no longer need to generate the $FreeBSD$. We can likely MFC that to 13 as well. MFC After: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39879 (cherry picked from commit 61fe63f698148f8d63fe6f366c5e20bc7ad60b87) --- sys/tools/makesyscalls.lua | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index aa7e18bef853..cc2a4f1362ae 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -40,7 +40,7 @@ local generated_tag = "@" .. "generated" -- Default configuration; any of these may get replaced by a configuration file -- optionally specified. local config = { - os_id_keyword = "FreeBSD", + os_id_keyword = "FreeBSD", -- obsolete, ignored on input, not generated abi_func_prefix = "", sysnames = "syscalls.c", sysproto = "../sys/sysproto.h", @@ -427,6 +427,7 @@ local process_syscall_def -- These patterns are processed in order on any line that isn't empty. local pattern_table = { { + -- To be removed soon pattern = "%s*$" .. config.os_id_keyword, process = function(_, _) -- Ignore... ID tag @@ -1209,16 +1210,14 @@ write_line("syssw", string.format([[/* * System call switch table. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ -]], generated_tag, config.os_id_keyword)) +]], generated_tag)) write_line("sysarg", string.format([[/* * System call prototypes. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ #ifndef %s @@ -1250,7 +1249,7 @@ struct thread; #define PADR_(t) 0 #endif -]], generated_tag, config.os_id_keyword, config.sysproto_h, +]], generated_tag, config.sysproto_h, config.sysproto_h)) for _, v in pairs(compat_options) do write_line(v.tmp, string.format("\n#ifdef %s\n\n", v.definition)) @@ -1260,31 +1259,27 @@ write_line("sysnames", string.format([[/* * System call names. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ const char *%s[] = { -]], generated_tag, config.os_id_keyword, config.namesname)) +]], generated_tag, config.namesname)) write_line("syshdr", string.format([[/* * System call numbers. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ */ -]], generated_tag, config.os_id_keyword)) +]], generated_tag)) write_line("sysmk", string.format([[# FreeBSD system call object files. # DO NOT EDIT-- this file is automatically %s. -# $%s$ -MIASM = ]], generated_tag, config.os_id_keyword)) +MIASM = ]], generated_tag)) write_line("systrace", string.format([[/* * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically %s. - * $%s$ * This file is part of the DTrace syscall provider. */ @@ -1293,7 +1288,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) { int64_t *iarg = (int64_t *)uarg; switch (sysnum) { -]], generated_tag, config.os_id_keyword)) +]], generated_tag)) write_line("systracetmp", [[static void systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)