git: c8456bb18643 - stable/13 - makesyscall: Stop generating $FreeBSD$
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 26 Oct 2023 03:52:21 UTC
The branch stable/13 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c8456bb18643d3a8ff79955c10b7242f0a599071
commit c8456bb18643d3a8ff79955c10b7242f0a599071
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-06-09 13:26:07 +0000
Commit: Warner Losh <imp@FreeBSD.org>
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)