CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Tue Oct 10 16:23:56 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 Log Message: INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CI20 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/evbmips/conf/INSTALL_CI20 diff -u src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 src/sys/arch/evbmips/conf/INSTALL_CI20:1.3 --- src/sys/arch/evbmips/conf/INSTALL_CI20:1.2 Fri Jun 9 21:33:16 2023 +++ src/sys/arch/evbmips/conf/INSTALL_CI20 Tue Oct 10 16:23:56 2023 @@ -1,8 +1,8 @@ -# $NetBSD: INSTALL_CI20,v 1.2 2023/06/09 21:33:16 gutteridge Exp $ +# $NetBSD: INSTALL_CI20,v 1.3 2023/10/10 16:23:56 he Exp $ include "arch/evbmips/conf/CI20" -#ident "INSTALL_CI20-$Revision: 1.2 $" +#ident "INSTALL_CI20-$Revision: 1.3 $" # Enable the hooks used for initializing the root memory-disk. # The ramdisk size must be kept in sync manually with the size of @@ -11,4 +11,4 @@ pseudo-device md# memory disk device options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk -options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=12416 # size of memory disk, in blocks
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Tue Oct 10 16:23:56 UTC 2023 Modified Files: src/sys/arch/evbmips/conf: INSTALL_CI20 Log Message: INSTALL_CI20: bump ramdisk image size since contents grew a bit recently. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/conf/INSTALL_CI20 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: he
Date: Sun Oct 8 13:47:51 UTC 2023
Modified Files:
src/distrib/evbmips/instkernel/ramdisk: Makefile
src/lib/libm: Makefile
Log Message:
libm Makefile: add fma() functions for mips.
This pushed the ramdisk size, so that needed to be bumped as well.
Otherwise, there were no build issues for either 32 or 64 bit mips.
Sort-of OK'ed by simonb@.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.221 -r1.222 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.18 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.19
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.18 Tue Jul 25 02:38:31 2023
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Oct 8 13:47:51 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2023/07/25 02:38:31 gutteridge Exp $
+# $NetBSD: Makefile,v 1.19 2023/10/08 13:47:51 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 4096k
+IMAGESIZE= 4160k
MAKEFS_FLAGS+= -f 15
WARNS= 1
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.221 src/lib/libm/Makefile:1.222
--- src/lib/libm/Makefile:1.221 Tue Aug 8 02:09:42 2023
+++ src/lib/libm/Makefile Sun Oct 8 13:47:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2023/08/08 02:09:42 rin Exp $
+# $NetBSD: Makefile,v 1.222 2023/10/08 13:47:51 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -207,6 +207,7 @@ COMMON_SRCS+= s_rintl.c
.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
COMMON_SRCS+= s_nexttoward.c
.endif
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
CVS commit: src
Module Name:src Committed By: he Date: Sun Oct 8 13:47:51 UTC 2023 Modified Files: src/distrib/evbmips/instkernel/ramdisk: Makefile src/lib/libm: Makefile Log Message: libm Makefile: add fma() functions for mips. This pushed the ramdisk size, so that needed to be bumped as well. Otherwise, there were no build issues for either 32 or 64 bit mips. Sort-of OK'ed by simonb@. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/evbmips/instkernel/ramdisk/Makefile cvs rdiff -u -r1.221 -r1.222 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: he Date: Sun May 14 18:44:27 UTC 2023 Modified Files: src/sys/arch/mips/include: vmparam.h Log Message: Bump MAXTSIZ from 64MB to 128MB also for o32. This so that the rather large cc1 from gcc12 can be run. OK'ed by simonb@ To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/mips/include/vmparam.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/mips/include
Module Name:src Committed By: he Date: Sun May 14 18:44:27 UTC 2023 Modified Files: src/sys/arch/mips/include: vmparam.h Log Message: Bump MAXTSIZ from 64MB to 128MB also for o32. This so that the rather large cc1 from gcc12 can be run. OK'ed by simonb@ To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/mips/include/vmparam.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/mips/include/vmparam.h diff -u src/sys/arch/mips/include/vmparam.h:1.66 src/sys/arch/mips/include/vmparam.h:1.67 --- src/sys/arch/mips/include/vmparam.h:1.66 Wed Jun 23 15:11:40 2021 +++ src/sys/arch/mips/include/vmparam.h Sun May 14 18:44:27 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.66 2021/06/23 15:11:40 simonb Exp $ */ +/* $NetBSD: vmparam.h,v 1.67 2023/05/14 18:44:27 he Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -88,7 +88,7 @@ */ #if defined(__mips_o32) #ifndef MAXTSIZ -#define MAXTSIZ (64*1024*1024) /* max text size */ +#define MAXTSIZ (128*1024*1024) /* max text size */ #endif #ifndef DFLDSIZ #define DFLDSIZ (128*1024*1024) /* initial data size limit */
CVS commit: src/tests/lib/libc/stdio
Module Name:src Committed By: he Date: Tue Apr 4 19:39:38 UTC 2023 Modified Files: src/tests/lib/libc/stdio: t_printf.c Log Message: Fix the test for "inf" output, also include newline in printf format... To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/stdio/t_printf.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/libc/stdio/t_printf.c diff -u src/tests/lib/libc/stdio/t_printf.c:1.9 src/tests/lib/libc/stdio/t_printf.c:1.10 --- src/tests/lib/libc/stdio/t_printf.c:1.9 Tue Apr 4 19:30:11 2023 +++ src/tests/lib/libc/stdio/t_printf.c Tue Apr 4 19:39:38 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: t_printf.c,v 1.9 2023/04/04 19:30:11 christos Exp $ */ +/* $NetBSD: t_printf.c,v 1.10 2023/04/04 19:39:38 he Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -219,7 +219,7 @@ ATF_TC_BODY(pr57250_fix, tc) ld = (double)ld; ATF_CHECK(isfinite(ld) == 0); snprintf(buf, sizeof buf, "%Lf\n", ld); - ATF_REQUIRE_STREQ(buf, "inf"); + ATF_REQUIRE_STREQ(buf, "inf\n"); } #endif
CVS commit: src/tests/lib/libc/stdio
Module Name:src Committed By: he Date: Tue Apr 4 19:39:38 UTC 2023 Modified Files: src/tests/lib/libc/stdio: t_printf.c Log Message: Fix the test for "inf" output, also include newline in printf format... To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/stdio/t_printf.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/evbmips/mipssim
Module Name:src
Committed By: he
Date: Wed Dec 28 11:50:25 UTC 2022
Modified Files:
src/sys/arch/evbmips/mipssim: machdep.c mipssimreg.h
Log Message:
evbmips/mipssim: on mips64, probe for additional memory.
Probe for memory from above the ISA I/O hole and up to 16GB,
which acording to simonb@ is a somewhat arbitrary limit.
This makes it possible to specify e.g. "-m 2g" to qemu, and have
that memory be probed instead of being clamped to 508MB.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/mipssim/machdep.c \
src/sys/arch/evbmips/mipssim/mipssimreg.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/evbmips/mipssim/machdep.c
diff -u src/sys/arch/evbmips/mipssim/machdep.c:1.3 src/sys/arch/evbmips/mipssim/machdep.c:1.4
--- src/sys/arch/evbmips/mipssim/machdep.c:1.3 Tue Nov 16 06:44:40 2021
+++ src/sys/arch/evbmips/mipssim/machdep.c Wed Dec 28 11:50:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.3 2021/11/16 06:44:40 simonb Exp $ */
+/* $NetBSD: machdep.c,v 1.4 2022/12/28 11:50:25 he Exp $ */
/*-
* Copyright (c) 2001,2021 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2021/11/16 06:44:40 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2022/12/28 11:50:25 he Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -229,6 +229,9 @@ mach_init_memory(void)
size_t addr;
uint32_t *memptr;
extern char end[]; /* XXX */
+#ifdef MIPS64
+ size_t highaddr;
+#endif
l->l_addr =
memsize = roundup2(MIPS_KSEG0_TO_PHYS((uintptr_t)(end)), 1024 * 1024);
@@ -246,13 +249,43 @@ mach_init_memory(void)
}
l->l_addr = NULL;
- printf("Memory size: 0x%" PRIxPSIZE " (%" PRIdPSIZE " MB)\n",
- memsize, memsize / 1024 / 1024);
physmem = btoc(memsize);
mem_clusters[0].start = PAGE_SIZE;
mem_clusters[0].size = memsize - PAGE_SIZE;
mem_cluster_cnt = 1;
+
+#ifdef _LP64
+ /* probe for more memory above ISA I/O "hole" */
+ l->l_addr =
+
+ for (highaddr = addr = MIPSSIM_MORE_MEM_BASE;
+ addr < MIPSSIM_MORE_MEM_END;
+ addr += 1024 * 1024) {
+ memptr = (void *)MIPS_PHYS_TO_XKPHYS(CCA_CACHEABLE,
+ addr - sizeof(*memptr));
+ if (badaddr(memptr, sizeof(uint32_t)) < 0)
+ break;
+
+ highaddr = addr;
+#ifdef MEM_DEBUG
+ printf("probed %zd MB\n", (addr - MIPSSIM_MORE_MEM_BASE)
+ / 1024 * 1024);
+#endif
+ }
+ l->l_addr = NULL;
+
+ if (highaddr != MIPSSIM_MORE_MEM_BASE) {
+ mem_clusters[1].start = MIPSSIM_MORE_MEM_BASE;
+ mem_clusters[1].size = highaddr - MIPSSIM_MORE_MEM_BASE;
+ mem_cluster_cnt++;
+ physmem += btoc(mem_clusters[1].size);
+ memsize += mem_clusters[1].size;
+ }
+#endif /* _LP64 */
+
+ printf("Memory size: 0x%" PRIxPSIZE " (%" PRIdPSIZE " MB)\n",
+ memsize, memsize / 1024 / 1024);
}
void
Index: src/sys/arch/evbmips/mipssim/mipssimreg.h
diff -u src/sys/arch/evbmips/mipssim/mipssimreg.h:1.3 src/sys/arch/evbmips/mipssim/mipssimreg.h:1.4
--- src/sys/arch/evbmips/mipssim/mipssimreg.h:1.3 Tue Feb 16 15:06:30 2021
+++ src/sys/arch/evbmips/mipssim/mipssimreg.h Wed Dec 28 11:50:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mipssimreg.h,v 1.3 2021/02/16 15:06:30 simonb Exp $ */
+/* $NetBSD: mipssimreg.h,v 1.4 2022/12/28 11:50:25 he Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -37,6 +37,11 @@
* 1fd0. 64kB ISA IO space
* 1fd1. 64kB 'ISA' VirtIO IO space (non standard)
*
+ * Additionally, mips64 probes for memory up to 16G:
+ *
+ * 2000. memory, probed, up to
+ * 4.. 16GB somewhat arbitrarily, could probably be higher
+ *
* CPU interrupts
*
* 0 mipsnet
@@ -56,5 +61,8 @@
#define MIPSSIM_DMA_PHYSBASE 0x
#define MIPSSIM_DMA_SIZE (MIPSSIM_ISA_IO_BASE - MIPSSIM_DMA_BASE)
+#define MIPSSIM_MORE_MEM_BASE 0x2000
+#define MIPSSIM_MORE_MEM_END (16ULL * 1024 * 1024 * 1024) /* 16GB */
+
#define VIRTIO_NUM_TRANSPORTS 32
#define VIRTIO_STRIDE 512
CVS commit: src/sys/arch/evbmips/mipssim
Module Name:src Committed By: he Date: Wed Dec 28 11:50:25 UTC 2022 Modified Files: src/sys/arch/evbmips/mipssim: machdep.c mipssimreg.h Log Message: evbmips/mipssim: on mips64, probe for additional memory. Probe for memory from above the ISA I/O hole and up to 16GB, which acording to simonb@ is a somewhat arbitrary limit. This makes it possible to specify e.g. "-m 2g" to qemu, and have that memory be probed instead of being clamped to 508MB. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/mipssim/machdep.c \ src/sys/arch/evbmips/mipssim/mipssimreg.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/evbmips/mipssim
Module Name:src Committed By: he Date: Wed Dec 28 11:40:35 UTC 2022 Modified Files: src/sys/arch/evbmips/mipssim: mipssim_dma.c Log Message: mipssim_dma.c: set _bounce_thresh so that bounce buffering works. Suggested by jmcneill@, thanks! To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/mipssim/mipssim_dma.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/evbmips/mipssim/mipssim_dma.c diff -u src/sys/arch/evbmips/mipssim/mipssim_dma.c:1.1 src/sys/arch/evbmips/mipssim/mipssim_dma.c:1.2 --- src/sys/arch/evbmips/mipssim/mipssim_dma.c:1.1 Mon Feb 15 22:39:46 2021 +++ src/sys/arch/evbmips/mipssim/mipssim_dma.c Wed Dec 28 11:40:35 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: mipssim_dma.c,v 1.1 2021/02/15 22:39:46 reinoud Exp $ */ +/* $NetBSD: mipssim_dma.c,v 1.2 2022/12/28 11:40:35 he Exp $ */ /*- * Copyright (c) 2021 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mipssim_dma.c,v 1.1 2021/02/15 22:39:46 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mipssim_dma.c,v 1.2 2022/12/28 11:40:35 he Exp $"); #include #include @@ -57,6 +57,7 @@ mipssim_dma_init(struct mipssim_config * t->_wbase = MIPSSIM_DMA_BASE; t->_bounce_alloc_lo = MIPSSIM_DMA_PHYSBASE; t->_bounce_alloc_hi = MIPSSIM_DMA_PHYSBASE + MIPSSIM_DMA_SIZE; + t->_bounce_thresh = t->_bounce_alloc_hi; /* as an approximation */ t->_dmamap_ops = mips_bus_dmamap_ops; t->_dmamem_ops = mips_bus_dmamem_ops; t->_dmatag_ops = mips_bus_dmatag_ops;
CVS commit: src/sys/arch/evbmips/mipssim
Module Name:src Committed By: he Date: Wed Dec 28 11:40:35 UTC 2022 Modified Files: src/sys/arch/evbmips/mipssim: mipssim_dma.c Log Message: mipssim_dma.c: set _bounce_thresh so that bounce buffering works. Suggested by jmcneill@, thanks! To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/mipssim/mipssim_dma.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/evbmips/conf
Module Name:src Committed By: he Date: Sun Nov 27 14:54:25 UTC 2022 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Bump MSGBUFSIZE to 32k; 4k just about overflows "by default" with qemu and mipssim-virtio machine type. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/MIPSSIM 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/evbmips/conf/MIPSSIM diff -u src/sys/arch/evbmips/conf/MIPSSIM:1.7 src/sys/arch/evbmips/conf/MIPSSIM:1.8 --- src/sys/arch/evbmips/conf/MIPSSIM:1.7 Tue Nov 15 14:49:14 2022 +++ src/sys/arch/evbmips/conf/MIPSSIM Sun Nov 27 14:54:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: MIPSSIM,v 1.7 2022/11/15 14:49:14 simonb Exp $ +# $NetBSD: MIPSSIM,v 1.8 2022/11/27 14:54:25 he Exp $ # # Kernel config for the QEMU MIPS "mipssim" simulator # @@ -8,7 +8,7 @@ include "arch/evbmips/conf/std.mipssim" -#ident "GENERIC-$Revision: 1.7 $" +#ident "GENERIC-$Revision: 1.8 $" maxusers 32 @@ -25,6 +25,8 @@ options TCP_CSUM_COUNTERS options UDP_CSUM_COUNTERS options TCP_OUTPUT_COUNTERS +options MSGBUFSIZE=32768 # need a bit more than 4K for virtio qemu + options NTP # network time protocol # Debugging options
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: he Date: Sun Nov 27 14:54:25 UTC 2022 Modified Files: src/sys/arch/evbmips/conf: MIPSSIM Log Message: Bump MSGBUFSIZE to 32k; 4k just about overflows "by default" with qemu and mipssim-virtio machine type. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/MIPSSIM 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: he
Date: Sun Aug 28 21:24:09 UTC 2022
Modified Files:
src/lib/libm/src: s_rint.c
Log Message:
s_rint.c: weak-alias rintl -> rint for ports without __HAVE_LONG_DOUBLE.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/s_rint.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_rint.c
diff -u src/lib/libm/src/s_rint.c:1.12 src/lib/libm/src/s_rint.c:1.13
--- src/lib/libm/src/s_rint.c:1.12 Fri Apr 25 22:21:53 2008
+++ src/lib/libm/src/s_rint.c Sun Aug 28 21:24:09 2022
@@ -12,7 +12,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_rint.c,v 1.12 2008/04/25 22:21:53 christos Exp $");
+__RCSID("$NetBSD: s_rint.c,v 1.13 2022/08/28 21:24:09 he Exp $");
#endif
/*
@@ -77,3 +77,7 @@ rint(double x)
w = TWO52[sx]+x;
return w-TWO52[sx];
}
+
+#if !defined(__HAVE_LONG_DOUBLE)
+__weak_alias(rintl, rint)
+#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: he Date: Sun Aug 28 21:24:09 UTC 2022 Modified Files: src/lib/libm/src: s_rint.c Log Message: s_rint.c: weak-alias rintl -> rint for ports without __HAVE_LONG_DOUBLE. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/s_rint.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: he
Date: Sun Aug 28 16:07:58 UTC 2022
Modified Files:
src/lib/libm/src: s_sincos.c
Log Message:
s_sincos.c: use correct order of __weak_alias() arguments...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_sincos.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_sincos.c
diff -u src/lib/libm/src/s_sincos.c:1.3 src/lib/libm/src/s_sincos.c:1.4
--- src/lib/libm/src/s_sincos.c:1.3 Sun Aug 28 14:30:41 2022
+++ src/lib/libm/src/s_sincos.c Sun Aug 28 16:07:58 2022
@@ -14,7 +14,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sincos.c,v 1.3 2022/08/28 14:30:41 he Exp $");
+__RCSID("$NetBSD: s_sincos.c,v 1.4 2022/08/28 16:07:58 he Exp $");
#endif
#if 0
__FBSDID("$FreeBSD: head/lib/msun/src/s_sincos.c 319047 2017-05-28 06:13:38Z mmel $");
@@ -86,5 +86,5 @@ sincos(double x, double *sn, double *cs)
}
#if !defined(__HAVE_LONG_DOUBLE)
-__weak_alias(sincos, sincosl);
+__weak_alias(sincosl, sincos);
#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: he Date: Sun Aug 28 16:07:58 UTC 2022 Modified Files: src/lib/libm/src: s_sincos.c Log Message: s_sincos.c: use correct order of __weak_alias() arguments... To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_sincos.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: he
Date: Sun Aug 28 14:30:41 UTC 2022
Modified Files:
src/lib/libm/src: s_sincos.c
Log Message:
s_sincos.c: use __weak_alias and not __weak_reference.
Fixes build on NetBSD/macppc, thanks to hint from riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_sincos.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_sincos.c
diff -u src/lib/libm/src/s_sincos.c:1.2 src/lib/libm/src/s_sincos.c:1.3
--- src/lib/libm/src/s_sincos.c:1.2 Sun Aug 28 07:29:04 2022
+++ src/lib/libm/src/s_sincos.c Sun Aug 28 14:30:41 2022
@@ -14,7 +14,7 @@
#include
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_sincos.c,v 1.2 2022/08/28 07:29:04 christos Exp $");
+__RCSID("$NetBSD: s_sincos.c,v 1.3 2022/08/28 14:30:41 he Exp $");
#endif
#if 0
__FBSDID("$FreeBSD: head/lib/msun/src/s_sincos.c 319047 2017-05-28 06:13:38Z mmel $");
@@ -86,5 +86,5 @@ sincos(double x, double *sn, double *cs)
}
#if !defined(__HAVE_LONG_DOUBLE)
-__weak_reference(sincos, sincosl);
+__weak_alias(sincos, sincosl);
#endif
CVS commit: src/lib/libm/src
Module Name:src Committed By: he Date: Sun Aug 28 14:30:41 UTC 2022 Modified Files: src/lib/libm/src: s_sincos.c Log Message: s_sincos.c: use __weak_alias and not __weak_reference. Fixes build on NetBSD/macppc, thanks to hint from riastradh@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/src/s_sincos.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
Module Name:src
Committed By: he
Date: Thu Jun 23 07:50:14 UTC 2022
Modified Files:
src/lib/libm: Makefile
Log Message:
libm: build fma(3), fmaf(3), fmal(3) on powerpc.
For now this builds the C version, for completeness, so
that e.g. lang/ocaml can be configured & built. However,
googling reveals that powerpc does have a "fused multiply add"
instruction, ref.
https://www.ibm.com/docs/en/aix/7.1?topic=set-fmadd-fma-floating-multiply-add-instruction
so this could probably be taken advantage of for a more
optimized version.
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/lib/libm/Makefile
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/Makefile
diff -u src/lib/libm/Makefile:1.214 src/lib/libm/Makefile:1.215
--- src/lib/libm/Makefile:1.214 Wed Jul 21 12:05:02 2021
+++ src/lib/libm/Makefile Thu Jun 23 07:50:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.214 2021/07/21 12:05:02 tnn Exp $
+# $NetBSD: Makefile,v 1.215 2022/06/23 07:50:14 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -194,6 +194,7 @@ ARCH_SRCS += s_fmin.S s_fminf.S
.if ${MKSOFTFLOAT} == "no"
COMMON_SRCS += fenv.c
.endif
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_CPU} == "mips")
.PATH: ${.CURDIR}/arch/mips
CVS commit: src/lib/libm
Module Name:src Committed By: he Date: Thu Jun 23 07:50:14 UTC 2022 Modified Files: src/lib/libm: Makefile Log Message: libm: build fma(3), fmaf(3), fmal(3) on powerpc. For now this builds the C version, for completeness, so that e.g. lang/ocaml can be configured & built. However, googling reveals that powerpc does have a "fused multiply add" instruction, ref. https://www.ibm.com/docs/en/aix/7.1?topic=set-fmadd-fma-floating-multiply-add-instruction so this could probably be taken advantage of for a more optimized version. To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: he Date: Sat Nov 27 23:22:25 UTC 2021 Modified Files: src/crypto/external/bsd/openssh/dist: sshd_config Log Message: Amend the comment about UsePAM; the ChallengeResponseAuthentication setting is deprecated, replaced by KbdInteractiveAuthentication, confirmed both by man page and code. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/sshd_config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: he Date: Sat Nov 27 23:22:25 UTC 2021 Modified Files: src/crypto/external/bsd/openssh/dist: sshd_config Log Message: Amend the comment about UsePAM; the ChallengeResponseAuthentication setting is deprecated, replaced by KbdInteractiveAuthentication, confirmed both by man page and code. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/sshd_config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/sshd_config diff -u src/crypto/external/bsd/openssh/dist/sshd_config:1.26 src/crypto/external/bsd/openssh/dist/sshd_config:1.27 --- src/crypto/external/bsd/openssh/dist/sshd_config:1.26 Thu Sep 2 11:26:18 2021 +++ src/crypto/external/bsd/openssh/dist/sshd_config Sat Nov 27 23:22:25 2021 @@ -1,4 +1,4 @@ -# $NetBSD: sshd_config,v 1.26 2021/09/02 11:26:18 christos Exp $ +# $NetBSD: sshd_config,v 1.27 2021/11/27 23:22:25 he Exp $ # $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $ # This is the sshd server system-wide configuration file. See @@ -72,13 +72,13 @@ AuthorizedKeysFile .ssh/authorized_keys # Set this to 'yes' to enable PAM authentication, account processing, # and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass +# be allowed through the KbdInteractiveAuthentication and +# PasswordAuthentication settings. Depending on your PAM configuration, +# PAM authentication via KbdInteractiveAuthentication may bypass # the setting of "PermitRootLogin without-password". # If you just want the PAM account and session checks to run without # PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. +# and KbdInteractiveAuthentication to 'no'. UsePAM yes #AllowAgentForwarding yes
CVS commit: src/external/bsd/pam-u2f/dist/pamu2fcfg
Module Name:src Committed By: he Date: Wed Oct 6 09:06:21 UTC 2021 Modified Files: src/external/bsd/pam-u2f/dist/pamu2fcfg: pamu2fcfg.c Log Message: Add what must be an overlooked newline in the normal output. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pam-u2f/dist/pamu2fcfg
Module Name:src
Committed By: he
Date: Wed Oct 6 09:06:21 UTC 2021
Modified Files:
src/external/bsd/pam-u2f/dist/pamu2fcfg: pamu2fcfg.c
Log Message:
Add what must be an overlooked newline in the normal output.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c
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/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c
diff -u src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c:1.1.1.2 src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c:1.2
--- src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c:1.1.1.2 Fri Sep 24 12:51:20 2021
+++ src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c Wed Oct 6 09:06:21 2021
@@ -261,7 +261,7 @@ static int print_authfile_line(const str
printf("%s", user);
}
- printf(":%s,%s,%s,%s%s%s", args->resident_given ? "*" : b64_kh, b64_pk,
+ printf(":%s,%s,%s,%s%s%s\n", args->resident_given ? "*" : b64_kh, b64_pk,
cose_string(fido_cred_type(cred)),
!args->no_user_presence_given ? "+presence" : "",
args->user_verification_given ? "+verification" : "",
CVS commit: src/usr.bin
Module Name:src
Committed By: he
Date: Sun Jun 30 19:57:24 UTC 2019
Modified Files:
src/usr.bin/systat: vmstat.c vmstat.h
src/usr.bin/vmstat: drvstats.c drvstats.h
Log Message:
Make the scaling of the "bytes written" sticky, so that if we go
to K, we don't return to unscaled, and similar for higher scales
(though it takes some effort, due to the wide field...)
Fixes PR#54334.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/systat/vmstat.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/systat/vmstat.h
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/vmstat/drvstats.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/vmstat/drvstats.h
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/systat/vmstat.c
diff -u src/usr.bin/systat/vmstat.c:1.86 src/usr.bin/systat/vmstat.c:1.87
--- src/usr.bin/systat/vmstat.c:1.86 Fri Jan 25 15:34:22 2019
+++ src/usr.bin/systat/vmstat.c Sun Jun 30 19:57:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.86 2019/01/25 15:34:22 christos Exp $ */
+/* $NetBSD: vmstat.c,v 1.87 2019/06/30 19:57:23 he Exp $ */
/*-
* Copyright (c) 1983, 1989, 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif
-__RCSID("$NetBSD: vmstat.c,v 1.86 2019/01/25 15:34:22 christos Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.87 2019/06/30 19:57:23 he Exp $");
#endif /* not lint */
/*
@@ -756,7 +756,7 @@ cputime(int indx)
}
void
-puthumanint(u_int64_t n, int l, int c, int w)
+puthumanint_scale(u_int64_t n, int l, int c, int w, int scale)
{
char b[128];
@@ -766,7 +766,7 @@ puthumanint(u_int64_t n, int l, int c, i
hline(' ', w);
return;
}
- if (humanize_number(b, w, n, "", HN_AUTOSCALE, HN_NOSPACE) == -1 ) {
+ if (humanize_number(b, w, n, "", scale, HN_NOSPACE) == -1 ) {
hline('*', w);
return;
}
@@ -774,6 +774,28 @@ puthumanint(u_int64_t n, int l, int c, i
}
void
+puthumanint_sticky(u_int64_t n, int l, int c, int w, int *scale)
+{
+ char b[128];
+ int sc;
+
+ sc = humanize_number(b, w, n, "", HN_GETSCALE, HN_NOSPACE);
+ if (sc > *scale)
+ *scale = sc;
+ else
+ sc = *scale;
+
+ puthumanint_scale(n, l, c, w, sc);
+}
+
+void
+puthumanint(u_int64_t n, int l, int c, int w)
+{
+
+ puthumanint_scale(n, l, c, w, HN_AUTOSCALE);
+}
+
+void
putint(int n, int l, int c, int w)
{
char b[128];
@@ -899,8 +921,8 @@ dinfo(int dn, int r, int c)
putint((int)((cur.rxfer[dn]+cur.wxfer[dn])/dtime+0.5),
r, c, DISKCOLWIDTH);
ADV;
- puthumanint((cur.rbytes[dn] + cur.wbytes[dn]) / dtime + 0.5,
- r, c, DISKCOLWIDTH);
+ puthumanint_sticky((cur.rbytes[dn] + cur.wbytes[dn]) / dtime + 0.5,
+ r, c, DISKCOLWIDTH, [dn]);
ADV;
/* time busy in disk activity */
Index: src/usr.bin/systat/vmstat.h
diff -u src/usr.bin/systat/vmstat.h:1.1 src/usr.bin/systat/vmstat.h:1.2
--- src/usr.bin/systat/vmstat.h:1.1 Sat Mar 18 14:58:49 2006
+++ src/usr.bin/systat/vmstat.h Sun Jun 30 19:57:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.h,v 1.1 2006/03/18 14:58:49 dsl Exp $ */
+/* $NetBSD: vmstat.h,v 1.2 2019/06/30 19:57:23 he Exp $ */
/*-
* Copyright (c) 1983, 1989, 1992, 1993
@@ -35,6 +35,8 @@ extern double etime;
void putfloat(double, int, int, int, int, int);
void putint(int, int, int, int);
+void puthumanint_scale(u_int64_t, int, int, int, int);
+void puthumanint_sticky(u_int64_t, int, int, int, int*);
void puthumanint(u_int64_t, int, int, int);
typedef struct uvmexp_sysctl uvmexp_sysctl_t;
Index: src/usr.bin/vmstat/drvstats.c
diff -u src/usr.bin/vmstat/drvstats.c:1.12 src/usr.bin/vmstat/drvstats.c:1.13
--- src/usr.bin/vmstat/drvstats.c:1.12 Thu Feb 8 09:05:21 2018
+++ src/usr.bin/vmstat/drvstats.c Sun Jun 30 19:57:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drvstats.c,v 1.12 2018/02/08 09:05:21 dholland Exp $ */
+/* $NetBSD: drvstats.c,v 1.13 2019/06/30 19:57:24 he Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -346,6 +346,7 @@ drvinit(int selected)
cur.seek = calloc(ndrive, sizeof(u_int64_t));
cur.rbytes = calloc(ndrive, sizeof(u_int64_t));
cur.wbytes = calloc(ndrive, sizeof(u_int64_t));
+ cur.scale = calloc(ndrive, sizeof(int));
last.time = calloc(ndrive, sizeof(struct timeval));
last.wait = calloc(ndrive, sizeof(struct timeval));
last.waitsum = calloc(ndrive, sizeof(struct timeval));
Index: src/usr.bin/vmstat/drvstats.h
diff -u src/usr.bin/vmstat/drvstats.h:1.5 src/usr.bin/vmstat/drvstats.h:1.6
--- src/usr.bin/vmstat/drvstats.h:1.5 Tue Jul 4 21:19:33 2017
+++ src/usr.bin/vmstat/drvstats.h Sun Jun 30 19:57:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drvstats.h,v 1.5 2017/07/04 21:19:33 mlelstv Exp $ */
+/* $NetBSD: drvstats.h,v 1.6 2019/06/30 19:57:24 he Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -45,6 +45,7 @@ struct _drive {
u_int64_t *seek; /* # of seeks (currently unused). */
u_int64_t *rbytes; /* # of bytes read. */
u_int64_t *wbytes; /* # of bytes
CVS commit: src/usr.bin
Module Name:src Committed By: he Date: Sun Jun 30 19:57:24 UTC 2019 Modified Files: src/usr.bin/systat: vmstat.c vmstat.h src/usr.bin/vmstat: drvstats.c drvstats.h Log Message: Make the scaling of the "bytes written" sticky, so that if we go to K, we don't return to unscaled, and similar for higher scales (though it takes some effort, due to the wide field...) Fixes PR#54334. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/usr.bin/systat/vmstat.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/systat/vmstat.h cvs rdiff -u -r1.12 -r1.13 src/usr.bin/vmstat/drvstats.c cvs rdiff -u -r1.5 -r1.6 src/usr.bin/vmstat/drvstats.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/lib/libc/net
> | So, what did we do by default: allow "_" in hostnames when that's > | explicitly against standard, or not? > > Which standard? 952, referred to from 1123. > There's RFC952 that specifies the format of HOSTS.TXT (from 1985). > (The update in Hosts Requirements isn't material, one way or the other, here.) > > What else? In fact, aside from being listed in HOSTS.TXT, what exactly > is a hostname? Is it defined somewhere? I beleive that in the context of the DNS, the customary definition of a hostname is a DNS name which has either an A or a record registered on it. If I'm not much mistaken, that's the interpretation implemented by BIND's "check-names" feature: when turned on, it allows underscores in DNS names as long as those names don't have A or information registered on them, but either complains or errs depending on the value of the option in BINDs configuration. > But library functions, like the resolver library, and getaddrinfo(), > and the older variants, have no idea why the DNS is being consulted, they > don't know, generally, what rules are intended to apply - they cannot > possibly legitimately object to anything (getaddrinfo() when given a port > as well might guess what rules might apply, but even then it cannot know > for sure .. the name it is being looked up, if the port is "http" (or 80) > or "https" (or 443) then the name being looked up might be the hostname > from a URL, which has some syntax constraints, or it might be the name > configured as the local proxy server, which does not - it is just a key to > use to extract an address from the DNS.) > > There is no rational way that those functions can ever validate name > syntax, and get it correct. I'm not entirely certain I agree. If you're looking up A or information, you're looking up a host name, and some syntactical restrictions may apply (optionally turned on/off?) if you wish to adhere to the restrictions in RFC 952. If you're looking up other information in DNS, I agree that there should be no restrictions on the name being looked up, ref. section 11 in RFC 2187. Regards, - Håvard
Re: CVS commit: src
+ /* maintain a few stats per connection: */ + int t_rcvoopack;/* out-of-order packets received */ + int t_sndrexmitpack;/* retransmit packets sent */ + int t_sndzerowin; /* zero-window updates sent */ Why are those int's? Shouldn't they be uint32_t since they are counters? Only reason is they're int's in FreeBSD. I'll change them to uint32_t's. - Håvard
Re: CVS import: src/crypto/external/bsd/openssh/dist
Potentially-incompatible changes [ ... ] * sshd(8): Support for tcpwrappers/libwrap has been removed. [ ... ] Are there any plans to re-introduce this support locally in the NetBSD code base? Permanently or as part of a transition (to what?) period? Wowza! If I understand correctly, this renders py-denyhosts ineffective, and is IMHO a step in the wrong direction. Regards, - Håvard
Re: CVS import: src/crypto/external/bsd/openssh/dist
In article 20141022.125753.108286502...@uninett.no, Havard Eidnes h...@uninett.no wrote: Potentially-incompatible changes [ ... ] * sshd(8): Support for tcpwrappers/libwrap has been removed. [ ... ] Are there any plans to re-introduce this support locally in the NetBSD code base? Permanently or as part of a transition (to what?) period? Wowza! If I understand correctly, this renders py-denyhosts ineffective, and is IMHO a step in the wrong direction. Well, they removed it but we did not. Good, thanks, that restores some peace of mind. Regards, - Håvard
Re: CVS commit: src/sys/fs/puffs
| Make this build again without debugging enabled; DPRINTF() can end up
| as empty, and in an if conditional, you then need braces if that's the
| only potential body.
That change makes no sense to me - the original code was
if (error)
DPRINTF(());
and even if DPRINTF() could produce nothing, the result would be
if (error)
;
which is perfectly good C (useless, but acceptable). Adding { } around
the ';' changes nothing.
Well...
compile puffs/puffs_vnops.o
/u/build/HEAD/src/sys/fs/puffs/puffs_vnops.c: In function 'zerofill_lastpage':
/u/build/HEAD/src/sys/fs/puffs/puffs_vnops.c:1160:70: error: suggest braces
around empty body in an 'if' statement [-Werror=empty-body]
DPRINTF((zero-fill 0x%lx@0x% PRIx64 = %d\n, len, off, error));
^
cc1: all warnings being treated as errors
*** Failed target: puffs_vnops.o
But in any case, apb changed it yesterday, so DPRINTF() never produces
nothing (personally I'm not sure that should have been needed, but that's
beside the point).
Ah. It's quite possible that my latest update was from before
that commit.
What was the error that resulted in the addition of the {} ?
See above.
Regards,
- Håvard
Re: CVS commit: src/sys/arch/evbarm/conf
Module Name: src
Committed By: matt
Date: Wed Jul 10 20:25:21 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
Log Message:
If using mdsetimage to install a ramdisk install, add the
ramdisk to SYSTEM_DEP so the kernel will be relinked and the
new ramdisk installed.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
With this change, SYSTEM_DEP ends up not including any object
files for the evbarm kernels, causing build failure due to
missing files when we get to the link the kernel step.
The reason is that sys/conf/Makefile.kern.inc has:
SYSTEM_DEP?=Makefile ${SYSTEM_OBJ:O} .gdbinit
So if SYSTEM_DEP is already assinged (it is by this change at
this point), SYSTEM_OBJ will not be added to SYSTEM_DEP.
Now, I don't quite understand why that SYSTEM_DEP?= should not be
SYSTEM_DEP+= instead...
Regards,
- Håvard
Re: CVS commit: src/distrib
On Thu, Apr 22, 2010 at 09:37:51PM +, Tom Spindler wrote:
Log Message:
Change use of ${CP} and ${CHMOD} to ${INSTALL_FILE}, so that if the
target is made un-writeable, the build won't bomb out during an
UPDATE build. OK'ed by mar...@.
on i386, when I try building, I now get:
/usr/local/locdisk/locobj/tools/bin/nbmtree -CSM -k all -N /src/nbsrc/etc
/usr/local/locdisk/locobj/i386/src/nbsrc/destdir.i386/METALOG
/usr/local/locdisk/locobj/i386/src/nbsrc/destdir.i386/METALOG.new
nbmtree: ./cdrom: missing directory in specification
nbmtree: failed at line 34934 of the specification
***
[/usr/local/locdisk/locobj/i386/src/nbsrc/destdir.i386/METALOG.sanitised]
Error code 1
1 error
nbmake: stopped in /src/nbsrc/distrib/sets
For some reason, sparc64 does build successfully, however.
I wonder if it should be HOST_INSTALL_FILE instead of INSTALL_FILE here?
Yes, I saw that. Sorry for not adequatly testing...
Either that, or ${INSTALL} ${COPY}.
Regards,
- Håvard
CVS commit: src/share/mk
Module Name:src
Committed By: he
Date: Mon Mar 8 09:32:18 UTC 2010
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Fix the setting of MKZFS for amd64 and i386, so that the set lists
match up again, and it matches with the comment a few lines above.
To generate a diff of this commit:
cvs rdiff -u -r1.620 -r1.621 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.620 src/share/mk/bsd.own.mk:1.621
--- src/share/mk/bsd.own.mk:1.620 Tue Mar 2 20:49:18 2010
+++ src/share/mk/bsd.own.mk Mon Mar 8 09:32:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.620 2010/03/02 20:49:18 darran Exp $
+# $NetBSD: bsd.own.mk,v 1.621 2010/03/08 09:32:18 he Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -679,7 +679,7 @@
# We want to build zfs only for i386 and amd64 by default for now.
#
.if ${MACHINE} == amd64 || ${MACHINE} == i386
-MKZFS?= no
+MKZFS?= yes
.endif
#
CVS commit: src/share/mk
Module Name:src Committed By: he Date: Mon Mar 8 09:32:18 UTC 2010 Modified Files: src/share/mk: bsd.own.mk Log Message: Fix the setting of MKZFS for amd64 and i386, so that the set lists match up again, and it matches with the comment a few lines above. To generate a diff of this commit: cvs rdiff -u -r1.620 -r1.621 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/sys/compat
Module Name:src
Committed By: he
Date: Wed Mar 3 08:20:39 UTC 2010
Modified Files:
src/sys/compat/common: vfs_syscalls_30.c
src/sys/compat/ibcs2: ibcs2_misc.c
src/sys/compat/irix: irix_dirent.c
src/sys/compat/linux/common: linux_file64.c linux_misc.c
src/sys/compat/linux32/common: linux32_dirent.c
src/sys/compat/osf1: osf1_file.c
src/sys/compat/sunos: sunos_misc.c
src/sys/compat/sunos32: sunos32_misc.c
src/sys/compat/svr4: svr4_misc.c
src/sys/compat/svr4_32: svr4_32_misc.c
Log Message:
When implementing read directory, when there are too many empty entries
in a row, and we need to try to read the next block, and have passed a
non-NULL cookie pointer to VOP_READDIR, ensure that we free the cookie
buffer before re-doing VOP_READDIR, so that we don't leak memory.
This fix is similar to nfs_serv.c revisions 1.115 + 1.124.
This should fix the long-standing problem observed by e.g. using Linux-
emulated programs to take backup of servers, which is one of the problems
which were reported in PR#42661.
Thanks to pooka@ for the hints for traversing the VOP* layer.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/compat/common/vfs_syscalls_30.c
cvs rdiff -u -r1.109 -r1.110 src/sys/compat/ibcs2/ibcs2_misc.c
cvs rdiff -u -r1.23 -r1.24 src/sys/compat/irix/irix_dirent.c
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/linux/common/linux_file64.c
cvs rdiff -u -r1.213 -r1.214 src/sys/compat/linux/common/linux_misc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux32/common/linux32_dirent.c
cvs rdiff -u -r1.37 -r1.38 src/sys/compat/osf1/osf1_file.c
cvs rdiff -u -r1.165 -r1.166 src/sys/compat/sunos/sunos_misc.c
cvs rdiff -u -r1.68 -r1.69 src/sys/compat/sunos32/sunos32_misc.c
cvs rdiff -u -r1.148 -r1.149 src/sys/compat/svr4/svr4_misc.c
cvs rdiff -u -r1.67 -r1.68 src/sys/compat/svr4_32/svr4_32_misc.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/compat/common/vfs_syscalls_30.c
diff -u src/sys/compat/common/vfs_syscalls_30.c:1.30 src/sys/compat/common/vfs_syscalls_30.c:1.31
--- src/sys/compat/common/vfs_syscalls_30.c:1.30 Mon Jan 26 13:00:04 2009
+++ src/sys/compat/common/vfs_syscalls_30.c Wed Mar 3 08:20:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_30.c,v 1.30 2009/01/26 13:00:04 njoly Exp $ */
+/* $NetBSD: vfs_syscalls_30.c,v 1.31 2010/03/03 08:20:38 he Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_syscalls_30.c,v 1.30 2009/01/26 13:00:04 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_syscalls_30.c,v 1.31 2010/03/03 08:20:38 he Exp $);
#include sys/param.h
#include sys/systm.h
@@ -305,8 +305,12 @@
}
/* if we squished out the whole block, try again */
- if (outp == SCARG(uap, buf))
+ if (outp == SCARG(uap, buf)) {
+ if (cookiebuf)
+ free(cookiebuf, M_TEMP);
+ cookiebuf = NULL;
goto again;
+ }
fp-f_offset = off; /* update the vnode offset */
eof:
Index: src/sys/compat/ibcs2/ibcs2_misc.c
diff -u src/sys/compat/ibcs2/ibcs2_misc.c:1.109 src/sys/compat/ibcs2/ibcs2_misc.c:1.110
--- src/sys/compat/ibcs2/ibcs2_misc.c:1.109 Wed Nov 4 21:23:02 2009
+++ src/sys/compat/ibcs2/ibcs2_misc.c Wed Mar 3 08:20:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_misc.c,v 1.109 2009/11/04 21:23:02 rmind Exp $ */
+/* $NetBSD: ibcs2_misc.c,v 1.110 2010/03/03 08:20:39 he Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -95,7 +95,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ibcs2_misc.c,v 1.109 2009/11/04 21:23:02 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ibcs2_misc.c,v 1.110 2010/03/03 08:20:39 he Exp $);
#include sys/param.h
#include sys/systm.h
@@ -472,8 +472,12 @@
}
/* if we squished out the whole block, try again */
- if (outp == SCARG(uap, buf))
+ if (outp == SCARG(uap, buf)) {
+ if (cookiebuf)
+ free(cookiebuf, M_TEMP);
+ cookiebuf = NULL;
goto again;
+ }
fp-f_offset = off; /* update the vnode offset */
eof:
@@ -602,8 +606,12 @@
resid -= ibcs2_reclen;
}
/* if we squished out the whole block, try again */
- if (outp == SCARG(uap, buf))
+ if (outp == SCARG(uap, buf)) {
+ if (cookiebuf)
+ free(cookiebuf, M_TEMP);
+ cookiebuf = NULL;
goto again;
+ }
fp-f_offset = off; /* update the vnode offset */
eof:
*retval = SCARG(uap, nbytes) - resid;
Index: src/sys/compat/irix/irix_dirent.c
diff -u src/sys/compat/irix/irix_dirent.c:1.23 src/sys/compat/irix/irix_dirent.c:1.24
--- src/sys/compat/irix/irix_dirent.c:1.23 Mon Apr 28 20:23:41 2008
+++ src/sys/compat/irix/irix_dirent.c Wed Mar 3 08:20:38 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_dirent.c,v 1.23 2008/04/28 20:23:41 martin Exp $ */
+/* $NetBSD: irix_dirent.c,v 1.24 2010/03/03 08:20:38 he Exp $ */
/*-
* Copyright (c) 1994, 2001, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7
CVS commit: src/sys/compat
Module Name:src Committed By: he Date: Wed Mar 3 08:20:39 UTC 2010 Modified Files: src/sys/compat/common: vfs_syscalls_30.c src/sys/compat/ibcs2: ibcs2_misc.c src/sys/compat/irix: irix_dirent.c src/sys/compat/linux/common: linux_file64.c linux_misc.c src/sys/compat/linux32/common: linux32_dirent.c src/sys/compat/osf1: osf1_file.c src/sys/compat/sunos: sunos_misc.c src/sys/compat/sunos32: sunos32_misc.c src/sys/compat/svr4: svr4_misc.c src/sys/compat/svr4_32: svr4_32_misc.c Log Message: When implementing read directory, when there are too many empty entries in a row, and we need to try to read the next block, and have passed a non-NULL cookie pointer to VOP_READDIR, ensure that we free the cookie buffer before re-doing VOP_READDIR, so that we don't leak memory. This fix is similar to nfs_serv.c revisions 1.115 + 1.124. This should fix the long-standing problem observed by e.g. using Linux- emulated programs to take backup of servers, which is one of the problems which were reported in PR#42661. Thanks to pooka@ for the hints for traversing the VOP* layer. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/compat/common/vfs_syscalls_30.c cvs rdiff -u -r1.109 -r1.110 src/sys/compat/ibcs2/ibcs2_misc.c cvs rdiff -u -r1.23 -r1.24 src/sys/compat/irix/irix_dirent.c cvs rdiff -u -r1.49 -r1.50 src/sys/compat/linux/common/linux_file64.c cvs rdiff -u -r1.213 -r1.214 src/sys/compat/linux/common/linux_misc.c cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux32/common/linux32_dirent.c cvs rdiff -u -r1.37 -r1.38 src/sys/compat/osf1/osf1_file.c cvs rdiff -u -r1.165 -r1.166 src/sys/compat/sunos/sunos_misc.c cvs rdiff -u -r1.68 -r1.69 src/sys/compat/sunos32/sunos32_misc.c cvs rdiff -u -r1.148 -r1.149 src/sys/compat/svr4/svr4_misc.c cvs rdiff -u -r1.67 -r1.68 src/sys/compat/svr4_32/svr4_32_misc.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/amiga/dev
Module Name:src Committed By: he Date: Sun Feb 7 12:52:04 UTC 2010 Modified Files: src/sys/arch/amiga/dev: atzsc.c Log Message: Remove a now-unused variable declaration. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/atzsc.c 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: he Date: Sat Feb 6 23:45:27 UTC 2010 Modified Files: src/bin/sh: Makefile src/games/atc: Makefile src/games/battlestar: Makefile src/games/boggle/boggle: Makefile src/games/canfield/canfield: Makefile src/games/cribbage: Makefile src/games/gomoku: Makefile src/games/hangman: Makefile src/games/hunt/hunt: Makefile src/games/mille: Makefile src/games/phantasia: Makefile src/games/rain: Makefile src/games/robots: Makefile src/games/rogue: Makefile src/games/sail: Makefile src/games/snake/snake: Makefile src/games/worm: Makefile src/games/worms: Makefile src/usr.bin/nvi/build: Makefile src/usr.bin/systat: Makefile src/usr.bin/talk: Makefile src/usr.sbin/altq/altqstat: Makefile src/usr.sbin/ipf/ipfstat: Makefile src/usr.sbin/isdn/isdnmonitor: Makefile Log Message: When using -lcurses, you also need -lterminfo. This fixes the build for sun2, and also builds with LDSTATIC=-static, since archive libraries don't record inter-library dependencies. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/bin/sh/Makefile cvs rdiff -u -r1.28 -r1.29 src/games/atc/Makefile cvs rdiff -u -r1.9 -r1.10 src/games/battlestar/Makefile cvs rdiff -u -r1.9 -r1.10 src/games/boggle/boggle/Makefile cvs rdiff -u -r1.7 -r1.8 src/games/canfield/canfield/Makefile cvs rdiff -u -r1.12 -r1.13 src/games/cribbage/Makefile cvs rdiff -u -r1.4 -r1.5 src/games/gomoku/Makefile cvs rdiff -u -r1.7 -r1.8 src/games/hangman/Makefile cvs rdiff -u -r1.6 -r1.7 src/games/hunt/hunt/Makefile cvs rdiff -u -r1.9 -r1.10 src/games/mille/Makefile cvs rdiff -u -r1.33 -r1.34 src/games/phantasia/Makefile cvs rdiff -u -r1.10 -r1.11 src/games/rain/Makefile cvs rdiff -u -r1.15 -r1.16 src/games/robots/Makefile cvs rdiff -u -r1.16 -r1.17 src/games/rogue/Makefile cvs rdiff -u -r1.16 -r1.17 src/games/sail/Makefile cvs rdiff -u -r1.9 -r1.10 src/games/snake/snake/Makefile cvs rdiff -u -r1.8 -r1.9 src/games/worm/Makefile cvs rdiff -u -r1.9 -r1.10 src/games/worms/Makefile cvs rdiff -u -r1.12 -r1.13 src/usr.bin/nvi/build/Makefile cvs rdiff -u -r1.35 -r1.36 src/usr.bin/systat/Makefile cvs rdiff -u -r1.7 -r1.8 src/usr.bin/talk/Makefile cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/altq/altqstat/Makefile cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/ipf/ipfstat/Makefile cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/isdn/isdnmonitor/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libterminfo
Module Name:src Committed By: he Date: Fri Feb 5 14:39:07 UTC 2010 Modified Files: src/lib/libterminfo: term.h term_private.h Log Message: More adaptation for ports with unsigned char as char. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/term.h cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/term_private.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/tic
Module Name:src Committed By: he Date: Fri Feb 5 14:40:07 UTC 2010 Modified Files: src/usr.bin/tic: tic.c Log Message: More adaptation for ports where char is unsigned char. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/tic/tic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: he
Date: Thu Jan 14 13:45:51 UTC 2010
Modified Files:
src/distrib/sets: sets.subr
Log Message:
In addition to setting module=no if ${MKKMOD} is no, also
set kmod=no. This should get evbppc building correctly again.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/sets.subr
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: he Date: Wed Jan 13 14:24:58 UTC 2010 Modified Files: src/distrib/acorn32/ramdisk: Makefile src/sys/arch/acorn32/conf: INSTALL Log Message: Bump the ramdisk size so that the contents fits again. OK'ed by reinoud@ To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/acorn32/ramdisk/Makefile cvs rdiff -u -r1.55 -r1.56 src/sys/arch/acorn32/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: he Date: Sat Jan 2 07:53:29 UTC 2010 Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: Remove a shadowed and unused local declaration so that this builds again. To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 src/sys/arch/arm/arm32/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Sat, Dec 05, 2009 at 04:29:15PM +, Antti Kantee wrote: Log Message: Remove support for NetBSD/playstation2. Does this mean we can get rid of cross/mipsEEel-netbsd in pkgsrc? We should :) - Håvard
