{"id":2222769,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222769/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260413-syscall-nr-v1-5-f70408d042ea@bsdimp.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260413-syscall-nr-v1-5-f70408d042ea@bsdimp.com>","date":"2026-04-13T15:31:47","name":"[5/5] bsd-user: Switch to generated syscall_nr.h","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"87435dea32afe062e8147cfd2c20ec8ca1c00c78","submitter":{"id":1896,"url":"http://patchwork.ozlabs.org/api/1.1/people/1896/?format=json","name":"Warner Losh","email":"imp@bsdimp.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260413-syscall-nr-v1-5-f70408d042ea@bsdimp.com/mbox/","series":[{"id":499724,"url":"http://patchwork.ozlabs.org/api/1.1/series/499724/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499724","date":"2026-04-13T15:31:42","name":"bsd-user: Generate system call numbers","version":1,"mbox":"http://patchwork.ozlabs.org/series/499724/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222769/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222769/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=bsdimp-com.20251104.gappssmtp.com\n header.i=@bsdimp-com.20251104.gappssmtp.com header.a=rsa-sha256\n header.s=20251104 header.b=RJtXjmdM;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fvWfq1YVPz1yDG\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 14 Apr 2026 01:34:27 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wCJIT-0006Yf-Ms; Mon, 13 Apr 2026 11:33:57 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <imp@bsdimp.com>) id 1wCJHV-0006GU-Sm\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 11:33:06 -0400","from mail-ot1-x32a.google.com ([2607:f8b0:4864:20::32a])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <imp@bsdimp.com>) id 1wCJHT-0002yI-1e\n for qemu-devel@nongnu.org; Mon, 13 Apr 2026 11:32:57 -0400","by mail-ot1-x32a.google.com with SMTP id\n 46e09a7af769-7d9b21d1461so4494970a34.1\n for <qemu-devel@nongnu.org>; Mon, 13 Apr 2026 08:32:53 -0700 (PDT)","from rebo.bsdimp.com ([50.253.99.174])\n by smtp.gmail.com with ESMTPSA id\n 46e09a7af769-7dc2696c463sm8659192a34.23.2026.04.13.08.32.50\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Apr 2026 08:32:51 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=bsdimp-com.20251104.gappssmtp.com; s=20251104; t=1776094372; x=1776699172;\n darn=nongnu.org;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:from:to:cc:subject:date:message-id\n :reply-to; bh=0uQmWEvli3jR1BBImI39hfECjelvyoZ3y4nVls2Vhpg=;\n b=RJtXjmdMHnRJYXuLkbqiLpB/OVaq/RjUNbXZqUb4ufpjvnouvn8BwWEz5oJGowqXfG\n mFWlIdnB63qzO2m+boOXQ3Q/5qyi4CnNoY1W7HFuLpeNBJLr5eg9Z1hOPNfWU8iNNjbJ\n ztUpF7G2P6xqNP+6SLXvhKELLpQT1/S17I2Jmd2bG2YS3jYnxIXjkhnfDWjYWtR+bj9N\n 8Ot0LhUdxmIgBx1v7cUX7P9cOxIcd9ZDdnVguaZv6Rb0bkhdaUXkowNo2VZql8czRoBT\n dNLAbxFP/bpz5IVA9aSFSmzKN0/pBZG8PY/kSXaPYNapwOi6Y+s5hAO2qhDWKhOYCNAs\n RExw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776094372; x=1776699172;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=0uQmWEvli3jR1BBImI39hfECjelvyoZ3y4nVls2Vhpg=;\n b=jbbm6Y8Yv5DpDzis/wfwBas7jlNmKXX7cWcRaLJFj5PmCqiOQOQ0dyPjS+ARwODnXB\n jiXXq6J9kp2oNZHnHfdCzE8ukrAJXraRQYPa/IpAvM1PcqQfxVl1TJGtb7Lx7VxNzZUK\n Ke9wpPGP1A6E+OSt2VA2IHMUzD1UgS0COCao0J+TotKrftK8BWq5QroQ7TfN8s8hwm5m\n RTcbWdrvr3u1GCFatWfbGnzv2qhb/7Kt3BMO1j7mBDtK76CZOQx5w41nYvixiLKaIMu8\n qm7bhHDCoZzyEzvhE9paUZTbKF+BPQps3Kme4atXhyyMxnBNkT4GZJ9EDPh18IIlAbvR\n 3CrQ==","X-Gm-Message-State":"AOJu0YwY8gb8UbzlqW+ZJh8lx4DoTlbri0tLrZm8bFQiEycy1lNaAQ5j\n hqdBWS+YrpNCjf/cwoPcvESHWV15/PuHqpPQALTqx6dDxkqCr2wM7DokuaSdD3xQYUw=","X-Gm-Gg":"AeBDieudnr9sOYs7KLiIjoANpWHK2Oaeed5KNuCRP21pyIB2AQCHixQo69kX9+fOrjB\n m2saBlX3zJ1zs52sj5Ega9lDee5qXKurk89TYHYJv36gEWDOdsdR1954hfghWyJPEteptWyu6cO\n DBa85SrPJMBe/9SmDB776wG4i+/BGISxutsSmLgfXaYRiZ/ehKioDxiORPrLM5Q+PT95FMahkGO\n Oy/nqmxTMoQBHkHXTn+DvS/oO8Bg315QmAPs52fIwzH92hoOzVZcfPLGVUC7+MIgYcvoLTr0gFK\n 4u24LnGXMlb0zXcQ1DRZCF1nE37ZKT4fHD7AwLLDQKp6q8DCe6p+1TYpekfHGDWTvI+L0h2JN7s\n LOYiyxtqJXujd3jAig5TJr0J5JFRTBQb6HseySpw4tJJDrorMGOvRk7XqwGj3nQtcLKm4JXIBbW\n 21wgDu3MqOU5CVLm2hEMKE","X-Received":"by 2002:a05:6830:6da6:b0:7d7:f3d1:d701 with SMTP id\n 46e09a7af769-7dc1762da55mr7595181a34.6.1776094372184;\n Mon, 13 Apr 2026 08:32:52 -0700 (PDT)","From":"Warner Losh <imp@bsdimp.com>","Date":"Mon, 13 Apr 2026 09:31:47 -0600","Subject":"[PATCH 5/5] bsd-user: Switch to generated syscall_nr.h","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"7bit","Message-Id":"<20260413-syscall-nr-v1-5-f70408d042ea@bsdimp.com>","References":"<20260413-syscall-nr-v1-0-f70408d042ea@bsdimp.com>","In-Reply-To":"<20260413-syscall-nr-v1-0-f70408d042ea@bsdimp.com>","To":"qemu-devel@nongnu.org","Cc":"Kyle Evans <kevans@freebsd.org>, Paolo Bonzini <pbonzini@redhat.com>,\n\t=?utf-8?q?Marc-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n\t=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>, =?utf-8?q?Phil?=\n\t=?utf-8?q?ippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n  Warner Losh <imp@bsdimp.com>","X-Mailer":"b4 0.14.3","X-Developer-Signature":"v=1; a=openpgp-sha256; l=27190; i=imp@bsdimp.com;\n h=from:subject:message-id; bh=tnNJZRJcZ2aCmaykLh+cQ7PzQ8MlLfYbvFoybCubHQ8=;\n b=owEBbQKS/ZANAwAKAWwc0Sh9sBEAAcsmYgBp3QxpwMfh8KfEG3hJrf+cqrrxoLDlAFRYHzROb\n /3YjoptULuJAjMEAAEKAB0WIQQgNfiUsAqjz3zN4bdsHNEofbARAAUCad0MaQAKCRBsHNEofbAR\n AHruEAC8i3T8HETd53cuTHuYLKaPmyotsbR9SstsIQEQ9eH2l9rCEiK3jo2a+uDqIjTLQUGJLVl\n A00YTOycaOLauN8MaoHaKauf5JDGZsgRsuMRi6P/PXLWdBLcKjkIajb468EaI4sm032cj4Ggdjn\n RYXkNAxu+xYJCqffKbLJ/8ADreOCIMCe4B6Rh1RPC//6CQRHkcU4Cjm2I41ajUaqdkHfMBIzXXt\n cvd7xIIPY5aFMXjZHrBV5SucRDVHE5wbEVqgPWGAR8bVpbyzdnigPiE4J35mbKLGbeEPfG3D3IA\n 5YMSsg6AF85zPZ6d8qAuNH0jLnNeKyw6+tYf3sKu89WWd84GqNoS0R2vURS2cji56ymu89QuTHe\n 84irjZkcLrsqyWO716peW4kmWhvqIyrAd+utPiHvXRZL1MPJCCoqDgg7bzwQvEM+IYrvTc47BHD\n qwM9Siyv7xCqJiEc3YFc2RAlCszk1w/j3YhFkwP92ELcCBPLRmkx5FvVjGKSlRfumuHF8ZBs6OW\n PiW9C+okLIvubhTuRHqYWQiWVd8E6mWMY+l1zwuVPlhchecYRgJYDmN6vKvRt/I9c6E+4Sa/Vju\n 4bBAzudLt9Ky/ZwE8DttG1rggSHvht8W7yMK82e/1CMxY4sZaCYUyzwVWL+2dOSRqkmmaYgzDpE\n s1ERR+e/5MNLt5A==","X-Developer-Key":"i=imp@bsdimp.com; a=openpgp;\n fpr=2035F894B00AA3CF7CCDE1B76C1CD1287DB01100","Received-SPF":"none client-ip=2607:f8b0:4864:20::32a;\n envelope-from=imp@bsdimp.com; helo=mail-ot1-x32a.google.com","X-Spam_score_int":"-18","X-Spam_score":"-1.9","X-Spam_bar":"-","X-Spam_report":"(-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_NONE=0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Now that this will build and work, remove the old syscall_nr.h and\nswitch the include over to the generated file in syscall_defs.h.\n\nTo do this, I had to delete the old, wrong definition of time_t for\nFreeBSD on amd64 since it stumbled over the fact that TARGET_i386 is\ndefined for both 32-bit and 64-bit builds (the new os-syscall.h had the\nrigth definition). Rather than modify this file twice to fix it, rolled\nthe fix into using os-syscall.h since it's still easy enough to review.\n\nSigned-off-by: Warner Losh <imp@bsdimp.com>\n---\n bsd-user/freebsd/syscall_nr.h | 515 ------------------------------------------\n bsd-user/syscall_defs.h       |  18 +-\n 2 files changed, 1 insertion(+), 532 deletions(-)","diff":"diff --git a/bsd-user/freebsd/syscall_nr.h b/bsd-user/freebsd/syscall_nr.h\ndeleted file mode 100644\nindex 7f73a6d0f1..0000000000\n--- a/bsd-user/freebsd/syscall_nr.h\n+++ /dev/null\n@@ -1,515 +0,0 @@\n-/*\n- * System call numbers.\n- *\n- * DO NOT EDIT-- this file is automatically @generated.\n- * $FreeBSD$\n- */\n-\n-#define TARGET_FREEBSD_NR_syscall       0\n-#define TARGET_FREEBSD_NR_exit  1\n-#define TARGET_FREEBSD_NR_fork  2\n-#define TARGET_FREEBSD_NR_read  3\n-#define TARGET_FREEBSD_NR_write 4\n-#define TARGET_FREEBSD_NR_open  5\n-#define TARGET_FREEBSD_NR_close 6\n-#define TARGET_FREEBSD_NR_wait4 7\n-                                /* 8 is old creat */\n-#define TARGET_FREEBSD_NR_link  9\n-#define TARGET_FREEBSD_NR_unlink        10\n-                                /* 11 is obsolete execv */\n-#define TARGET_FREEBSD_NR_chdir 12\n-#define TARGET_FREEBSD_NR_fchdir        13\n-#define TARGET_FREEBSD_NR_freebsd11_mknod       14\n-#define TARGET_FREEBSD_NR_chmod 15\n-#define TARGET_FREEBSD_NR_chown 16\n-#define TARGET_FREEBSD_NR_break 17\n-                                /* 18 is freebsd4 getfsstat */\n-                                /* 19 is old lseek */\n-#define TARGET_FREEBSD_NR_getpid        20\n-#define TARGET_FREEBSD_NR_mount 21\n-#define TARGET_FREEBSD_NR_unmount       22\n-#define TARGET_FREEBSD_NR_setuid        23\n-#define TARGET_FREEBSD_NR_getuid        24\n-#define TARGET_FREEBSD_NR_geteuid       25\n-#define TARGET_FREEBSD_NR_ptrace        26\n-#define TARGET_FREEBSD_NR_recvmsg       27\n-#define TARGET_FREEBSD_NR_sendmsg       28\n-#define TARGET_FREEBSD_NR_recvfrom      29\n-#define TARGET_FREEBSD_NR_accept        30\n-#define TARGET_FREEBSD_NR_getpeername   31\n-#define TARGET_FREEBSD_NR_getsockname   32\n-#define TARGET_FREEBSD_NR_access        33\n-#define TARGET_FREEBSD_NR_chflags       34\n-#define TARGET_FREEBSD_NR_fchflags      35\n-#define TARGET_FREEBSD_NR_sync  36\n-#define TARGET_FREEBSD_NR_kill  37\n-                                /* 38 is old stat */\n-#define TARGET_FREEBSD_NR_getppid       39\n-                                /* 40 is old lstat */\n-#define TARGET_FREEBSD_NR_dup   41\n-#define TARGET_FREEBSD_NR_freebsd10_pipe        42\n-#define TARGET_FREEBSD_NR_getegid       43\n-#define TARGET_FREEBSD_NR_profil        44\n-#define TARGET_FREEBSD_NR_ktrace        45\n-                                /* 46 is old sigaction */\n-#define TARGET_FREEBSD_NR_getgid        47\n-                                /* 48 is old sigprocmask */\n-#define TARGET_FREEBSD_NR_getlogin      49\n-#define TARGET_FREEBSD_NR_setlogin      50\n-#define TARGET_FREEBSD_NR_acct  51\n-                                /* 52 is old sigpending */\n-#define TARGET_FREEBSD_NR_sigaltstack   53\n-#define TARGET_FREEBSD_NR_ioctl 54\n-#define TARGET_FREEBSD_NR_reboot        55\n-#define TARGET_FREEBSD_NR_revoke        56\n-#define TARGET_FREEBSD_NR_symlink       57\n-#define TARGET_FREEBSD_NR_readlink      58\n-#define TARGET_FREEBSD_NR_execve        59\n-#define TARGET_FREEBSD_NR_umask 60\n-#define TARGET_FREEBSD_NR_chroot        61\n-                                /* 62 is old fstat */\n-                                /* 63 is old getkerninfo */\n-                                /* 64 is old getpagesize */\n-#define TARGET_FREEBSD_NR_msync 65\n-#define TARGET_FREEBSD_NR_vfork 66\n-                                /* 67 is obsolete vread */\n-                                /* 68 is obsolete vwrite */\n-#define TARGET_FREEBSD_NR_sbrk  69\n-#define TARGET_FREEBSD_NR_sstk  70\n-                                /* 71 is old mmap */\n-#define TARGET_FREEBSD_NR_freebsd11_vadvise     72\n-#define TARGET_FREEBSD_NR_munmap        73\n-#define TARGET_FREEBSD_NR_mprotect      74\n-#define TARGET_FREEBSD_NR_madvise       75\n-                                /* 76 is obsolete vhangup */\n-                                /* 77 is obsolete vlimit */\n-#define TARGET_FREEBSD_NR_mincore       78\n-#define TARGET_FREEBSD_NR_getgroups     79\n-#define TARGET_FREEBSD_NR_setgroups     80\n-#define TARGET_FREEBSD_NR_getpgrp       81\n-#define TARGET_FREEBSD_NR_setpgid       82\n-#define TARGET_FREEBSD_NR_setitimer     83\n-                                /* 84 is old wait */\n-#define TARGET_FREEBSD_NR_swapon        85\n-#define TARGET_FREEBSD_NR_getitimer     86\n-                                /* 87 is old gethostname */\n-                                /* 88 is old sethostname */\n-#define TARGET_FREEBSD_NR_getdtablesize 89\n-#define TARGET_FREEBSD_NR_dup2  90\n-#define TARGET_FREEBSD_NR_fcntl 92\n-#define TARGET_FREEBSD_NR_select        93\n-#define TARGET_FREEBSD_NR_fsync 95\n-#define TARGET_FREEBSD_NR_setpriority   96\n-#define TARGET_FREEBSD_NR_socket        97\n-#define TARGET_FREEBSD_NR_connect       98\n-                                /* 99 is old accept */\n-#define TARGET_FREEBSD_NR_getpriority   100\n-                                /* 101 is old send */\n-                                /* 102 is old recv */\n-                                /* 103 is old sigreturn */\n-#define TARGET_FREEBSD_NR_bind  104\n-#define TARGET_FREEBSD_NR_setsockopt    105\n-#define TARGET_FREEBSD_NR_listen        106\n-                                /* 107 is obsolete vtimes */\n-                                /* 108 is old sigvec */\n-                                /* 109 is old sigblock */\n-                                /* 110 is old sigsetmask */\n-                                /* 111 is old sigsuspend */\n-                                /* 112 is old sigstack */\n-                                /* 113 is old recvmsg */\n-                                /* 114 is old sendmsg */\n-                                /* 115 is obsolete vtrace */\n-#define TARGET_FREEBSD_NR_gettimeofday  116\n-#define TARGET_FREEBSD_NR_getrusage     117\n-#define TARGET_FREEBSD_NR_getsockopt    118\n-#define TARGET_FREEBSD_NR_readv 120\n-#define TARGET_FREEBSD_NR_writev        121\n-#define TARGET_FREEBSD_NR_settimeofday  122\n-#define TARGET_FREEBSD_NR_fchown        123\n-#define TARGET_FREEBSD_NR_fchmod        124\n-                                /* 125 is old recvfrom */\n-#define TARGET_FREEBSD_NR_setreuid      126\n-#define TARGET_FREEBSD_NR_setregid      127\n-#define TARGET_FREEBSD_NR_rename        128\n-                                /* 129 is old truncate */\n-                                /* 130 is old ftruncate */\n-#define TARGET_FREEBSD_NR_flock 131\n-#define TARGET_FREEBSD_NR_mkfifo        132\n-#define TARGET_FREEBSD_NR_sendto        133\n-#define TARGET_FREEBSD_NR_shutdown      134\n-#define TARGET_FREEBSD_NR_socketpair    135\n-#define TARGET_FREEBSD_NR_mkdir 136\n-#define TARGET_FREEBSD_NR_rmdir 137\n-#define TARGET_FREEBSD_NR_utimes        138\n-                                /* 139 is obsolete 4.2 sigreturn */\n-#define TARGET_FREEBSD_NR_adjtime       140\n-                                /* 141 is old getpeername */\n-                                /* 142 is old gethostid */\n-                                /* 143 is old sethostid */\n-                                /* 144 is old getrlimit */\n-                                /* 145 is old setrlimit */\n-                                /* 146 is old killpg */\n-#define TARGET_FREEBSD_NR_setsid        147\n-#define TARGET_FREEBSD_NR_quotactl      148\n-                                /* 149 is old quota */\n-                                /* 150 is old getsockname */\n-#define TARGET_FREEBSD_NR_nlm_syscall   154\n-#define TARGET_FREEBSD_NR_nfssvc        155\n-                                /* 156 is old getdirentries */\n-                                /* 157 is freebsd4 statfs */\n-                                /* 158 is freebsd4 fstatfs */\n-#define TARGET_FREEBSD_NR_lgetfh        160\n-#define TARGET_FREEBSD_NR_getfh 161\n-                                /* 162 is freebsd4 getdomainname */\n-                                /* 163 is freebsd4 setdomainname */\n-                                /* 164 is freebsd4 uname */\n-#define TARGET_FREEBSD_NR_sysarch       165\n-#define TARGET_FREEBSD_NR_rtprio        166\n-#define TARGET_FREEBSD_NR_semsys        169\n-#define TARGET_FREEBSD_NR_msgsys        170\n-#define TARGET_FREEBSD_NR_shmsys        171\n-                                /* 173 is freebsd6 pread */\n-                                /* 174 is freebsd6 pwrite */\n-#define TARGET_FREEBSD_NR_setfib        175\n-#define TARGET_FREEBSD_NR_ntp_adjtime   176\n-#define TARGET_FREEBSD_NR_setgid        181\n-#define TARGET_FREEBSD_NR_setegid       182\n-#define TARGET_FREEBSD_NR_seteuid       183\n-                                /* 184 is obsolete lfs_bmapv */\n-                                /* 185 is obsolete lfs_markv */\n-                                /* 186 is obsolete lfs_segclean */\n-                                /* 187 is obsolete lfs_segwait */\n-#define TARGET_FREEBSD_NR_freebsd11_stat        188\n-#define TARGET_FREEBSD_NR_freebsd11_fstat       189\n-#define TARGET_FREEBSD_NR_freebsd11_lstat       190\n-#define TARGET_FREEBSD_NR_pathconf      191\n-#define TARGET_FREEBSD_NR_fpathconf     192\n-#define TARGET_FREEBSD_NR_getrlimit     194\n-#define TARGET_FREEBSD_NR_setrlimit     195\n-#define TARGET_FREEBSD_NR_freebsd11_getdirentries       196\n-                                /* 197 is freebsd6 mmap */\n-#define TARGET_FREEBSD_NR___syscall     198\n-                                /* 199 is freebsd6 lseek */\n-                                /* 200 is freebsd6 truncate */\n-                                /* 201 is freebsd6 ftruncate */\n-#define TARGET_FREEBSD_NR___sysctl      202\n-#define TARGET_FREEBSD_NR_mlock 203\n-#define TARGET_FREEBSD_NR_munlock       204\n-#define TARGET_FREEBSD_NR_undelete      205\n-#define TARGET_FREEBSD_NR_futimes       206\n-#define TARGET_FREEBSD_NR_getpgid       207\n-#define TARGET_FREEBSD_NR_poll  209\n-#define TARGET_FREEBSD_NR_freebsd7___semctl     220\n-#define TARGET_FREEBSD_NR_semget        221\n-#define TARGET_FREEBSD_NR_semop 222\n-                                /* 223 is obsolete semconfig */\n-#define TARGET_FREEBSD_NR_freebsd7_msgctl       224\n-#define TARGET_FREEBSD_NR_msgget        225\n-#define TARGET_FREEBSD_NR_msgsnd        226\n-#define TARGET_FREEBSD_NR_msgrcv        227\n-#define TARGET_FREEBSD_NR_shmat 228\n-#define TARGET_FREEBSD_NR_freebsd7_shmctl       229\n-#define TARGET_FREEBSD_NR_shmdt 230\n-#define TARGET_FREEBSD_NR_shmget        231\n-#define TARGET_FREEBSD_NR_clock_gettime 232\n-#define TARGET_FREEBSD_NR_clock_settime 233\n-#define TARGET_FREEBSD_NR_clock_getres  234\n-#define TARGET_FREEBSD_NR_ktimer_create 235\n-#define TARGET_FREEBSD_NR_ktimer_delete 236\n-#define TARGET_FREEBSD_NR_ktimer_settime        237\n-#define TARGET_FREEBSD_NR_ktimer_gettime        238\n-#define TARGET_FREEBSD_NR_ktimer_getoverrun     239\n-#define TARGET_FREEBSD_NR_nanosleep     240\n-#define TARGET_FREEBSD_NR_ffclock_getcounter    241\n-#define TARGET_FREEBSD_NR_ffclock_setestimate   242\n-#define TARGET_FREEBSD_NR_ffclock_getestimate   243\n-#define TARGET_FREEBSD_NR_clock_nanosleep       244\n-#define TARGET_FREEBSD_NR_clock_getcpuclockid2  247\n-#define TARGET_FREEBSD_NR_ntp_gettime   248\n-#define TARGET_FREEBSD_NR_minherit      250\n-#define TARGET_FREEBSD_NR_rfork 251\n-                                /* 252 is obsolete openbsd_poll */\n-#define TARGET_FREEBSD_NR_issetugid     253\n-#define TARGET_FREEBSD_NR_lchown        254\n-#define TARGET_FREEBSD_NR_aio_read      255\n-#define TARGET_FREEBSD_NR_aio_write     256\n-#define TARGET_FREEBSD_NR_lio_listio    257\n-#define TARGET_FREEBSD_NR_freebsd11_getdents    272\n-#define TARGET_FREEBSD_NR_lchmod        274\n-                                /* 275 is obsolete netbsd_lchown */\n-#define TARGET_FREEBSD_NR_lutimes       276\n-                                /* 277 is obsolete netbsd_msync */\n-#define TARGET_FREEBSD_NR_freebsd11_nstat       278\n-#define TARGET_FREEBSD_NR_freebsd11_nfstat      279\n-#define TARGET_FREEBSD_NR_freebsd11_nlstat      280\n-#define TARGET_FREEBSD_NR_preadv        289\n-#define TARGET_FREEBSD_NR_pwritev       290\n-                                /* 297 is freebsd4 fhstatfs */\n-#define TARGET_FREEBSD_NR_fhopen        298\n-#define TARGET_FREEBSD_NR_freebsd11_fhstat      299\n-#define TARGET_FREEBSD_NR_modnext       300\n-#define TARGET_FREEBSD_NR_modstat       301\n-#define TARGET_FREEBSD_NR_modfnext      302\n-#define TARGET_FREEBSD_NR_modfind       303\n-#define TARGET_FREEBSD_NR_kldload       304\n-#define TARGET_FREEBSD_NR_kldunload     305\n-#define TARGET_FREEBSD_NR_kldfind       306\n-#define TARGET_FREEBSD_NR_kldnext       307\n-#define TARGET_FREEBSD_NR_kldstat       308\n-#define TARGET_FREEBSD_NR_kldfirstmod   309\n-#define TARGET_FREEBSD_NR_getsid        310\n-#define TARGET_FREEBSD_NR_setresuid     311\n-#define TARGET_FREEBSD_NR_setresgid     312\n-                                /* 313 is obsolete signanosleep */\n-#define TARGET_FREEBSD_NR_aio_return    314\n-#define TARGET_FREEBSD_NR_aio_suspend   315\n-#define TARGET_FREEBSD_NR_aio_cancel    316\n-#define TARGET_FREEBSD_NR_aio_error     317\n-                                /* 318 is freebsd6 aio_read */\n-                                /* 319 is freebsd6 aio_write */\n-                                /* 320 is freebsd6 lio_listio */\n-#define TARGET_FREEBSD_NR_yield 321\n-                                /* 322 is obsolete thr_sleep */\n-                                /* 323 is obsolete thr_wakeup */\n-#define TARGET_FREEBSD_NR_mlockall      324\n-#define TARGET_FREEBSD_NR_munlockall    325\n-#define TARGET_FREEBSD_NR___getcwd      326\n-#define TARGET_FREEBSD_NR_sched_setparam        327\n-#define TARGET_FREEBSD_NR_sched_getparam        328\n-#define TARGET_FREEBSD_NR_sched_setscheduler    329\n-#define TARGET_FREEBSD_NR_sched_getscheduler    330\n-#define TARGET_FREEBSD_NR_sched_yield   331\n-#define TARGET_FREEBSD_NR_sched_get_priority_max        332\n-#define TARGET_FREEBSD_NR_sched_get_priority_min        333\n-#define TARGET_FREEBSD_NR_sched_rr_get_interval 334\n-#define TARGET_FREEBSD_NR_utrace        335\n-                                /* 336 is freebsd4 sendfile */\n-#define TARGET_FREEBSD_NR_kldsym        337\n-#define TARGET_FREEBSD_NR_jail  338\n-#define TARGET_FREEBSD_NR_nnpfs_syscall 339\n-#define TARGET_FREEBSD_NR_sigprocmask   340\n-#define TARGET_FREEBSD_NR_sigsuspend    341\n-                                /* 342 is freebsd4 sigaction */\n-#define TARGET_FREEBSD_NR_sigpending    343\n-                                /* 344 is freebsd4 sigreturn */\n-#define TARGET_FREEBSD_NR_sigtimedwait  345\n-#define TARGET_FREEBSD_NR_sigwaitinfo   346\n-#define TARGET_FREEBSD_NR___acl_get_file        347\n-#define TARGET_FREEBSD_NR___acl_set_file        348\n-#define TARGET_FREEBSD_NR___acl_get_fd  349\n-#define TARGET_FREEBSD_NR___acl_set_fd  350\n-#define TARGET_FREEBSD_NR___acl_delete_file     351\n-#define TARGET_FREEBSD_NR___acl_delete_fd       352\n-#define TARGET_FREEBSD_NR___acl_aclcheck_file   353\n-#define TARGET_FREEBSD_NR___acl_aclcheck_fd     354\n-#define TARGET_FREEBSD_NR_extattrctl    355\n-#define TARGET_FREEBSD_NR_extattr_set_file      356\n-#define TARGET_FREEBSD_NR_extattr_get_file      357\n-#define TARGET_FREEBSD_NR_extattr_delete_file   358\n-#define TARGET_FREEBSD_NR_aio_waitcomplete      359\n-#define TARGET_FREEBSD_NR_getresuid     360\n-#define TARGET_FREEBSD_NR_getresgid     361\n-#define TARGET_FREEBSD_NR_kqueue        362\n-#define TARGET_FREEBSD_NR_freebsd11_kevent      363\n-                                /* 364 is obsolete __cap_get_proc */\n-                                /* 365 is obsolete __cap_set_proc */\n-                                /* 366 is obsolete __cap_get_fd */\n-                                /* 367 is obsolete __cap_get_file */\n-                                /* 368 is obsolete __cap_set_fd */\n-                                /* 369 is obsolete __cap_set_file */\n-#define TARGET_FREEBSD_NR_extattr_set_fd        371\n-#define TARGET_FREEBSD_NR_extattr_get_fd        372\n-#define TARGET_FREEBSD_NR_extattr_delete_fd     373\n-#define TARGET_FREEBSD_NR___setugid     374\n-                                /* 375 is obsolete nfsclnt */\n-#define TARGET_FREEBSD_NR_eaccess       376\n-#define TARGET_FREEBSD_NR_afs3_syscall  377\n-#define TARGET_FREEBSD_NR_nmount        378\n-                                /* 379 is obsolete kse_exit */\n-                                /* 380 is obsolete kse_wakeup */\n-                                /* 381 is obsolete kse_create */\n-                                /* 382 is obsolete kse_thr_interrupt */\n-                                /* 383 is obsolete kse_release */\n-#define TARGET_FREEBSD_NR___mac_get_proc        384\n-#define TARGET_FREEBSD_NR___mac_set_proc        385\n-#define TARGET_FREEBSD_NR___mac_get_fd  386\n-#define TARGET_FREEBSD_NR___mac_get_file        387\n-#define TARGET_FREEBSD_NR___mac_set_fd  388\n-#define TARGET_FREEBSD_NR___mac_set_file        389\n-#define TARGET_FREEBSD_NR_kenv  390\n-#define TARGET_FREEBSD_NR_lchflags      391\n-#define TARGET_FREEBSD_NR_uuidgen       392\n-#define TARGET_FREEBSD_NR_sendfile      393\n-#define TARGET_FREEBSD_NR_mac_syscall   394\n-#define TARGET_FREEBSD_NR_freebsd11_getfsstat   395\n-#define TARGET_FREEBSD_NR_freebsd11_statfs      396\n-#define TARGET_FREEBSD_NR_freebsd11_fstatfs     397\n-#define TARGET_FREEBSD_NR_freebsd11_fhstatfs    398\n-#define TARGET_FREEBSD_NR_ksem_close    400\n-#define TARGET_FREEBSD_NR_ksem_post     401\n-#define TARGET_FREEBSD_NR_ksem_wait     402\n-#define TARGET_FREEBSD_NR_ksem_trywait  403\n-#define TARGET_FREEBSD_NR_ksem_init     404\n-#define TARGET_FREEBSD_NR_ksem_open     405\n-#define TARGET_FREEBSD_NR_ksem_unlink   406\n-#define TARGET_FREEBSD_NR_ksem_getvalue 407\n-#define TARGET_FREEBSD_NR_ksem_destroy  408\n-#define TARGET_FREEBSD_NR___mac_get_pid 409\n-#define TARGET_FREEBSD_NR___mac_get_link        410\n-#define TARGET_FREEBSD_NR___mac_set_link        411\n-#define TARGET_FREEBSD_NR_extattr_set_link      412\n-#define TARGET_FREEBSD_NR_extattr_get_link      413\n-#define TARGET_FREEBSD_NR_extattr_delete_link   414\n-#define TARGET_FREEBSD_NR___mac_execve  415\n-#define TARGET_FREEBSD_NR_sigaction     416\n-#define TARGET_FREEBSD_NR_sigreturn     417\n-#define TARGET_FREEBSD_NR_getcontext    421\n-#define TARGET_FREEBSD_NR_setcontext    422\n-#define TARGET_FREEBSD_NR_swapcontext   423\n-#define TARGET_FREEBSD_NR_swapoff       424\n-#define TARGET_FREEBSD_NR___acl_get_link        425\n-#define TARGET_FREEBSD_NR___acl_set_link        426\n-#define TARGET_FREEBSD_NR___acl_delete_link     427\n-#define TARGET_FREEBSD_NR___acl_aclcheck_link   428\n-#define TARGET_FREEBSD_NR_sigwait       429\n-#define TARGET_FREEBSD_NR_thr_create    430\n-#define TARGET_FREEBSD_NR_thr_exit      431\n-#define TARGET_FREEBSD_NR_thr_self      432\n-#define TARGET_FREEBSD_NR_thr_kill      433\n-#define TARGET_FREEBSD_NR_jail_attach   436\n-#define TARGET_FREEBSD_NR_extattr_list_fd       437\n-#define TARGET_FREEBSD_NR_extattr_list_file     438\n-#define TARGET_FREEBSD_NR_extattr_list_link     439\n-                                /* 440 is obsolete kse_switchin */\n-#define TARGET_FREEBSD_NR_ksem_timedwait        441\n-#define TARGET_FREEBSD_NR_thr_suspend   442\n-#define TARGET_FREEBSD_NR_thr_wake      443\n-#define TARGET_FREEBSD_NR_kldunloadf    444\n-#define TARGET_FREEBSD_NR_audit 445\n-#define TARGET_FREEBSD_NR_auditon       446\n-#define TARGET_FREEBSD_NR_getauid       447\n-#define TARGET_FREEBSD_NR_setauid       448\n-#define TARGET_FREEBSD_NR_getaudit      449\n-#define TARGET_FREEBSD_NR_setaudit      450\n-#define TARGET_FREEBSD_NR_getaudit_addr 451\n-#define TARGET_FREEBSD_NR_setaudit_addr 452\n-#define TARGET_FREEBSD_NR_auditctl      453\n-#define TARGET_FREEBSD_NR__umtx_op      454\n-#define TARGET_FREEBSD_NR_thr_new       455\n-#define TARGET_FREEBSD_NR_sigqueue      456\n-#define TARGET_FREEBSD_NR_kmq_open      457\n-#define TARGET_FREEBSD_NR_kmq_setattr   458\n-#define TARGET_FREEBSD_NR_kmq_timedreceive      459\n-#define TARGET_FREEBSD_NR_kmq_timedsend 460\n-#define TARGET_FREEBSD_NR_kmq_notify    461\n-#define TARGET_FREEBSD_NR_kmq_unlink    462\n-#define TARGET_FREEBSD_NR_abort2        463\n-#define TARGET_FREEBSD_NR_thr_set_name  464\n-#define TARGET_FREEBSD_NR_aio_fsync     465\n-#define TARGET_FREEBSD_NR_rtprio_thread 466\n-#define TARGET_FREEBSD_NR_sctp_peeloff  471\n-#define TARGET_FREEBSD_NR_sctp_generic_sendmsg  472\n-#define TARGET_FREEBSD_NR_sctp_generic_sendmsg_iov      473\n-#define TARGET_FREEBSD_NR_sctp_generic_recvmsg  474\n-#define TARGET_FREEBSD_NR_pread 475\n-#define TARGET_FREEBSD_NR_pwrite        476\n-#define TARGET_FREEBSD_NR_mmap  477\n-#define TARGET_FREEBSD_NR_lseek 478\n-#define TARGET_FREEBSD_NR_truncate      479\n-#define TARGET_FREEBSD_NR_ftruncate     480\n-#define TARGET_FREEBSD_NR_thr_kill2     481\n-#define TARGET_FREEBSD_NR_freebsd12_shm_open    482\n-#define TARGET_FREEBSD_NR_shm_unlink    483\n-#define TARGET_FREEBSD_NR_cpuset        484\n-#define TARGET_FREEBSD_NR_cpuset_setid  485\n-#define TARGET_FREEBSD_NR_cpuset_getid  486\n-#define TARGET_FREEBSD_NR_cpuset_getaffinity    487\n-#define TARGET_FREEBSD_NR_cpuset_setaffinity    488\n-#define TARGET_FREEBSD_NR_faccessat     489\n-#define TARGET_FREEBSD_NR_fchmodat      490\n-#define TARGET_FREEBSD_NR_fchownat      491\n-#define TARGET_FREEBSD_NR_fexecve       492\n-#define TARGET_FREEBSD_NR_freebsd11_fstatat     493\n-#define TARGET_FREEBSD_NR_futimesat     494\n-#define TARGET_FREEBSD_NR_linkat        495\n-#define TARGET_FREEBSD_NR_mkdirat       496\n-#define TARGET_FREEBSD_NR_mkfifoat      497\n-#define TARGET_FREEBSD_NR_freebsd11_mknodat     498\n-#define TARGET_FREEBSD_NR_openat        499\n-#define TARGET_FREEBSD_NR_readlinkat    500\n-#define TARGET_FREEBSD_NR_renameat      501\n-#define TARGET_FREEBSD_NR_symlinkat     502\n-#define TARGET_FREEBSD_NR_unlinkat      503\n-#define TARGET_FREEBSD_NR_posix_openpt  504\n-#define TARGET_FREEBSD_NR_gssd_syscall  505\n-#define TARGET_FREEBSD_NR_jail_get      506\n-#define TARGET_FREEBSD_NR_jail_set      507\n-#define TARGET_FREEBSD_NR_jail_remove   508\n-#define TARGET_FREEBSD_NR_freebsd12_closefrom   509\n-#define TARGET_FREEBSD_NR___semctl      510\n-#define TARGET_FREEBSD_NR_msgctl        511\n-#define TARGET_FREEBSD_NR_shmctl        512\n-#define TARGET_FREEBSD_NR_lpathconf     513\n-                                /* 514 is obsolete cap_new */\n-#define TARGET_FREEBSD_NR___cap_rights_get      515\n-#define TARGET_FREEBSD_NR_cap_enter     516\n-#define TARGET_FREEBSD_NR_cap_getmode   517\n-#define TARGET_FREEBSD_NR_pdfork        518\n-#define TARGET_FREEBSD_NR_pdkill        519\n-#define TARGET_FREEBSD_NR_pdgetpid      520\n-#define TARGET_FREEBSD_NR_pselect       522\n-#define TARGET_FREEBSD_NR_getloginclass 523\n-#define TARGET_FREEBSD_NR_setloginclass 524\n-#define TARGET_FREEBSD_NR_rctl_get_racct        525\n-#define TARGET_FREEBSD_NR_rctl_get_rules        526\n-#define TARGET_FREEBSD_NR_rctl_get_limits       527\n-#define TARGET_FREEBSD_NR_rctl_add_rule 528\n-#define TARGET_FREEBSD_NR_rctl_remove_rule      529\n-#define TARGET_FREEBSD_NR_posix_fallocate       530\n-#define TARGET_FREEBSD_NR_posix_fadvise 531\n-#define TARGET_FREEBSD_NR_wait6 532\n-#define TARGET_FREEBSD_NR_cap_rights_limit      533\n-#define TARGET_FREEBSD_NR_cap_ioctls_limit      534\n-#define TARGET_FREEBSD_NR_cap_ioctls_get        535\n-#define TARGET_FREEBSD_NR_cap_fcntls_limit      536\n-#define TARGET_FREEBSD_NR_cap_fcntls_get        537\n-#define TARGET_FREEBSD_NR_bindat        538\n-#define TARGET_FREEBSD_NR_connectat     539\n-#define TARGET_FREEBSD_NR_chflagsat     540\n-#define TARGET_FREEBSD_NR_accept4       541\n-#define TARGET_FREEBSD_NR_pipe2 542\n-#define TARGET_FREEBSD_NR_aio_mlock     543\n-#define TARGET_FREEBSD_NR_procctl       544\n-#define TARGET_FREEBSD_NR_ppoll 545\n-#define TARGET_FREEBSD_NR_futimens      546\n-#define TARGET_FREEBSD_NR_utimensat     547\n-                                /* 548 is obsolete numa_getaffinity */\n-                                /* 549 is obsolete numa_setaffinity */\n-#define TARGET_FREEBSD_NR_fdatasync     550\n-#define TARGET_FREEBSD_NR_fstat 551\n-#define TARGET_FREEBSD_NR_fstatat       552\n-#define TARGET_FREEBSD_NR_fhstat        553\n-#define TARGET_FREEBSD_NR_getdirentries 554\n-#define TARGET_FREEBSD_NR_statfs        555\n-#define TARGET_FREEBSD_NR_fstatfs       556\n-#define TARGET_FREEBSD_NR_getfsstat     557\n-#define TARGET_FREEBSD_NR_fhstatfs      558\n-#define TARGET_FREEBSD_NR_mknodat       559\n-#define TARGET_FREEBSD_NR_kevent        560\n-#define TARGET_FREEBSD_NR_cpuset_getdomain      561\n-#define TARGET_FREEBSD_NR_cpuset_setdomain      562\n-#define TARGET_FREEBSD_NR_getrandom     563\n-#define TARGET_FREEBSD_NR_getfhat       564\n-#define TARGET_FREEBSD_NR_fhlink        565\n-#define TARGET_FREEBSD_NR_fhlinkat      566\n-#define TARGET_FREEBSD_NR_fhreadlink    567\n-#define TARGET_FREEBSD_NR_funlinkat     568\n-#define TARGET_FREEBSD_NR_copy_file_range       569\n-#define TARGET_FREEBSD_NR___sysctlbyname        570\n-#define TARGET_FREEBSD_NR_shm_open2     571\n-#define TARGET_FREEBSD_NR_shm_rename    572\n-#define TARGET_FREEBSD_NR_sigfastblock  573\n-#define TARGET_FREEBSD_NR___realpathat  574\n-#define TARGET_FREEBSD_NR_close_range   575\n-#define TARGET_FREEBSD_NR_rpctls_syscall        576\n-#define TARGET_FREEBSD_NR_MAXSYSCALL    577\ndiff --git a/bsd-user/syscall_defs.h b/bsd-user/syscall_defs.h\nindex 4dbd90c2f1..30b0270faa 100644\n--- a/bsd-user/syscall_defs.h\n+++ b/bsd-user/syscall_defs.h\n@@ -25,29 +25,13 @@\n \n #include \"errno_defs.h\"\n \n-#include \"freebsd/syscall_nr.h\"\n+#include \"os-syscalls.h\"\n \n /*\n  * machine/_types.h\n  * or x86/_types.h\n  */\n \n-/*\n- * time_t seems to be very inconsistly defined for the different *BSD's...\n- *\n- * FreeBSD uses a 64bits time_t except on i386\n- * so we have to add a special case here.\n- *\n- * On NetBSD time_t is always defined as an int64_t.  On OpenBSD time_t\n- * is always defined as an int.\n- *\n- */\n-#if (!defined(TARGET_I386))\n-typedef int64_t target_time_t;\n-#else\n-typedef int32_t target_time_t;\n-#endif\n-\n struct target_iovec {\n     abi_long iov_base;   /* Starting address */\n     abi_long iov_len;   /* Number of bytes */\n","prefixes":["5/5"]}