CVS commit: src/lib/libm/src
Module Name:src
Committed By: kre
Date: Wed Apr 3 04:40:23 UTC 2024
Modified Files:
src/lib/libm/src: math_private.h
Log Message:
For i386, if ft[sg]etprec() are to be used, ensure there's a
prototype for them in scope (so include )
Might fix the i386 build.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libm/src/math_private.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/math_private.h
diff -u src/lib/libm/src/math_private.h:1.31 src/lib/libm/src/math_private.h:1.32
--- src/lib/libm/src/math_private.h:1.31 Tue Jan 23 15:45:07 2024
+++ src/lib/libm/src/math_private.h Wed Apr 3 04:40:23 2024
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $NetBSD: math_private.h,v 1.31 2024/01/23 15:45:07 christos Exp $
+ * $NetBSD: math_private.h,v 1.32 2024/04/03 04:40:23 kre Exp $
*/
#ifndef _MATH_PRIVATE_H_
@@ -348,6 +348,9 @@ do {\
/* Support switching the mode to FP_PE if necessary. */
#if defined(__i386__) && !defined(NO_FPSETPREC)
+
+#include
+
#define ENTERI() ENTERIT(long double)
#define ENTERIT(returntype) \
returntype __retval; \
CVS commit: src/lib/libm/src
Module Name:src Committed By: kre Date: Wed Apr 3 04:40:23 UTC 2024 Modified Files: src/lib/libm/src: math_private.h Log Message: For i386, if ft[sg]etprec() are to be used, ensure there's a prototype for them in scope (so include ) Might fix the i386 build. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libm/src/math_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/pci
Module Name:src Committed By: thorpej Date: Wed Apr 3 04:30:30 UTC 2024 Modified Files: src/sys/arch/alpha/pci: irongate_pci.c Log Message: Add a missing barrier in irongate_conf_read0(). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/pci/irongate_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/pci
Module Name:src Committed By: thorpej Date: Wed Apr 3 04:30:30 UTC 2024 Modified Files: src/sys/arch/alpha/pci: irongate_pci.c Log Message: Add a missing barrier in irongate_conf_read0(). To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/alpha/pci/irongate_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/pci/irongate_pci.c diff -u src/sys/arch/alpha/pci/irongate_pci.c:1.12 src/sys/arch/alpha/pci/irongate_pci.c:1.13 --- src/sys/arch/alpha/pci/irongate_pci.c:1.12 Fri Jun 25 03:45:59 2021 +++ src/sys/arch/alpha/pci/irongate_pci.c Wed Apr 3 04:30:30 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: irongate_pci.c,v 1.12 2021/06/25 03:45:59 thorpej Exp $ */ +/* $NetBSD: irongate_pci.c,v 1.13 2024/04/03 04:30:30 thorpej Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.12 2021/06/25 03:45:59 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.13 2024/04/03 04:30:30 thorpej Exp $"); #include #include @@ -106,6 +106,7 @@ irongate_conf_read0(void *ipv, pcitag_t REGVAL(PCI_CONF_ADDR) = (CONFADDR_ENABLE | tag | (offset & 0xff)); alpha_mb(); data = REGVAL(PCI_CONF_DATA); + alpha_mb(); REGVAL(PCI_CONF_ADDR) = 0; alpha_mb(); PCI_CONF_UNLOCK(s);
CVS commit: src/sbin/mount
Module Name:src Committed By: charlotte Date: Wed Apr 3 03:54:53 UTC 2024 Modified Files: src/sbin/mount: mount.8 Log Message: mount(8): Mention the ability to refer to dk(4) wedges in the manpage To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.90 src/sbin/mount/mount.8:1.91 --- src/sbin/mount/mount.8:1.90 Sun Jul 10 18:52:34 2022 +++ src/sbin/mount/mount.8 Wed Apr 3 03:54:53 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount.8,v 1.90 2022/07/10 18:52:34 snj Exp $ +.\" $NetBSD: mount.8,v 1.91 2024/04/03 03:54:53 charlotte Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" -.Dd July 10, 2022 +.Dd April 2, 2024 .Dt MOUNT 8 .Os .Sh NAME @@ -137,7 +137,13 @@ or at sign .Pq Ql \&@ , then the .Li nfs -type is inferred. +type is inferred. Otherwise, a +.Xr dk 4 +wedge may be referred to by its name with a +.Ar special +argument of the form +.Dq NAME= . +.Pp In .Nx , the file system mounting policy is dictated by the running security models.
CVS commit: src/sbin/mount
Module Name:src Committed By: charlotte Date: Wed Apr 3 03:54:53 UTC 2024 Modified Files: src/sbin/mount: mount.8 Log Message: mount(8): Mention the ability to refer to dk(4) wedges in the manpage To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src Committed By: christos Date: Wed Apr 3 01:52:28 UTC 2024 Modified Files: src/tests/lib/libm: t_cbrt.c Log Message: fix the cbrtl/powl test To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_cbrt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: christos
Date: Wed Apr 3 01:52:28 UTC 2024
Modified Files:
src/tests/lib/libm: t_cbrt.c
Log Message:
fix the cbrtl/powl test
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libm/t_cbrt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libm/t_cbrt.c
diff -u src/tests/lib/libm/t_cbrt.c:1.5 src/tests/lib/libm/t_cbrt.c:1.6
--- src/tests/lib/libm/t_cbrt.c:1.5 Thu Nov 15 00:14:20 2018
+++ src/tests/lib/libm/t_cbrt.c Tue Apr 2 21:52:28 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cbrt.c,v 1.5 2018/11/15 05:14:20 riastradh Exp $ */
+/* $NetBSD: t_cbrt.c,v 1.6 2024/04/03 01:52:28 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_cbrt.c,v 1.5 2018/11/15 05:14:20 riastradh Exp $");
+__RCSID("$NetBSD: t_cbrt.c,v 1.6 2024/04/03 01:52:28 christos Exp $");
#include
#include
@@ -285,12 +285,9 @@ ATF_TC_BODY(cbrtl_powl, tc)
const long double eps = 2*LDBL_EPSILON;
size_t i;
-#if LDBL_MANT_DIG > DBL_MANT_DIG
- atf_tc_expect_fail("powl not yet implemented with full precision");
-#endif
for (i = 0; i < __arraycount(x); i++) {
long double x_cbrt = cbrtl(x[i]);
- long double x_pow13 = powl(x[i], 1.0 / 3.0);
+ long double x_pow13 = powl(x[i], 1.0L / 3.0L);
bool ok;
if (x[i] == 0) {
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Wed Apr 3 01:51:02 UTC 2024
Modified Files:
src/lib/libm/src: s_cbrtl.c
Log Message:
reduce diff with FreeBSD
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_cbrtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_cbrtl.c
diff -u src/lib/libm/src/s_cbrtl.c:1.1 src/lib/libm/src/s_cbrtl.c:1.2
--- src/lib/libm/src/s_cbrtl.c:1.1 Tue Nov 19 14:24:34 2013
+++ src/lib/libm/src/s_cbrtl.c Tue Apr 2 21:51:01 2024
@@ -13,12 +13,9 @@
* written by Steven G. Kargl with input from Bruce D. Evans
* and David A. Schultz.
*/
-
#include
-__RCSID("$NetBSD: s_cbrtl.c,v 1.1 2013/11/19 19:24:34 joerg Exp $");
-#if 0
-__FBSDID("$FreeBSD: head/lib/msun/src/s_cbrtl.c 238924 2012-07-30 21:58:28Z kargl $");
-#endif
+__RCSID("$NetBSD: s_cbrtl.c,v 1.2 2024/04/03 01:51:01 christos Exp $");
+
#include "namespace.h"
#include
@@ -30,44 +27,48 @@ __FBSDID("$FreeBSD: head/lib/msun/src/s_
#ifdef __HAVE_LONG_DOUBLE
__weak_alias(cbrtl, _cbrtl)
+#define BIAS (LDBL_MAX_EXP - 1)
+
static const unsigned
B1 = 709958130; /* B1 = (127-127.0/3-0.03306235651)*2**23 */
long double
cbrtl(long double x)
{
- union ieee_ext_u ux, vx;
+ union ieee_ext_u u, v;
long double r, s, t, w;
double dr, dt, dx;
float ft, fx;
uint32_t hx;
+ uint16_t expsign;
int k;
- ux.extu_ld = x;
-
+ u.extu_ld = x;
+ expsign = GET_EXPSIGN();
+ k = expsign & 0x7fff;
/*
* If x = +-Inf, then cbrt(x) = +-Inf.
* If x = NaN, then cbrt(x) = NaN.
*/
- if (ux.extu_exp == EXT_EXP_INFNAN)
+ if (k == BIAS + LDBL_MAX_EXP)
return (x + x);
- if ((ux.extu_frach | ux.extu_fracl | ux.extu_exp) == 0)
- return (x);
- vx.extu_ld = 1;
- vx.extu_ext.ext_sign = ux.extu_ext.ext_sign;
- ux.extu_ext.ext_sign = 0;
- if (ux.extu_exp == 0) {
+ ENTERI();
+ if (k == 0) {
+ /* If x = +-0, then cbrt(x) = +-0. */
+ if ((u.extu_frach | u.extu_fracl) == 0)
+ RETURNI(x);
/* Adjust subnormal numbers. */
- ux.extu_ld *= 0x1.0p514;
- k = ux.extu_exp - EXT_EXP_BIAS - 514;
- } else {
- k = ux.extu_exp - EXT_EXP_BIAS;
- }
+ u.extu_ld *= 0x1.0p514;
+ k = u.extu_exp;
+ k -= BIAS + 514;
+ } else
+ k -= BIAS;
+ SET_EXPSIGN(, BIAS);
+ v.extu_ld = 1;
- ux.extu_exp = EXT_EXP_BIAS;
- x = ux.extu_ld;
+ x = u.extu_ld;
switch (k % 3) {
case 1:
case -2:
@@ -80,7 +81,7 @@ cbrtl(long double x)
k -= 2;
break;
}
- vx.extu_exp = EXT_EXP_BIAS + k / 3;
+ SET_EXPSIGN(, (expsign & 0x8000) | (BIAS + k / 3));
/*
* The following is the guts of s_cbrtf, with the handling of
@@ -136,10 +137,9 @@ cbrtl(long double x)
r=x/s;/* error <= 0.5 ulps; |r| < |t| */
w=t+t;/* t+t is exact */
r=(r-t)/(w+r); /* r-t is exact; w+r ~= 3*t */
- t=t+t*r; /* error <= 0.5 + 0.5/3 + epsilon */
+ t=t+t*r; /* error <= (0.5 + 0.5/3) * ulp */
- t *= vx.extu_ld;
- return t;
+ t *= v.extu_ld;
+ RETURNI(t);
}
-
#endif /* __HAVE_LONG_DOUBLE */
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Wed Apr 3 01:51:02 UTC 2024 Modified Files: src/lib/libm/src: s_cbrtl.c Log Message: reduce diff with FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_cbrtl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: gutteridge Date: Wed Apr 3 01:13:41 UTC 2024 Modified Files: src/sys/dev/pci: if_iwn.c Log Message: if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien@gmail.com, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_iwn.c diff -u src/sys/dev/pci/if_iwn.c:1.99 src/sys/dev/pci/if_iwn.c:1.100 --- src/sys/dev/pci/if_iwn.c:1.99 Mon Apr 25 02:29:14 2022 +++ src/sys/dev/pci/if_iwn.c Wed Apr 3 01:13:41 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.99 2022/04/25 02:29:14 gutteridge Exp $ */ +/* $NetBSD: if_iwn.c,v 1.100 2024/04/03 01:13:41 gutteridge Exp $ */ /* $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $ */ /*- @@ -22,7 +22,7 @@ * adapters. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.99 2022/04/25 02:29:14 gutteridge Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.100 2024/04/03 01:13:41 gutteridge Exp $"); #define IWN_USE_RBUF /* Use local storage for RX */ #undef IWN_HWCRYPTO /* XXX does not even compile yet */ @@ -846,6 +846,8 @@ iwn5000_attach(struct iwn_softc *sc, pci /* Type 6030 cards return IWN_HW_REV_TYPE_6005 */ if (pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_1 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_1030_2 || + pid == PCI_PRODUCT_INTEL_WIFI_LINK_130_1 || + pid == PCI_PRODUCT_INTEL_WIFI_LINK_130_2 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_1 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6230_2 || pid == PCI_PRODUCT_INTEL_WIFI_LINK_6235 ||
CVS commit: src/sys/dev/pci
Module Name:src Committed By: gutteridge Date: Wed Apr 3 01:13:41 UTC 2024 Modified Files: src/sys/dev/pci: if_iwn.c Log Message: if_iwn.c: pick up proper firmware for Centrino Wireless-N 130 Both variants should use iwlwifi-6000g2b-6 not iwlwifi-6000g2a-6. (It seems only two specific product variants use iwlwifi-6000g2a-6. We could simplify by reversing the sense of the test, as OpenBSD does, but it doesn't seem to matter much, as what we now match seems to be the full gamut possible, so the simpler diff was chosen here.) Addresses PR kern/58105 from wandrien@gmail.com, with the PCI_PRODUCT_INTEL_WIFI_LINK_130_1 match tested by the reporter. Code inspection of the FreeBSD driver indicates we should safely be able to match PCI_PRODUCT_INTEL_WIFI_LINK_130_2 also. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Wed Apr 3 00:40:46 UTC 2024 Modified Files: src/share/man/man4: dk.4 Log Message: dk(4): touch up markup, sort options To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/dk.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src
Committed By: uwe
Date: Wed Apr 3 00:40:46 UTC 2024
Modified Files:
src/share/man/man4: dk.4
Log Message:
dk(4): touch up markup, sort options
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/dk.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/dk.4
diff -u src/share/man/man4/dk.4:1.14 src/share/man/man4/dk.4:1.15
--- src/share/man/man4/dk.4:1.14 Tue Apr 2 23:46:19 2024
+++ src/share/man/man4/dk.4 Wed Apr 3 00:40:46 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: dk.4,v 1.14 2024/04/02 23:46:19 charlotte Exp $
+.\" $NetBSD: dk.4,v 1.15 2024/04/03 00:40:46 uwe Exp $
.\"
.\" Copyright (c) 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -39,11 +39,11 @@
driver
.Sh SYNOPSIS
.Cd "options DKWEDGE_AUTODISCOVER"
+.Cd "options DKWEDGE_METHOD_APPLE"
.Cd "options DKWEDGE_METHOD_BSDLABEL"
.Cd "options DKWEDGE_METHOD_GPT"
.Cd "options DKWEDGE_METHOD_MBR"
.Cd "options DKWEDGE_METHOD_RDB"
-.Cd "options DKWEDGE_METHOD_APPLE"
.Cd "options DKWEDGE_METHOD_TOS"
.Sh DESCRIPTION
The
@@ -59,79 +59,107 @@ Wedges need to have unique names.
If a duplicate name is detected during
auto-discovery, that partition is ignored.
.Sh KERNEL OPTIONS
-.Bl -tag -width DKWEDGE_METHOD_BSDLABEL
+.Bl -tag -width Dv
+.\"
.It Dv DKWEDGE_AUTODISCOVER
Automatically detect and configure wedges using any available methods.
+For each partition found, a wedge with a corresponding name is created.
.Pp
Currently only
.Dv DKWEDGE_METHOD_GPT
and
.Dv DKWEDGE_METHOD_APPLE
are enabled by default.
-.Pp
-For each partition found, a wedge with a corresponding name is created.
+.\"
+.It Dv DKWEDGE_METHOD_APPLE
+Apple partition map detection method.
+.\"
.It Dv DKWEDGE_METHOD_BSDLABEL
-BSD disklabel detection method.
+.Tn BSD
+disklabel detection method.
For each configured partition in the
.Xr disklabel 5
that is not of type
.Dv FS_UNUSED ,
a wedge is created and named after the
-.Va d_packname
+.Fa d_packname
field followed by
-.Sq \&/
+.Ql \&/
and the partition letter
-.So a Sc Ns \&.. Ns So p Sc .
+.Sm off
+.So Li a Sc \&.. So Li p Sc .
+.Sm on
.Pp
When the
-.Va d_packname
+.Fa d_packname
is empty or has the value
-.Dq fictitious ,
+.Ql fictitious ,
the regular partition names
are used as wedge names, i.e. the device name, unit number and
partition letter, for example
-.Dq wd0a .
+.Ql wd0a .
+.\"
.It Dv DKWEDGE_METHOD_GPT
Extensible Firmware Interface Globally Unique Identifier Partition Table
-(GPT) detection method.
+.Tn ( GPT )
+detection method.
.Pp
For every GPT partition a wedge is created and named after the
partition label.
-GPT partitions are UTF-16-encoded, this is converted into UTF-8.
+GPT partitions are UTF-16\(enencoded, this is converted into UTF-8.
If a partition has no label, its UUID is used instead.
+.\"
.It Dv DKWEDGE_METHOD_MBR
-IBM PC-compatible Master Boot Record (MBR) partitioning detection method,
-with support for Extended MBRs.
+IBM PC-compatible Master Boot Record
+.Tn ( MBR )
+partitioning detection method, with support for Extended MBRs.
.Pp
For every partition in the MBR a wedge is created and named like a
regular partition name, i.e. the device name, unit number and a
partition letter, for example
-.Dq wd0e .
+.Ql wd0e .
Primary partitions start with
-.Sq e ,
+.Ql e ,
extended partitions start with
-.Sq i .
+.Ql i .
+.\"
.It Dv DKWEDGE_METHOD_RDB
-Amiga Rigid Disk Block (RDB) partitioning detection method.
-.It Dv DKWEDGE_METHOD_APPLE
-Apple partition map detection method.
+Amiga Rigid Disk Block
+.Tn ( RDB )
+partitioning detection method.
+.\"
.It Dv DKWEDGE_METHOD_TOS
-Atari's TOS partition map detection method.
+Atari's
+.Tn TOS
+partition map detection method.
.Pp
For each partition, a wedge is created with a name of the format
-.Dq ATARI_{TYPE}_{NUMBER}
-where TYPE may either be
-.Dq GEM
+.Sm off
+.Li ATARI_ Bro Ar type Brc Li _ Bro Ar number Brc
+.Sm on
+where
+.Ar type
+may either be
+.Ql GEM
or
-.Dq BGM .
-The first partition typically corresponds to the C: drive when read on an
-actual Atari, the second to D: and so on. Extended partitions (those of type
-.Dq XGM )
+.Ql BGM .
+The first partition typically corresponds to the
+.Ql C:
+drive when read on an actual Atari, the second to
+.Ql D:
+and so on.
+Extended partitions
+.Pq those of type Ql XGM
are not currently supported.
.El
.Sh FILES
-.Bl -tag -width /dev/XXrXdkX -compact
-.It Pa /dev/{,r}dk*
+.Bl -tag -width Pa -compact
+.It Pa /dev/dk*
+Block mode
+.Nm
+device special files.
+.It Pa /dev/rdk*
+Raw mode
.Nm
device special files.
.El
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Wed Apr 3 00:38:36 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
fix format.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/bsd/ntp/lib/libntp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.28 src/external/bsd/ntp/lib/libntp/Makefile:1.29
--- src/external/bsd/ntp/lib/libntp/Makefile:1.28 Tue Apr 2 10:19:02 2024
+++ src/external/bsd/ntp/lib/libntp/Makefile Tue Apr 2 20:38:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2024/04/02 14:19:02 christos Exp $
+# $NetBSD: Makefile,v 1.29 2024/04/03 00:38:36 christos Exp $
LIBISPRIVATE=yes
@@ -89,8 +89,8 @@ CPPFLAGS+= -I${IDIST}/sntp/libopts
# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
.if ${MKREPRO:Uno} == "yes"
IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
-MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%F"
-MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%T"
+MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%F"
+MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "+%T"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src Committed By: christos Date: Wed Apr 3 00:38:36 UTC 2024 Modified Files: src/external/bsd/ntp/lib/libntp: Makefile Log Message: fix format. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/external/bsd/ntp/lib/libntp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src
Committed By: charlotte
Date: Tue Apr 2 23:46:20 UTC 2024
Modified Files:
src/share/man/man4: dk.4
Log Message:
dk.4: Document DKWEDGE_METHOD_TOS
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/dk.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/dk.4
diff -u src/share/man/man4/dk.4:1.13 src/share/man/man4/dk.4:1.14
--- src/share/man/man4/dk.4:1.13 Wed Jan 6 18:05:58 2021
+++ src/share/man/man4/dk.4 Tue Apr 2 23:46:19 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: dk.4,v 1.13 2021/01/06 18:05:58 wiz Exp $
+.\" $NetBSD: dk.4,v 1.14 2024/04/02 23:46:19 charlotte Exp $
.\"
.\" Copyright (c) 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" Jonathan A. Kollasch used vnd(4) as the template for this man page.
.\"
-.Dd January 6, 2021
+.Dd April 2, 2024
.Dt DK 4
.Os
.Sh NAME
@@ -44,6 +44,7 @@ driver
.Cd "options DKWEDGE_METHOD_MBR"
.Cd "options DKWEDGE_METHOD_RDB"
.Cd "options DKWEDGE_METHOD_APPLE"
+.Cd "options DKWEDGE_METHOD_TOS"
.Sh DESCRIPTION
The
.Nm
@@ -114,6 +115,19 @@ extended partitions start with
Amiga Rigid Disk Block (RDB) partitioning detection method.
.It Dv DKWEDGE_METHOD_APPLE
Apple partition map detection method.
+.It Dv DKWEDGE_METHOD_TOS
+Atari's TOS partition map detection method.
+.Pp
+For each partition, a wedge is created with a name of the format
+.Dq ATARI_{TYPE}_{NUMBER}
+where TYPE may either be
+.Dq GEM
+or
+.Dq BGM .
+The first partition typically corresponds to the C: drive when read on an
+actual Atari, the second to D: and so on. Extended partitions (those of type
+.Dq XGM )
+are not currently supported.
.El
.Sh FILES
.Bl -tag -width /dev/XXrXdkX -compact
CVS commit: src/share/man/man4
Module Name:src Committed By: charlotte Date: Tue Apr 2 23:46:20 UTC 2024 Modified Files: src/share/man/man4: dk.4 Log Message: dk.4: Document DKWEDGE_METHOD_TOS To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/dk.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:56:51 UTC 2024 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/macppc/conf: GENERIC GENERIC_601 POWERMAC_G5 src/sys/arch/ofppc/conf: GENERIC src/sys/arch/riscv/conf: GENERIC.common src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Mention DKWEDGE_METHOD_TOS in several kernel config files To generate a diff of this commit: cvs rdiff -u -r1.609 -r1.610 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.202 -r1.203 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.1253 -r1.1254 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.379 -r1.380 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.180 -r1.181 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/conf/GENERIC.common cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.239 -r1.240 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.96 -r1.97 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.609 src/sys/arch/amd64/conf/GENERIC:1.610 --- src/sys/arch/amd64/conf/GENERIC:1.609 Mon Jan 29 18:27:10 2024 +++ src/sys/arch/amd64/conf/GENERIC Tue Apr 2 22:56:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.609 2024/01/29 18:27:10 christos Exp $ +# $NetBSD: GENERIC,v 1.610 2024/04/02 22:56:50 charlotte Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.609 $" +#ident "GENERIC-$Revision: 1.610 $" maxusers 64 # estimated number of users @@ -198,6 +198,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges #options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +#options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems include "conf/filesystems.config" Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.202 src/sys/arch/amd64/conf/XEN3_DOM0:1.203 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.202 Mon Jan 29 18:27:10 2024 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Apr 2 22:56:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.202 2024/01/29 18:27:10 christos Exp $ +# $NetBSD: XEN3_DOM0,v 1.203 2024/04/02 22:56:50 charlotte Exp $ # XEN3_DOM0 machine description file # @@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "XEN3_DOM0-$Revision: 1.202 $" +#ident "XEN3_DOM0-$Revision: 1.203 $" maxusers 32 # estimated number of users @@ -193,6 +193,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges #options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +#options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems include "conf/filesystems.config" Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.104 src/sys/arch/amd64/conf/XEN3_DOMU:1.105 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.104 Mon Jan 29 18:27:10 2024 +++ src/sys/arch/amd64/conf/XEN3_DOMU Tue Apr 2 22:56:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.104 2024/01/29 18:27:10 christos Exp $ +# $NetBSD: XEN3_DOMU,v 1.105 2024/04/02 22:56:50 charlotte Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOMU-$Revision: 1.104 $" +#ident "XEN3_DOMU-$Revision: 1.105 $" maxusers 32 # estimated number of users @@ -74,6 +74,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges #options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +#options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems include "conf/filesystems.config" Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1253 src/sys/arch/i386/conf/GENERIC:1.1254 ---
CVS commit: src/sys/arch
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:56:51 UTC 2024 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/macppc/conf: GENERIC GENERIC_601 POWERMAC_G5 src/sys/arch/ofppc/conf: GENERIC src/sys/arch/riscv/conf: GENERIC.common src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Mention DKWEDGE_METHOD_TOS in several kernel config files To generate a diff of this commit: cvs rdiff -u -r1.609 -r1.610 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.202 -r1.203 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.1253 -r1.1254 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.379 -r1.380 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.180 -r1.181 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/conf/GENERIC.common cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.239 -r1.240 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.96 -r1.97 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: riastradh
Date: Tue Apr 2 22:41:48 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: No need for MKSLJIT to be set differently from others.
- Use ?=, not =, so mk.conf setting wins.
- Write out per-architecture tabular settings, not a conditional.
- Add comments for the architectures that look like they should have
sljit but don't. (XXX Missing comments about powerpc and mips --
not sure why, is this because modules don't yet work on those
architectures, or what?)
Tidying for PR 58103: bpfjit.kmod is not built on aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.1365 -r1.1366 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1365 src/share/mk/bsd.own.mk:1.1366
--- src/share/mk/bsd.own.mk:1.1365 Tue Apr 2 22:37:34 2024
+++ src/share/mk/bsd.own.mk Tue Apr 2 22:41:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1365 2024/04/02 22:37:34 riastradh Exp $
+# $NetBSD: bsd.own.mk,v 1.1366 2024/04/02 22:41:48 riastradh Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1336,6 +1336,21 @@ MKLLVMRT.i386= yes
MKLLVMRT.aarch64= yes
.endif
+# Just-in-time compiler for bpf, npf acceleration
+MKSLJIT.aarch64= yes
+MKSLJIT.i386= yes
+MKSLJIT.sparc= yes
+#MKSLJIT.sparc64= yes # not suppored in sljit (yet?)
+MKSLJIT.x86_64= yes
+#MKSLJIT.powerpc= yes # XXX
+#MKSLJIT.powerpc64= yes # XXX
+#MKSLJIT.mipsel= yes # XXX
+#MKSLJIT.mipseb= yes # XXX
+#MKSLJIT.mips64el= yes # XXX
+#MKSLJIT.mips64eb= yes # XXX
+#MKSLJIT.riscv32= yes # not until we update sljit
+#MKSLJIT.riscv64= yes # not until we update sljit
+
# compat with old names
MKDEBUGKERNEL?=${MKKDEBUG:Uno}
MKDEBUGTOOLS?=${MKTOOLSDEBUG:Uno}
@@ -1391,13 +1406,6 @@ _MKVARS.no= \
${var}?= ${${var}.${MACHINE_ARCH}:U${${var}.${MACHINE}:Uno}}
.endfor
-.if ${MACHINE_ARCH} == "aarch64" || \
-${MACHINE_ARCH} == "i386"|| \
-${MACHINE_ARCH} == "sparc" || \
-${MACHINE_ARCH} == "x86_64"
-MKSLJIT= yes
-.endif
-
#
# Which platforms build the xorg-server drivers (as opposed
# to just Xnest and Xvfb.)
CVS commit: src/share/mk
Module Name:src Committed By: riastradh Date: Tue Apr 2 22:41:48 UTC 2024 Modified Files: src/share/mk: bsd.own.mk Log Message: bsd.own.mk: No need for MKSLJIT to be set differently from others. - Use ?=, not =, so mk.conf setting wins. - Write out per-architecture tabular settings, not a conditional. - Add comments for the architectures that look like they should have sljit but don't. (XXX Missing comments about powerpc and mips -- not sure why, is this because modules don't yet work on those architectures, or what?) Tidying for PR 58103: bpfjit.kmod is not built on aarch64. To generate a diff of this commit: cvs rdiff -u -r1.1365 -r1.1366 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Tue Apr 2 22:37:34 UTC 2024
Modified Files:
src/share/mk: bsd.own.mk
src/sys/arch/aarch64/include: sljit_machdep.h
src/sys/modules: Makefile
Log Message:
bsd.own.mk: Enable MKLSJIT on aarch64.
Make sure there's only one copy of the conditional, in bsd.own.mk;
just make sys/modules/Makefile conditional on MKSLJIT so we don't
have to keep these in sync.
As a workaround for PR 58106, tweak the conditional definition of
SLJIT_CACHE_FLUSH to use cpu_icache_sync_range only in _HARDKERNEL,
and use __builtin___clear_cache in userland and in rump kernels.
PR 58103: bpfjit.kmod is not built on aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.1364 -r1.1365 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/include/sljit_machdep.h
cvs rdiff -u -r1.284 -r1.285 src/sys/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1364 src/share/mk/bsd.own.mk:1.1365
--- src/share/mk/bsd.own.mk:1.1364 Mon Apr 1 22:23:14 2024
+++ src/share/mk/bsd.own.mk Tue Apr 2 22:37:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1364 2024/04/01 22:23:14 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1365 2024/04/02 22:37:34 riastradh Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1391,9 +1391,10 @@ _MKVARS.no= \
${var}?= ${${var}.${MACHINE_ARCH}:U${${var}.${MACHINE}:Uno}}
.endfor
-.if ${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "x86_64" || \
-${MACHINE_ARCH} == "sparc"
+.if ${MACHINE_ARCH} == "aarch64" || \
+${MACHINE_ARCH} == "i386"|| \
+${MACHINE_ARCH} == "sparc" || \
+${MACHINE_ARCH} == "x86_64"
MKSLJIT= yes
.endif
Index: src/sys/arch/aarch64/include/sljit_machdep.h
diff -u src/sys/arch/aarch64/include/sljit_machdep.h:1.3 src/sys/arch/aarch64/include/sljit_machdep.h:1.4
--- src/sys/arch/aarch64/include/sljit_machdep.h:1.3 Fri Dec 11 18:03:33 2020
+++ src/sys/arch/aarch64/include/sljit_machdep.h Tue Apr 2 22:37:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sljit_machdep.h,v 1.3 2020/12/11 18:03:33 skrll Exp $ */
+/* $NetBSD: sljit_machdep.h,v 1.4 2024/04/02 22:37:34 riastradh Exp $ */
/*-
* Copyright (c) 2014 Alexander Nasonov.
@@ -43,7 +43,12 @@
#define SLJIT_CONFIG_ARM_64 1
-#ifdef _KERNEL
+#ifdef _HARDKERNEL
+/*
+ * XXX Currently sys/rump/include/machine/cpu.h doesn't have
+ * ci_cpufuncs for cpu_icache_sync_range, so we do this only for
+ * non-rump kernels for now.
+ */
#define SLJIT_CACHE_FLUSH(from, to) \
cpu_icache_sync_range((vaddr_t)(from), (vsize_t)((to) - (from)))
#else
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.284 src/sys/modules/Makefile:1.285
--- src/sys/modules/Makefile:1.284 Thu Mar 21 02:36:02 2024
+++ src/sys/modules/Makefile Tue Apr 2 22:37:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.284 2024/03/21 02:36:02 riastradh Exp $
+# $NetBSD: Makefile,v 1.285 2024/04/02 22:37:34 riastradh Exp $
.include
@@ -261,15 +261,9 @@ SUBDIR+= ubsec
.endif
.if ${MKSLJIT} != "no"
-# No modules for 32-bit arm, mips and powerpc yet.
-.if ${MACHINE_ARCH} == "aarch64" || \
-${MACHINE_ARCH} == "i386"|| \
-${MACHINE_ARCH} == "sparc" || \
-${MACHINE_ARCH} == "x86_64"
SUBDIR+= bpfjit
SUBDIR+= sljit
.endif
-.endif
#
# ACPI modules
CVS commit: src
Module Name:src Committed By: riastradh Date: Tue Apr 2 22:37:34 UTC 2024 Modified Files: src/share/mk: bsd.own.mk src/sys/arch/aarch64/include: sljit_machdep.h src/sys/modules: Makefile Log Message: bsd.own.mk: Enable MKLSJIT on aarch64. Make sure there's only one copy of the conditional, in bsd.own.mk; just make sys/modules/Makefile conditional on MKSLJIT so we don't have to keep these in sync. As a workaround for PR 58106, tweak the conditional definition of SLJIT_CACHE_FLUSH to use cpu_icache_sync_range only in _HARDKERNEL, and use __builtin___clear_cache in userland and in rump kernels. PR 58103: bpfjit.kmod is not built on aarch64 To generate a diff of this commit: cvs rdiff -u -r1.1364 -r1.1365 src/share/mk/bsd.own.mk cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/include/sljit_machdep.h cvs rdiff -u -r1.284 -r1.285 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:30:04 UTC 2024 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/conf: files src/sys/dev: files.dev Added Files: src/sys/dev/dkwedge: dkwedge_tos.c Log Message: dk(4): Add support for discovering Atari TOS partitions as wedges Any partitioning scheme which conforms to the Atari AHDI 3.00 spec should be recognized by the new DKWEDGE_METHOD_TOS. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.517 -r1.518 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1311 -r1.1312 src/sys/conf/files cvs rdiff -u -r1.9 -r1.10 src/sys/dev/files.dev cvs rdiff -u -r0 -r1.1 src/sys/dev/dkwedge/dkwedge_tos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:30:04 UTC 2024 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/conf: files src/sys/dev: files.dev Added Files: src/sys/dev/dkwedge: dkwedge_tos.c Log Message: dk(4): Add support for discovering Atari TOS partitions as wedges Any partitioning scheme which conforms to the Atari AHDI 3.00 spec should be recognized by the new DKWEDGE_METHOD_TOS. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.517 -r1.518 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1311 -r1.1312 src/sys/conf/files cvs rdiff -u -r1.9 -r1.10 src/sys/dev/files.dev cvs rdiff -u -r0 -r1.1 src/sys/dev/dkwedge/dkwedge_tos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.186 src/sys/arch/amd64/conf/ALL:1.187 --- src/sys/arch/amd64/conf/ALL:1.186 Thu Mar 21 02:36:01 2024 +++ src/sys/arch/amd64/conf/ALL Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.186 2024/03/21 02:36:01 riastradh Exp $ +# $NetBSD: ALL,v 1.187 2024/04/02 22:30:03 charlotte Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.186 $" +#ident "ALL-$Revision: 1.187 $" maxusers 64 # estimated number of users @@ -164,6 +164,7 @@ options DKWEDGE_METHOD_BSDLABEL # Suppo options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems file-system FFS # UFS Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.517 src/sys/arch/i386/conf/ALL:1.518 --- src/sys/arch/i386/conf/ALL:1.517 Thu Mar 21 02:36:01 2024 +++ src/sys/arch/i386/conf/ALL Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.517 2024/03/21 02:36:01 riastradh Exp $ +# $NetBSD: ALL,v 1.518 2024/04/02 22:30:03 charlotte Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.517 $" +#ident "ALL-$Revision: 1.518 $" maxusers 64 # estimated number of users @@ -151,6 +151,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems file-system FFS # UFS Index: src/sys/conf/files diff -u src/sys/conf/files:1.1311 src/sys/conf/files:1.1312 --- src/sys/conf/files:1.1311 Fri Feb 9 22:08:34 2024 +++ src/sys/conf/files Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1311 2024/02/09 22:08:34 andvar Exp $ +# $NetBSD: files,v 1.1312 2024/04/02 22:30:03 charlotte Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -105,6 +105,7 @@ defflag opt_dkwedge.h DKWEDGE_AUTODISCO DKWEDGE_METHOD_MBR DKWEDGE_METHOD_APPLE DKWEDGE_METHOD_RDB +DKWEDGE_METHOD_TOS defflag opt_veriexec.h VERIFIED_EXEC_FP_SHA256 VERIFIED_EXEC_FP_SHA384 Index: src/sys/dev/files.dev diff -u src/sys/dev/files.dev:1.9 src/sys/dev/files.dev:1.10 --- src/sys/dev/files.dev:1.9 Sat Jun 4 03:31:10 2022 +++ src/sys/dev/files.dev Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.dev,v 1.9 2022/06/04 03:31:10 pgoyette Exp $ +# $NetBSD: files.dev,v 1.10 2024/04/02 22:30:03 charlotte Exp $ file dev/bio.c bio needs-flag file dev/ccd.c ccd @@ -13,6 +13,7 @@ file dev/dkwedge/dkwedge_bsdlabel.c dkwe file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt file dev/dkwedge/dkwedge_mbr.c dkwedge_method_mbr file dev/dkwedge/dkwedge_rdb.c dkwedge_method_rdb +file dev/dkwedge/dkwedge_tos.c dkwedge_method_tos file dev/firmload.c firmload file dev/fss.c fss file dev/keylock.c keylock Added files: Index: src/sys/dev/dkwedge/dkwedge_tos.c diff -u /dev/null src/sys/dev/dkwedge/dkwedge_tos.c:1.1 --- /dev/null Tue Apr 2 22:30:04 2024 +++ src/sys/dev/dkwedge/dkwedge_tos.c Tue Apr 2 22:30:03 2024 @@ -0,0 +1,175 @@ +/* $NetBSD: dkwedge_tos.c,v 1.1 2024/04/02 22:30:03 charlotte Exp $ */ + +/* + * Copyright (c) 2024 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Charlotte Koch. + * + * Redistribution and use in source and binary
CVS commit: src/sys/external/bsd/sljit/dist/sljit_src
Module Name:src Committed By: riastradh Date: Tue Apr 2 22:29:57 UTC 2024 Modified Files: src/sys/external/bsd/sljit/dist/sljit_src: sljitNativeARM_64.c Log Message: sljit: Pacify -Wsign-compare. If these sizes are negative, we're probably in trouble anyway, so assert nonnegative here. Needed to resolve PR 58103. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/sljit/dist/sljit_src
Module Name:src
Committed By: riastradh
Date: Tue Apr 2 22:29:57 UTC 2024
Modified Files:
src/sys/external/bsd/sljit/dist/sljit_src: sljitNativeARM_64.c
Log Message:
sljit: Pacify -Wsign-compare.
If these sizes are negative, we're probably in trouble anyway, so
assert nonnegative here.
Needed to resolve PR 58103.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c:1.4 src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c:1.5
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c:1.4 Sun Jan 20 23:14:16 2019
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeARM_64.c Tue Apr 2 22:29:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sljitNativeARM_64.c,v 1.4 2019/01/20 23:14:16 alnsn Exp $ */
+/* $NetBSD: sljitNativeARM_64.c,v 1.5 2024/04/02 22:29:57 riastradh Exp $ */
/*
*Stack-less Just-In-Time compiler
@@ -1079,7 +1079,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
local_size = (local_size + 15) & ~0xf;
compiler->local_size = local_size;
- if (local_size <= (63 * sizeof(sljit_sw))) {
+ SLJIT_ASSERT(local_size >= 0);
+ if ((size_t)local_size <= (63 * sizeof(sljit_sw))) {
FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR)
| RN(TMP_SP) | ((-(local_size >> 3) & 0x7f) << 15)));
FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10)));
@@ -1129,7 +1130,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
SLJIT_ASSERT(prev == -1);
- if (compiler->local_size > (63 * sizeof(sljit_sw))) {
+ SLJIT_ASSERT(compiler->local_size >= 0);
+ if ((size_t)compiler->local_size > (63 * sizeof(sljit_sw))) {
/* The local_size is already adjusted by the saved registers. */
if (local_size > 0xfff) {
FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | ((local_size >> 12) << 10) | (1 << 22)));
@@ -1179,7 +1181,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
local_size = compiler->local_size;
saved_regs_size = GET_SAVED_REGISTERS_SIZE(compiler->scratches, compiler->saveds, 0);
- if (local_size <= (63 * sizeof(sljit_sw)))
+ SLJIT_ASSERT(local_size >= 0);
+ if ((size_t)local_size <= (63 * sizeof(sljit_sw)))
offs = (local_size - saved_regs_size) << (15 - 3);
else {
FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR)
@@ -1232,7 +1235,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit
SLJIT_ASSERT(prev == -1);
- if (compiler->local_size <= (63 * sizeof(sljit_sw))) {
+ SLJIT_ASSERT(compiler->local_size >= 0);
+ if ((size_t)compiler->local_size <= (63 * sizeof(sljit_sw))) {
FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR)
| RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15)));
} else if (saved_regs_size > 0) {
CVS commit: src/etc
Module Name:src Committed By: riastradh Date: Tue Apr 2 22:29:35 UTC 2024 Modified Files: src/etc/etc.aarch64: MAKEDEV.conf src/etc/etc.amd64: MAKEDEV.conf src/etc/etc.i386: MAKEDEV.conf Log Message: MAKEDEV: Tidy some entries on x86 and Arm. While here, reduce some diffs arising from ordering and formatting between these architectures. Only difference between evbarm and aarch64 now is /dev/vchiq. Not sure offhand if it makes sense on aarch64 or only 32-bit Arm. PR port-amd64/58093: /dev/efi missing on x86 PR port-arm/58100: /dev/ttyVI* missing on aarch64 PR port-arm/58101: /dev/nvme* missing on aarch64 PR port-arm/58102: /dev/raid* missing on aarch64 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/etc/etc.aarch64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.36 src/etc/etc.amd64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.36 src/etc/etc.i386/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.aarch64/MAKEDEV.conf diff -u src/etc/etc.aarch64/MAKEDEV.conf:1.9 src/etc/etc.aarch64/MAKEDEV.conf:1.10 --- src/etc/etc.aarch64/MAKEDEV.conf:1.9 Sat Jul 24 11:39:18 2021 +++ src/etc/etc.aarch64/MAKEDEV.conf Tue Apr 2 22:29:35 2024 @@ -1,10 +1,16 @@ -# $NetBSD: MAKEDEV.conf,v 1.9 2021/07/24 11:39:18 jmcneill Exp $ +# $NetBSD: MAKEDEV.conf,v 1.10 2024/04/02 22:29:35 riastradh Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 + makedev nvme0 nvme0ns1 nvme0ns2 nvme0ns3 nvme0ns4 + makedev nvme1 nvme1ns1 nvme1ns2 nvme1ns3 nvme1ns4 + makedev nvme2 nvme2ns1 nvme2ns2 nvme2ns3 nvme2ns4 + makedev nvme3 nvme3ns1 nvme3ns2 nvme3ns3 nvme3ns4 + makedev raid0 raid1 raid2 raid3 makedev ld0 ld1 ld2 ld3 ld4 ld5 ld6 ld7 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7 - makedev tty0 tty1 plcom0 st0 st1 ch0 cd0 cd1 + makedev tty0 tty1 tty2 tty3 plcom0 + makedev st0 st1 ch0 cd0 cd1 makedev uk0 uk1 ss0 makedev lpa0 lpt0 makedev usbs @@ -20,8 +26,8 @@ all_md) makedev spiflash0 makedev bpf makedev openfirm - makedev acpi - makedev smbios + makedev acpi smbios efi + makedev ttyVI ;; ramdisk|floppy) Index: src/etc/etc.amd64/MAKEDEV.conf diff -u src/etc/etc.amd64/MAKEDEV.conf:1.35 src/etc/etc.amd64/MAKEDEV.conf:1.36 --- src/etc/etc.amd64/MAKEDEV.conf:1.35 Sun Dec 11 17:35:56 2022 +++ src/etc/etc.amd64/MAKEDEV.conf Tue Apr 2 22:29:35 2024 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.35 2022/12/11 17:35:56 kre Exp $ +# $NetBSD: MAKEDEV.conf,v 1.36 2024/04/02 22:29:35 riastradh Exp $ # As of 2003-04-17, the "init" case must not create more than 890 entries. all_md) @@ -45,8 +45,7 @@ all_md) makedev kttcp makedev bio makedev xmm0 - makedev acpi - makedev smbios + makedev acpi smbios efi makedev ttyVI ;; Index: src/etc/etc.i386/MAKEDEV.conf diff -u src/etc/etc.i386/MAKEDEV.conf:1.35 src/etc/etc.i386/MAKEDEV.conf:1.36 --- src/etc/etc.i386/MAKEDEV.conf:1.35 Fri Aug 12 11:15:41 2022 +++ src/etc/etc.i386/MAKEDEV.conf Tue Apr 2 22:29:35 2024 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.35 2022/08/12 11:15:41 riastradh Exp $ +# $NetBSD: MAKEDEV.conf,v 1.36 2024/04/02 22:29:35 riastradh Exp $ # As of 2005-03-15, the "init" case must not create more than 1024 entries. all_md) @@ -23,6 +23,7 @@ all_md) makedev usbs makedev ipty makedev local + makedev cfs makedev lpa0 lpa1 lpa2 makedev lpt0 lpt1 lpt2 makedev ss0 uk0 uk1 @@ -48,9 +49,7 @@ all_md) makedev kttcp makedev io makedev bio - makedev cfs - makedev acpi - makedev smbios + makedev acpi smbios efi makedev ttyVI ;;
CVS commit: src/etc
Module Name:src Committed By: riastradh Date: Tue Apr 2 22:29:35 UTC 2024 Modified Files: src/etc/etc.aarch64: MAKEDEV.conf src/etc/etc.amd64: MAKEDEV.conf src/etc/etc.i386: MAKEDEV.conf Log Message: MAKEDEV: Tidy some entries on x86 and Arm. While here, reduce some diffs arising from ordering and formatting between these architectures. Only difference between evbarm and aarch64 now is /dev/vchiq. Not sure offhand if it makes sense on aarch64 or only 32-bit Arm. PR port-amd64/58093: /dev/efi missing on x86 PR port-arm/58100: /dev/ttyVI* missing on aarch64 PR port-arm/58101: /dev/nvme* missing on aarch64 PR port-arm/58102: /dev/raid* missing on aarch64 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/etc/etc.aarch64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.36 src/etc/etc.amd64/MAKEDEV.conf cvs rdiff -u -r1.35 -r1.36 src/etc/etc.i386/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src Committed By: rillig Date: Tue Apr 2 20:42:13 UTC 2024 Modified Files: src/lib/libc/arch/sparc/gen: fpsetround.c Log Message: sparc/fpsetround: fix the nearby signed integer overflow as well Same as for sparc64 a few days ago. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sparc/gen/fpsetround.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src
Committed By: rillig
Date: Tue Apr 2 20:42:13 UTC 2024
Modified Files:
src/lib/libc/arch/sparc/gen: fpsetround.c
Log Message:
sparc/fpsetround: fix the nearby signed integer overflow as well
Same as for sparc64 a few days ago.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/arch/sparc/gen/fpsetround.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc/gen/fpsetround.c:1.7 src/lib/libc/arch/sparc/gen/fpsetround.c:1.8
--- src/lib/libc/arch/sparc/gen/fpsetround.c:1.7 Tue Apr 2 20:27:44 2024
+++ src/lib/libc/arch/sparc/gen/fpsetround.c Tue Apr 2 20:42:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.7 2024/04/02 20:27:44 christos Exp $ */
+/* $NetBSD: fpsetround.c,v 1.8 2024/04/02 20:42:12 rillig Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.7 2024/04/02 20:27:44 christos Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.8 2024/04/02 20:42:12 rillig Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -27,8 +27,8 @@ fpsetround(fp_rnd rnd_dir)
__asm("st %%fsr,%0" : "=m" (*));
new = old;
- new &= ~(0x03U << 30);
- new |= ((rnd_dir & 0x03) << 30);
+ new &= ~(0x03U << 30);
+ new |= ((rnd_dir & 0x03U) << 30);
__asm("ld %0,%%fsr" : : "m" (*));
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src Committed By: christos Date: Tue Apr 2 20:27:44 UTC 2024 Modified Files: src/lib/libc/arch/sparc/gen: fpsetround.c Log Message: fix lint To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc/gen/fpsetround.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/arch/sparc/gen
Module Name:src
Committed By: christos
Date: Tue Apr 2 20:27:44 UTC 2024
Modified Files:
src/lib/libc/arch/sparc/gen: fpsetround.c
Log Message:
fix lint
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/sparc/gen/fpsetround.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc/gen/fpsetround.c
diff -u src/lib/libc/arch/sparc/gen/fpsetround.c:1.6 src/lib/libc/arch/sparc/gen/fpsetround.c:1.7
--- src/lib/libc/arch/sparc/gen/fpsetround.c:1.6 Tue Mar 20 20:38:35 2012
+++ src/lib/libc/arch/sparc/gen/fpsetround.c Tue Apr 2 16:27:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.6 2012/03/21 00:38:35 christos Exp $ */
+/* $NetBSD: fpsetround.c,v 1.7 2024/04/02 20:27:44 christos Exp $ */
/*
* Written by J.T. Conklin, Apr 10, 1995
@@ -7,7 +7,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.6 2012/03/21 00:38:35 christos Exp $");
+__RCSID("$NetBSD: fpsetround.c,v 1.7 2024/04/02 20:27:44 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -27,7 +27,7 @@ fpsetround(fp_rnd rnd_dir)
__asm("st %%fsr,%0" : "=m" (*));
new = old;
- new &= ~(0x03 << 30);
+ new &= ~(0x03U << 30);
new |= ((rnd_dir & 0x03) << 30);
__asm("ld %0,%%fsr" : : "m" (*));
CVS commit: src/sys/dev/vmt
Module Name:src
Committed By: christos
Date: Tue Apr 2 20:04:16 UTC 2024
Modified Files:
src/sys/dev/vmt: vmt_subr.c
Log Message:
fix llvm build
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/vmt/vmt_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/vmt/vmt_subr.c
diff -u src/sys/dev/vmt/vmt_subr.c:1.8 src/sys/dev/vmt/vmt_subr.c:1.9
--- src/sys/dev/vmt/vmt_subr.c:1.8 Wed Mar 20 19:34:24 2024
+++ src/sys/dev/vmt/vmt_subr.c Tue Apr 2 16:04:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt_subr.c,v 1.8 2024/03/20 23:34:24 msaitoh Exp $ */
+/* $NetBSD: vmt_subr.c,v 1.9 2024/04/02 20:04:16 christos Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -108,7 +108,6 @@ struct vmt_tclo_rpc {
{ "Set_Option broadcastIP 1", vmt_tclo_broadcastip },
{ "ping", vmt_tclo_ping },
{ "reset", vmt_tclo_reset },
- { NULL },
#if 0
/* Various unsupported commands */
{ "Set_Option autohide 0" },
@@ -130,6 +129,7 @@ struct vmt_tclo_rpc {
{ "Time_Synchronize 0" },
{ "Vix_1_Relayed_Command \"38cdcae40e075d66\"" },
#endif
+ { NULL, NULL },
};
extern char hostname[MAXHOSTNAMELEN];
CVS commit: src/sys/dev/vmt
Module Name:src Committed By: christos Date: Tue Apr 2 20:04:16 UTC 2024 Modified Files: src/sys/dev/vmt: vmt_subr.c Log Message: fix llvm build To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/vmt/vmt_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Tue Apr 2 18:40:50 UTC 2024
Modified Files:
src/lib/libm/src: s_fabsl.c
Log Message:
undo accidental commit.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/src/s_fabsl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_fabsl.c
diff -u src/lib/libm/src/s_fabsl.c:1.7 src/lib/libm/src/s_fabsl.c:1.8
--- src/lib/libm/src/s_fabsl.c:1.7 Tue Apr 2 14:39:51 2024
+++ src/lib/libm/src/s_fabsl.c Tue Apr 2 14:40:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $ */
+/* $NetBSD: s_fabsl.c,v 1.8 2024/04/02 18:40:50 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $");
+__RCSID("$NetBSD: s_fabsl.c,v 1.8 2024/04/02 18:40:50 christos Exp $");
#include
#include
@@ -47,6 +47,7 @@ fabsl(long double x)
return (ux.extu_ld);
}
#else
+#if 0
/* defined in libc */
long double
fabsl(long double x)
@@ -54,3 +55,4 @@ fabsl(long double x)
return fabs(x);
}
#endif
+#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Tue Apr 2 18:40:50 UTC 2024 Modified Files: src/lib/libm/src: s_fabsl.c Log Message: undo accidental commit. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/lib/libm/src/s_fabsl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src Committed By: christos Date: Tue Apr 2 18:39:51 UTC 2024 Modified Files: src/lib/libm/src: s_fabsl.c s_rintl.c Log Message: PR/58054: Martin Husemann: fix bug in expsign extraction and only use the code for the floating point formats where it works (does not work for 112 bit mantisa in sparc64) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libm/src/s_fabsl.c cvs rdiff -u -r1.5 -r1.6 src/lib/libm/src/s_rintl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/src
Module Name:src
Committed By: christos
Date: Tue Apr 2 18:39:51 UTC 2024
Modified Files:
src/lib/libm/src: s_fabsl.c s_rintl.c
Log Message:
PR/58054: Martin Husemann: fix bug in expsign extraction and only use the
code for the floating point formats where it works (does not work for 112
bit mantisa in sparc64)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/src/s_fabsl.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libm/src/s_rintl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/src/s_fabsl.c
diff -u src/lib/libm/src/s_fabsl.c:1.6 src/lib/libm/src/s_fabsl.c:1.7
--- src/lib/libm/src/s_fabsl.c:1.6 Sun Feb 25 14:26:33 2024
+++ src/lib/libm/src/s_fabsl.c Tue Apr 2 14:39:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s_fabsl.c,v 1.6 2024/02/25 19:26:33 christos Exp $ */
+/* $NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: s_fabsl.c,v 1.6 2024/02/25 19:26:33 christos Exp $");
+__RCSID("$NetBSD: s_fabsl.c,v 1.7 2024/04/02 18:39:51 christos Exp $");
#include
#include
@@ -47,7 +47,6 @@ fabsl(long double x)
return (ux.extu_ld);
}
#else
-#if 0
/* defined in libc */
long double
fabsl(long double x)
@@ -55,4 +54,3 @@ fabsl(long double x)
return fabs(x);
}
#endif
-#endif
Index: src/lib/libm/src/s_rintl.c
diff -u src/lib/libm/src/s_rintl.c:1.5 src/lib/libm/src/s_rintl.c:1.6
--- src/lib/libm/src/s_rintl.c:1.5 Wed Aug 21 09:04:44 2013
+++ src/lib/libm/src/s_rintl.c Tue Apr 2 14:39:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $ */
+/* $NetBSD: s_rintl.c,v 1.6 2024/04/02 18:39:51 christos Exp $ */
/*-
* Copyright (c) 2008 David Schultz
@@ -30,7 +30,7 @@
#if 0
__FBSDID("$FreeBSD: src/lib/msun/src/s_rintl.c,v 1.5 2008/02/22 11:59:05 bde Exp $");
#else
-__RCSID("$NetBSD: s_rintl.c,v 1.5 2013/08/21 13:04:44 martin Exp $");
+__RCSID("$NetBSD: s_rintl.c,v 1.6 2024/04/02 18:39:51 christos Exp $");
#endif
#include
@@ -40,17 +40,19 @@ __RCSID("$NetBSD: s_rintl.c,v 1.5 2013/0
#include "math_private.h"
#ifdef __HAVE_LONG_DOUBLE
+
+# if EXT_FRACBITS == 64 || EXT_FRACBITS == 113 && LDBL_MAX_EXP == 0x4000
+
+# define BIAS (LDBL_MAX_EXP - 1)
static const float
shift[2] = {
-#if EXT_FRACBITS == 64
+# if EXT_FRACBITS == 64
0x1.0p63, -0x1.0p63
-#elif EXT_FRACBITS == 113
+# elif EXT_FRACBITS == 113
0x1.0p112, -0x1.0p112
-#elif EXT_FRACBITS == 112
- 0x1.0p111, -0x1.0p111
-#else
-#error "Unsupported long double format"
-#endif
+# else
+# error "Unsupported long double format"
+# endif
};
static const float zero[2] = { 0.0, -0.0 };
@@ -63,11 +65,11 @@ rintl(long double x)
u.extu_ld = x;
u.extu_ext.ext_frach &= ~0x8000;
- expsign = u.extu_ext.ext_sign;
+ expsign = GET_EXPSIGN();
ex = expsign & 0x7fff;
- if (ex >= EXT_EXP_BIAS + EXT_FRACBITS - 1) {
- if (ex == EXT_EXP_BIAS + EXT_FRACBITS)
+ if (ex >= BIAS + EXT_FRACBITS - 1) {
+ if (ex == BIAS + EXT_FRACBITS)
return (x + x); /* Inf, NaN, or unsupported format */
return (x); /* finite and already an integer */
}
@@ -87,9 +89,18 @@ rintl(long double x)
* If the result is +-0, then it must have the same sign as x, but
* the above calculation doesn't always give this. Fix up the sign.
*/
- if (ex < EXT_EXP_BIAS && x == 0.0L)
+ if (ex < BIAS && x == 0.0L)
return (zero[sign]);
return (x);
}
-#endif
+# else
+
+long double
+rintl(long double x)
+{
+ return rint(x);
+}
+
+# endif
+#endif /* __HAVE_LONG_DOUBLE */
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:18:23 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk
Log Message:
Back-out unintented commit.
To generate a diff of this commit:
cvs rdiff -u -r1.398 -r1.399 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.398 src/share/mk/bsd.lib.mk:1.399
--- src/share/mk/bsd.lib.mk:1.398 Tue Apr 2 12:17:29 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:18:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.399 2024/04/02 16:18:23 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -16,13 +16,9 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPROFILE:= no
-.if ${LIBISMODULE} != "pic"
MKPICINSTALL:= no
-MKLINKLIB:= no
+MKPROFILE:= no
MKSTATICLIB:= no
-.endif
-_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -30,19 +26,17 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
-MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-_LINKINSTALL?= no
+MKPROFILE:= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
-_LINKINSTALL?= ${MKLINKLIB}
# Basic targets
.PHONY: checkver libinstall
@@ -737,7 +731,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -844,7 +838,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
+.if ${MKLINKLIB} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Tue Apr 2 16:18:23 UTC 2024 Modified Files: src/share/mk: bsd.lib.mk Log Message: Back-out unintented commit. To generate a diff of this commit: cvs rdiff -u -r1.398 -r1.399 src/share/mk/bsd.lib.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.397 src/share/mk/bsd.lib.mk:1.398
--- src/share/mk/bsd.lib.mk:1.397 Tue Mar 26 14:38:52 2024
+++ src/share/mk/bsd.lib.mk Tue Apr 2 12:17:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.397 2024/03/26 18:38:52 riastradh Exp $
+# $NetBSD: bsd.lib.mk,v 1.398 2024/04/02 16:17:29 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -16,9 +16,13 @@ LIBISCXX?= no
.if ${LIBISMODULE} != "no"
_LIB_PREFIX?= # empty
MKDEBUGLIB:= no
-MKPICINSTALL:= no
MKPROFILE:= no
+.if ${LIBISMODULE} != "pic"
+MKPICINSTALL:= no
+MKLINKLIB:= no
MKSTATICLIB:= no
+.endif
+_LINKINSTALL?= no
_LINTINSTALL?= no
.else
_LIB_PREFIX?= lib
@@ -26,17 +30,19 @@ _LIB_PREFIX?= lib
.if ${LIBISPRIVATE} != "no"
MKDEBUGLIB:= no
+MKPROFILE:= no
MKPICINSTALL:= no
. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
MKSTATICLIB:= no
. elif ${LIBISPRIVATE} != "pic"
MKPIC:= no
. endif
-MKPROFILE:= no
+_LINKINSTALL?= no
_LINTINSTALL?= no
.endif
_LINTINSTALL?= ${MKLINT}
+_LINKINSTALL?= ${MKLINKLIB}
# Basic targets
.PHONY: checkver libinstall
@@ -731,7 +737,7 @@ LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
libinstall::
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no" && ${_LINKINSTALL} != "no"
libinstall:: ${_DEST.LIB}/${_LIB.a}
.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
@@ -838,7 +844,7 @@ ${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.
${_DEST.LIB}/${_LIB.so.major}
.endif
.endif
-.if ${MKLINKLIB} != "no"
+.if ${MKLINKLIB} != "no" && ${_LINKINSTALL} != "no"
${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
.if ${_LIBSODIR} != ${LIBDIR}
${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.151 src/share/mk/bsd.x11.mk:1.152
--- src/share/mk/bsd.x11.mk:1.151 Wed Oct 25 00:37:59 2023
+++ src/share/mk/bsd.x11.mk Tue Apr 2 12:17:29 2024
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.151 2023/10/25 04:37:59 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.152 2024/04/02 16:17:29 christos Exp $
.include
@@ -145,7 +145,7 @@ __XKBDEFRULES__= '"xorg"'
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
-PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
+PRINT_PACKAGE_VERSION= ${TOOL_AWK} '/^PACKAGE_VERSION=/ { \
match($$1, "([0-9]+\\.)+[0-9]+"); \
version = substr($$1, RSTART, RLENGTH); \
} END { print version }'
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Tue Apr 2 16:17:29 UTC 2024
Modified Files:
src/share/mk: bsd.lib.mk bsd.x11.mk
Log Message:
PR/58104: Kouichi Hashikawa: Use ${TOOL_AWK}
To generate a diff of this commit:
cvs rdiff -u -r1.397 -r1.398 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.151 -r1.152 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Tue Apr 2 15:05:15 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: opt-keep-going-indirect.mk
Log Message:
tests/make: pass PATH onto child processes
This fixes the tests on some Cygwin variant where the shell does not
initialize the PATH environment variable when it's missing.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk
diff -u src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk:1.2 src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk:1.3
--- src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk:1.2 Sat Feb 12 20:05:36 2022
+++ src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk Tue Apr 2 15:05:15 2024
@@ -1,4 +1,4 @@
-# $NetBSD: opt-keep-going-indirect.mk,v 1.2 2022/02/12 20:05:36 rillig Exp $
+# $NetBSD: opt-keep-going-indirect.mk,v 1.3 2024/04/02 15:05:15 rillig Exp $
#
# Tests for the -k command line option, which stops building a target as soon
# as an error is detected, but continues building the other, independent
@@ -49,19 +49,19 @@
# to the child processes.
all:
@echo 'direct compat'
- @set +e; env -i ${MAKE} -r -f ${MAKEFILE} -k direct; echo "exited $$?"
+ @set +e; env -i "PATH=$$PATH" ${MAKE} -r -f ${MAKEFILE} -k direct; echo "exited $$?"
@echo
@echo 'direct jobs'
- @set +e; env -i ${MAKE} -r -f ${MAKEFILE} -k direct -j1; echo "exited $$?"
+ @set +e; env -i "PATH=$$PATH" ${MAKE} -r -f ${MAKEFILE} -k direct -j1; echo "exited $$?"
@echo
@echo 'indirect compat'
- @set +e; env -i ${MAKE} -r -f ${MAKEFILE} -k indirect; echo "exited $$?"
+ @set +e; env -i "PATH=$$PATH" ${MAKE} -r -f ${MAKEFILE} -k indirect; echo "exited $$?"
@echo
@echo 'indirect jobs'
- @set +e; env -i ${MAKE} -r -f ${MAKEFILE} -k indirect -j1; echo "exited $$?"
+ @set +e; env -i "PATH=$$PATH" ${MAKE} -r -f ${MAKEFILE} -k indirect -j1; echo "exited $$?"
@echo
indirect: direct
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Tue Apr 2 15:05:15 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: opt-keep-going-indirect.mk Log Message: tests/make: pass PATH onto child processes This fixes the tests on some Cygwin variant where the shell does not initialize the PATH environment variable when it's missing. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/usr.bin/make/unit-tests/opt-keep-going-indirect.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/backgammon/common_source
Module Name:src Committed By: christos Date: Tue Apr 2 14:24:26 UTC 2024 Modified Files: src/games/backgammon/common_source: subs.c Log Message: Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/games/backgammon/common_source/subs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/backgammon/common_source
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:24:26 UTC 2024
Modified Files:
src/games/backgammon/common_source: subs.c
Log Message:
Fix DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/games/backgammon/common_source/subs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/common_source/subs.c
diff -u src/games/backgammon/common_source/subs.c:1.20 src/games/backgammon/common_source/subs.c:1.21
--- src/games/backgammon/common_source/subs.c:1.20 Fri Sep 13 16:46:50 2013
+++ src/games/backgammon/common_source/subs.c Tue Apr 2 10:24:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: subs.c,v 1.20 2013/09/13 20:46:50 joerg Exp $ */
+/* $NetBSD: subs.c,v 1.21 2024/04/02 14:24:26 christos Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: subs.c,v 1.20 2013/09/13 20:46:50 joerg Exp $");
+__RCSID("$NetBSD: subs.c,v 1.21 2024/04/02 14:24:26 christos Exp $");
#endif
#endif /* not lint */
@@ -119,6 +119,7 @@ void
writel(const char *l)
{
#ifdef DEBUG
+ static FILE *trace;
const char *s;
if (trace == NULL)
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: christos Date: Tue Apr 2 14:21:29 UTC 2024 Modified Files: src/sys/arch/powerpc/include: limits.h Log Message: harmonize with the rest of MD limits files. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/limits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: christos Date: Tue Apr 2 14:21:29 UTC 2024 Modified Files: src/sys/arch/powerpc/include: limits.h Log Message: harmonize with the rest of MD limits files. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/limits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/limits.h diff -u src/sys/arch/powerpc/include/limits.h:1.20 src/sys/arch/powerpc/include/limits.h:1.21 --- src/sys/arch/powerpc/include/limits.h:1.20 Mon Jan 21 15:28:18 2019 +++ src/sys/arch/powerpc/include/limits.h Tue Apr 2 10:21:29 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: limits.h,v 1.20 2019/01/21 20:28:18 dholland Exp $ */ +/* $NetBSD: limits.h,v 1.21 2024/04/02 14:21:29 christos Exp $ */ /* * Copyright (c) 1988, 1993 @@ -94,18 +94,9 @@ #define SIZE_T_MAX UINT_MAX /* max value for a size_t */ #endif -#ifdef _LP64 -/* Quads and longs are the same on LP64. */ -#define UQUAD_MAX (ULONG_MAX) -#define QUAD_MAX (LONG_MAX) -#define QUAD_MIN (LONG_MIN) -#else -/* GCC requires that quad constants be written as expressions. */ -#define UQUAD_MAX ((u_quad_t)0-1) /* max value for a uquad_t */ - /* max value for a quad_t */ -#define QUAD_MAX ((quad_t)(UQUAD_MAX >> 1)) -#define QUAD_MIN (-QUAD_MAX-1) /* min value for a quad_t */ -#endif +#define UQUAD_MAX 0xULL /* max unsigned quad */ +#define QUAD_MAX 0x7fffLL /* max signed quad */ +#define QUAD_MIN (-0x7fffLL-1) /* min signed quad */ #endif /* _NETBSD_SOURCE */ #endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:19:02 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
use ${MKREPRO_TIMESTAMP} for baking in the date and time.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/ntp/lib/libntp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/external/bsd/ntp/lib/libntp
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:19:02 UTC 2024
Modified Files:
src/external/bsd/ntp/lib/libntp: Makefile
Log Message:
use ${MKREPRO_TIMESTAMP} for baking in the date and time.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/ntp/lib/libntp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/lib/libntp/Makefile
diff -u src/external/bsd/ntp/lib/libntp/Makefile:1.27 src/external/bsd/ntp/lib/libntp/Makefile:1.28
--- src/external/bsd/ntp/lib/libntp/Makefile:1.27 Sat Jun 3 05:09:04 2023
+++ src/external/bsd/ntp/lib/libntp/Makefile Tue Apr 2 10:19:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:04 lukem Exp $
+# $NetBSD: Makefile,v 1.28 2024/04/02 14:19:02 christos Exp $
LIBISPRIVATE=yes
@@ -86,17 +86,11 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
# For MKREPRO, avoid using __DATE__ and __TIME__.
-# Instead, use the date and time from ${IMPORTDATE_FILE}.
-#
-# The file should contain one line, like this:
-# Fri Dec 27 19:28:17 EST 2013 (import)
-#
+# Instead, use the date and time from ${MKREPRO_TIMESTAMP}
.if ${MKREPRO:Uno} == "yes"
IMPORTDATE_FILE := ${.PARSEDIR}/../../importdate
-MKREPRO_DATE != ${TOOL_AWK} '{printf "%3s %2d %4d", $$2, $$3, $$6}' \
- <${IMPORTDATE_FILE} # "Mmm DD "
-MKREPRO_TIME != ${TOOL_AWK} '{print $$4}' \
- <${IMPORTDATE_FILE} # "HH:MM:SS"
+MKREPRO_DATE != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%F"
+MKREPRO_TIME != ${TOOL_DATE} -u -r "${MKREPRO_TIMESTAMP}" "%T"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_DATE=\"${MKREPRO_DATE:Q}\"
CPPFLAGS.ntp_calendar.c += -DMKREPRO_TIME=\"${MKREPRO_TIME:Q}\"
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:15:19 UTC 2024
Modified Files:
src/sys/conf: newvers_stand.sh
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/newvers_stand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/newvers_stand.sh
diff -u src/sys/conf/newvers_stand.sh:1.9 src/sys/conf/newvers_stand.sh:1.10
--- src/sys/conf/newvers_stand.sh:1.9 Sat Apr 8 15:53:54 2017
+++ src/sys/conf/newvers_stand.sh Tue Apr 2 10:15:19 2024
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $NetBSD: newvers_stand.sh,v 1.9 2017/04/08 19:53:54 christos Exp $
+# $NetBSD: newvers_stand.sh,v 1.10 2024/04/02 14:15:19 christos Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -35,6 +35,8 @@
# Called as:
# sh ${S}/conf/newvers_stand.sh [-dkn] [-D ] [-m ] VERSION_TEMPLATE [EXTRA_MSG]
+DATE=${TOOL_DATE:-date}
+
cwd=$(dirname "$0")
add_name=true
@@ -45,8 +47,8 @@ dateargs=
# parse command args
while getopts "m:D:dknm:" OPT; do
- case $OPT in
- D) dateargs="-r $OPTARG";;
+ case ${OPT} in
+ D) dateargs="-r ${OPTARG}";;
d) add_date=false;;
k) add_kernrev=false;;
m) machine=${OPTARG};;
@@ -56,25 +58,25 @@ while getopts "m:D:dknm:" OPT; do
esac
done
-shift $(expr $OPTIND - 1)
+shift $(expr ${OPTIND} - 1)
r=$(awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' "$1")
shift
-t=$(LC_ALL=C TZ=UTC date $dateargs)
+t=$(LC_ALL=C TZ=UTC ${DATE} ${dateargs})
-if $add_date; then
+if ${add_date}; then
echo "const char bootprog_rev[] = \"${r} (${t})\";" > vers.c
else
echo "const char bootprog_rev[] = \"${r}\";" > vers.c
fi
-if $add_name; then
+if ${add_name}; then
extra=${1:+" $1"}
echo "const char bootprog_name[] = \"NetBSD/${machine}${extra}\";" >> vers.c
fi
-if $add_kernrev; then
+if ${add_kernrev}; then
osr=$(sh "${cwd}/osrelease.sh")
echo "const char bootprog_kernrev[] = \"${osr}\";" >> vers.c
fi
CVS commit: src/sys/conf
Module Name:src
Committed By: christos
Date: Tue Apr 2 14:15:19 UTC 2024
Modified Files:
src/sys/conf: newvers_stand.sh
Log Message:
Use ${TOOL_DATE} (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/conf/newvers_stand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/usr.bin/gzip
Module Name:src Committed By: christos Date: Tue Apr 2 12:42:35 UTC 2024 Modified Files: src/usr.bin/gzip: gzip.c Log Message: oops the #endif was too far down. To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 src/usr.bin/gzip/gzip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: christos
Date: Tue Apr 2 12:42:35 UTC 2024
Modified Files:
src/usr.bin/gzip: gzip.c
Log Message:
oops the #endif was too far down.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/usr.bin/gzip/gzip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.124 src/usr.bin/gzip/gzip.c:1.125
--- src/usr.bin/gzip/gzip.c:1.124 Mon Apr 1 18:20:58 2024
+++ src/usr.bin/gzip/gzip.c Tue Apr 2 08:42:35 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.124 2024/04/01 22:20:58 christos Exp $ */
+/* $NetBSD: gzip.c,v 1.125 2024/04/02 12:42:35 christos Exp $ */
/*
* Copyright (c) 1997-2024 Matthew R. Green
@@ -34,7 +34,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997-2024 Matthew R. Green. "
"All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.124 2024/04/01 22:20:58 christos Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.125 2024/04/02 12:42:35 christos Exp $");
#endif /* not lint */
/*
@@ -1762,6 +1762,7 @@ check_siginfo(void)
out:
print_info = 0;
}
+#endif
static off_t
cat_fd(unsigned char * prepend, size_t count, off_t *gsizep, int fd)
@@ -1799,7 +1800,6 @@ cat_fd(unsigned char * prepend, size_t c
*gsizep = in_tot;
return (in_tot);
}
-#endif
static void
handle_stdin(void)
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Tue Apr 2 11:11:00 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: opt-chdir.exp opt-chdir.mk Log Message: tests/make: remove test for overly long chdir argument On Cygwin, the path '/././..././' is normalized before being passed to the child 'make' process. Since overly long pathnames are not required to be supported on all platforms, remove the test. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-chdir.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-chdir.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/opt-chdir.exp diff -u src/usr.bin/make/unit-tests/opt-chdir.exp:1.3 src/usr.bin/make/unit-tests/opt-chdir.exp:1.4 --- src/usr.bin/make/unit-tests/opt-chdir.exp:1.3 Sun Dec 27 11:47:04 2020 +++ src/usr.bin/make/unit-tests/opt-chdir.exp Tue Apr 2 11:11:00 2024 @@ -1,5 +1,3 @@ -make: chdir /././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././ ././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././. /././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././././
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Tue Apr 2 11:11:00 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: opt-chdir.exp opt-chdir.mk Log Message: tests/make: remove test for overly long chdir argument On Cygwin, the path '/././..././' is normalized before being passed to the child 'make' process. Since overly long pathnames are not required to be supported on all platforms, remove the test. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-chdir.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-chdir.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
