From nobody Fri Jun 09 13:35:47 2023 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 4Qd2CR6xXfz4c4Lv; Fri, 9 Jun 2023 13:35:47 +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 4Qd2CR6Slqz4WGb; Fri, 9 Jun 2023 13:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686317747; 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=FuS4i8hVu/ROJbCg7lTYvPphcrXyv8WjJUR8+9pRngI=; b=RIPw6r2CaDnvryA0QoNRTsBLf/Hxru15pKZyiD6puiPXB3cRO2uuAyd+0li2cw6se+zfzX KeH//s7YorWvV3MfWqZrTuY7Nrb++Cgjoufk8YxuGjv5UPYg2HqwV50Ljw3UsgwNUtNBjs DcWTvoRYBsFxFIQwkEDYsli21anY5dskcOjFCUhLN95T+ctwv1f/ADj0+J/82R6qF3G+5K OZ0rdNl81ZovxZI6InxOwS+Cc/IbR2vBvCaLUGcBKL2A/gVIXLU0E1bVM+EhBRalkluNge TSn9YOYLpWP2u9Xivt/sfovxYbWmGil2MVcQXltAc5SljbcU0lpD+RR/YLsWYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686317747; 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=FuS4i8hVu/ROJbCg7lTYvPphcrXyv8WjJUR8+9pRngI=; b=Tzc66GyvA44tGXT0FmgkhJ1l3L18hRBczGV2CDOPp7m97+WDgRect84PcaFuwdbvvlXNB0 TLf+amKAPo9Ocsi94bNGYYwpXVEKe9/M54R3nnC5pHdNp9N8NnWn/XV7xaRpFStiFN8fZW qMjMIrw/QbmlJMY3XrrQZXetbW9n0IfxB4K+wQTciNAyLj1ItNXOWz9d6yd4Q2kfYzerwE 48xNLiWOUv5iZW9WG/gfGjhpbB4hFPFQCbCJmwRHtTsJDTtN4kSsUR9K/sblH4yHq4HCxo 1euNBBr/ertV1NIeow8oYsZsSKBAdBcBS6r+p0mpCdTprMky/nZYa6gCKN7oXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686317747; a=rsa-sha256; cv=none; b=DP85SI1y0w5erVALrWZIIi/MsPNUkAEOAIQrszLSwjqSfBtwpEOf1GSc2jxTZ+p32ZCRm8 u7Z8Kh9i+COR1gb0vVs7L9nFCGVhA2iMVFWtS3MTwPbxvez2ib7OmGWr6CkXNy91I/bJvB dE2+1fv8sneZNAykBpkYHZ1xA2LJEoeKNpk31nls4g5VpESdCM1y5+yFOT9VRkLF9i8G7M QKi9NmGKi6q1kxxYD9xJDAcpBRqEuFrPzfbMk/6uapBGwuq3q3slm1kP/abTbW9ZC/YGQl wbATplf/CeaWwYDww/2xK12KEISJ7bwasLwj/7OMJfv7XVCXNNkVHTyZN8fAWQ== 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 4Qd2CR5YXnzd2J; Fri, 9 Jun 2023 13:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 359DZlbh044405; Fri, 9 Jun 2023 13:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359DZlci044404; Fri, 9 Jun 2023 13:35:47 GMT (envelope-from git) Date: Fri, 9 Jun 2023 13:35:47 GMT Message-Id: <202306091335.359DZlci044404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 61fe63f69814 - main - makesyscall: Stop generating $FreeBSD$ 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 61fe63f698148f8d63fe6f366c5e20bc7ad60b87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=61fe63f698148f8d63fe6f366c5e20bc7ad60b87 commit 61fe63f698148f8d63fe6f366c5e20bc7ad60b87 Author: Warner Losh AuthorDate: 2023-06-09 13:26:07 +0000 Commit: Warner Losh CommitDate: 2023-06-09 13:26:24 +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 --- sys/tools/makesyscalls.lua | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 69d45878135e..97fdca6dcde4 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -42,7 +42,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", @@ -486,6 +486,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 @@ -1409,16 +1410,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 @@ -1450,8 +1449,7 @@ struct thread; #define PADR_(t) 0 #endif -]], generated_tag, config.os_id_keyword, config.sysproto_h, - config.sysproto_h)) +]], generated_tag, config.sysproto_h, config.sysproto_h)) if abi_changes("pair_64bit") then write_line("sysarg", string.format([[ #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1474,31 +1472,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. */ @@ -1508,7 +1502,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) int64_t *iarg = (int64_t *)uarg; int a = 0; 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)