CVS commit: src/etc/defaults
Module Name:src Committed By: nakayama Date: Fri May 3 20:48:59 UTC 2024 Modified Files: src/etc/defaults: npf.boot.conf Log Message: Allow DHCPv6 so that dhcpcd(8) does not complain at boot when using ia_pd option. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/etc/defaults/npf.boot.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/defaults/npf.boot.conf diff -u src/etc/defaults/npf.boot.conf:1.3 src/etc/defaults/npf.boot.conf:1.4 --- src/etc/defaults/npf.boot.conf:1.3 Sun Aug 9 23:43:58 2020 +++ src/etc/defaults/npf.boot.conf Fri May 3 20:48:58 2024 @@ -1,4 +1,4 @@ -# $NetBSD: npf.boot.conf,v 1.3 2020/08/09 23:43:58 gutteridge Exp $ +# $NetBSD: npf.boot.conf,v 1.4 2024/05/03 20:48:58 nakayama Exp $ # # /etc/defaults/npf.boot.conf -- # initial configuration for npf(7) @@ -28,6 +28,8 @@ pass stateful out proto icmp icmp-type e # Allow DHCP pass out family inet4 proto udp from any port bootpc to any port bootps pass in family inet4 proto udp from any port bootps to any port bootpc +pass out family inet6 proto udp from any port "dhcpv6-client" to any port "dhcpv6-server" +pass in family inet6 proto udp from any port "dhcpv6-server" to any port "dhcpv6-client" # Allow IPv6 router/neighbor solicitation and advertisement. pass out family inet6 proto ipv6-icmp icmp-type rtsol all
CVS commit: src/etc/defaults
Module Name:src Committed By: nakayama Date: Fri May 3 20:48:59 UTC 2024 Modified Files: src/etc/defaults: npf.boot.conf Log Message: Allow DHCPv6 so that dhcpcd(8) does not complain at boot when using ia_pd option. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/etc/defaults/npf.boot.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: nakayama Date: Sat Apr 13 08:50:19 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 Log Message: "./usr/libdata/debug/usr/lib/@ARCH_SUBDIR@/security" directory is created by mtree regardless of MKDEBUG option, so move the entry from debug32 to base32. To generate a diff of this commit: cvs rdiff -u -r1.1343 -r1.1344 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base32/ad.aarch64 \ src/distrib/sets/lists/base32/ad.mips64eb \ src/distrib/sets/lists/base32/ad.mips64el \ src/distrib/sets/lists/base32/ad.mipsn64eb \ src/distrib/sets/lists/base32/ad.mipsn64el \ src/distrib/sets/lists/base32/ad.powerpc64 \ src/distrib/sets/lists/base32/ad.riscv64 \ src/distrib/sets/lists/base32/md.sparc64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug32/ad.aarch64 \ src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el \ src/distrib/sets/lists/debug32/ad.powerpc64 \ src/distrib/sets/lists/debug32/ad.riscv64 \ src/distrib/sets/lists/debug32/md.sparc64 cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1343 src/distrib/sets/lists/base/mi:1.1344 --- src/distrib/sets/lists/base/mi:1.1343 Thu Apr 11 02:15:39 2024 +++ src/distrib/sets/lists/base/mi Sat Apr 13 08:50:18 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1343 2024/04/11 02:15:39 riastradh Exp $ +# $NetBSD: mi,v 1.1344 2024/04/13 08:50:18 nakayama Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1267,7 +1267,7 @@ ./usr/libdata/debug/usr/lib/i18n base-i18n-root ./usr/libdata/debug/usr/lib/named base-sys-usr ./usr/libdata/debug/usr/lib/npf base-obsolete obsolete -./usr/libdata/debug/usr/lib/security base-sys-usr compatfile +./usr/libdata/debug/usr/lib/security base-sys-usr ./usr/libdata/debug/usr/libexec base-sys-usr ./usr/libdata/debug/usr/libexec/ching base-sys-usr ./usr/libdata/debug/usr/libexec/lpr base-sys-usr Index: src/distrib/sets/lists/base32/ad.aarch64 diff -u src/distrib/sets/lists/base32/ad.aarch64:1.1 src/distrib/sets/lists/base32/ad.aarch64:1.2 --- src/distrib/sets/lists/base32/ad.aarch64:1.1 Tue Apr 9 15:17:22 2024 +++ src/distrib/sets/lists/base32/ad.aarch64 Sat Apr 13 08:50:18 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.1 2024/04/09 15:17:22 nia Exp $ +# $NetBSD: ad.aarch64,v 1.2 2024/04/13 08:50:18 nakayama Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-compat-shlib compat,npf ./lib/eabi/npf/ext_log.so base-compat-shlib compat,npf @@ -1029,7 +1029,9 @@ ./usr/libdata/debug/lib/eabihf/npf base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabi/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/eabi/security base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf base-compat-shlib compat ./usr/libdata/debug/usr/lib/eabihf/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/eabihf/security base-compat-shlib compat ./usr/libexec/ld.elf_so-eabi base-sys-shlib compat,pic ./usr/libexec/ld.elf_so-eabihf base-sys-shlib compat,pic Index: src/distrib/sets/lists/base32/ad.mips64eb diff -u src/distrib/sets/lists/base32/ad.mips64eb:1.1 src/distrib/sets/lists/base32/ad.mips64eb:1.2 --- src/distrib/sets/lists/base32/ad.mips64eb:1.1 Tue Apr 9 15:17:22 2024 +++ src/distrib/sets/lists/base32/ad.mips64eb Sat Apr 13 08:50:19 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.1 2024/04/09 15:17:22 nia Exp $ +# $NetBSD: ad.mips64eb,v 1.2 2024/04/13 08:50:19 nakayama Exp $ ./lib/64 base-compat-shlib compat ./lib/64/npf base-compat-shlib compat,npf ./lib/64/npf/ext_log.so base-compat-shlib compat,npf @@ -1035,7 +1035,9 @@ ./usr/libdata/debug/lib/o32/npf base-compat-shlib compat ./usr/libdata/debug/usr/lib/64 base-compat-shlib compat ./usr/libdata/debug/usr/lib/64/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/64/security base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32 base-compat-shlib compat ./usr/libdata/debug/usr/lib/o32/i18n base-compat-shlib compat +./usr/libdata/debug/usr/lib/o32/security base-compat-shlib compat ./usr/libexec/ld.e
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: nakayama Date: Sat Apr 13 08:50:19 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/base32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 src/distrib/sets/lists/debug32: ad.aarch64 ad.mips64eb ad.mips64el ad.mipsn64eb ad.mipsn64el ad.powerpc64 ad.riscv64 md.amd64 md.sparc64 Log Message: "./usr/libdata/debug/usr/lib/@ARCH_SUBDIR@/security" directory is created by mtree regardless of MKDEBUG option, so move the entry from debug32 to base32. To generate a diff of this commit: cvs rdiff -u -r1.1343 -r1.1344 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base32/ad.aarch64 \ src/distrib/sets/lists/base32/ad.mips64eb \ src/distrib/sets/lists/base32/ad.mips64el \ src/distrib/sets/lists/base32/ad.mipsn64eb \ src/distrib/sets/lists/base32/ad.mipsn64el \ src/distrib/sets/lists/base32/ad.powerpc64 \ src/distrib/sets/lists/base32/ad.riscv64 \ src/distrib/sets/lists/base32/md.sparc64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base32/md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug32/ad.aarch64 \ src/distrib/sets/lists/debug32/ad.mips64eb \ src/distrib/sets/lists/debug32/ad.mips64el \ src/distrib/sets/lists/debug32/ad.mipsn64eb \ src/distrib/sets/lists/debug32/ad.mipsn64el \ src/distrib/sets/lists/debug32/ad.powerpc64 \ src/distrib/sets/lists/debug32/ad.riscv64 \ src/distrib/sets/lists/debug32/md.sparc64 cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/debug32/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: nakayama Date: Mon Apr 8 10:26:17 UTC 2024 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: Remove unnecessary characters left over from the previous commit. To generate a diff of this commit: cvs rdiff -u -r1.977 -r1.978 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.977 src/distrib/sets/lists/base/shl.mi:1.978 --- src/distrib/sets/lists/base/shl.mi:1.977 Fri Apr 5 01:15:59 2024 +++ src/distrib/sets/lists/base/shl.mi Mon Apr 8 10:26:17 2024 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.977 2024/04/05 01:15:59 christos Exp $ +# $NetBSD: shl.mi,v 1.978 2024/04/08 10:26:17 nakayama Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1002,4 +1002,4 @@ ./usr/lib/security/pam_u2f.so.4 base-sys-shlib compatfile,pam ./usr/lib/security/pam_unix.so.4 base-sys-shlib compatfile,pam ./usr/libexec/ld.elf_sobase-sys-shlib dynamicroot -./usr/libexec/named/filter-.so base-obsolete obsoleteind-bin +./usr/libexec/named/filter-.so base-obsolete obsolete
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: nakayama Date: Mon Apr 8 10:26:17 UTC 2024 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: Remove unnecessary characters left over from the previous commit. To generate a diff of this commit: cvs rdiff -u -r1.977 -r1.978 src/distrib/sets/lists/base/shl.mi 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: nakayama Date: Tue Mar 28 10:54:13 UTC 2023 Modified Files: src/sys/arch/mips/include: bus_space_defs.h types.h Log Message: Add missing PRIuBUSSIZE to mips. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/include/bus_space_defs.h cvs rdiff -u -r1.77 -r1.78 src/sys/arch/mips/include/types.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/bus_space_defs.h diff -u src/sys/arch/mips/include/bus_space_defs.h:1.4 src/sys/arch/mips/include/bus_space_defs.h:1.5 --- src/sys/arch/mips/include/bus_space_defs.h:1.4 Sun Jul 26 08:08:41 2020 +++ src/sys/arch/mips/include/bus_space_defs.h Tue Mar 28 10:54:13 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space_defs.h,v 1.4 2020/07/26 08:08:41 simonb Exp $ */ +/* $NetBSD: bus_space_defs.h,v 1.5 2023/03/28 10:54:13 nakayama Exp $ */ /*- * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -112,11 +112,13 @@ typedef int64_t bus_addr_t; typedef uint64_t bus_size_t; #define PRIxBUSADDR PRIx64 #define PRIxBUSSIZE PRIx64 +#define PRIuBUSSIZE PRIu64 #else typedef paddr_t bus_addr_t; typedef psize_t bus_size_t; #define PRIxBUSADDR PRIxPADDR #define PRIxBUSSIZE PRIxPSIZE +#define PRIuBUSSIZE PRIuPSIZE #endif /* Index: src/sys/arch/mips/include/types.h diff -u src/sys/arch/mips/include/types.h:1.77 src/sys/arch/mips/include/types.h:1.78 --- src/sys/arch/mips/include/types.h:1.77 Thu Jul 7 10:06:02 2022 +++ src/sys/arch/mips/include/types.h Tue Mar 28 10:54:13 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.77 2022/07/07 10:06:02 martin Exp $ */ +/* $NetBSD: types.h,v 1.78 2023/03/28 10:54:13 nakayama Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -74,12 +74,14 @@ typedef __uint64_t psize_t; #define PRIxPADDR PRIx64 #define PRIxPSIZE PRIx64 #define PRIdPSIZE PRId64 +#define PRIuPSIZE PRIu64 #else typedef __uint32_t paddr_t; typedef __uint32_t psize_t; #define PRIxPADDR PRIx32 #define PRIxPSIZE PRIx32 #define PRIdPSIZE PRId32 +#define PRIuPSIZE PRIu32 #endif #ifdef _LP64 typedef __uint64_t vaddr_t;
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: nakayama Date: Tue Mar 28 10:54:13 UTC 2023 Modified Files: src/sys/arch/mips/include: bus_space_defs.h types.h Log Message: Add missing PRIuBUSSIZE to mips. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/include/bus_space_defs.h cvs rdiff -u -r1.77 -r1.78 src/sys/arch/mips/include/types.h 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: nakayama Date: Mon Mar 27 14:56:40 UTC 2023 Modified Files: src/sys/dev/pci: if_vioif.c virtio.c Log Message: Use PRIuBUSSIZE to print bus_size_t variables. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/dev/pci/if_vioif.c cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/virtio.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: nakayama
Date: Mon Mar 27 14:56:40 UTC 2023
Modified Files:
src/sys/dev/pci: if_vioif.c virtio.c
Log Message:
Use PRIuBUSSIZE to print bus_size_t variables.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/pci/if_vioif.c
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/virtio.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_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.106 src/sys/dev/pci/if_vioif.c:1.107
--- src/sys/dev/pci/if_vioif.c:1.106 Fri Mar 24 13:16:15 2023
+++ src/sys/dev/pci/if_vioif.c Mon Mar 27 14:56:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.106 2023/03/24 13:16:15 yamaguchi Exp $ */
+/* $NetBSD: if_vioif.c,v 1.107 2023/03/27 14:56:40 nakayama Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.106 2023/03/24 13:16:15 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.107 2023/03/27 14:56:40 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1185,7 +1185,7 @@ vioif_alloc_mems(struct vioif_softc *sc)
&sc->sc_segs[0], 1, &rsegs, BUS_DMA_NOWAIT);
if (r != 0) {
aprint_error_dev(sc->sc_dev,
- "DMA memory allocation failed, size %zu, "
+ "DMA memory allocation failed, size %" PRIuBUSSIZE ", "
"error code %d\n", dmamemsize, r);
goto err_none;
}
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.70 src/sys/dev/pci/virtio.c:1.71
--- src/sys/dev/pci/virtio.c:1.70 Mon Mar 27 10:48:46 2023
+++ src/sys/dev/pci/virtio.c Mon Mar 27 14:56:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $ */
+/* $NetBSD: virtio.c,v 1.71 2023/03/27 14:56:40 nakayama Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.70 2023/03/27 10:48:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.71 2023/03/27 14:56:40 nakayama Exp $");
#include
#include
@@ -866,12 +866,12 @@ virtio_alloc_vq(struct virtio_softc *sc,
virtio_reset_vq(sc, vq);
aprint_verbose_dev(sc->sc_dev,
- "allocated %zu byte for virtqueue %d for %s, size %d\n",
- allocsize, vq->vq_index, name, vq_num);
+ "allocated %" PRIuBUSSIZE " byte for virtqueue %d for %s, "
+ "size %d\n", allocsize, vq->vq_index, name, vq_num);
if (size_indirect > 0)
aprint_verbose_dev(sc->sc_dev,
- "using %zu byte (%d entries) indirect descriptors\n",
- size_indirect, maxnsegs * vq_num);
+ "using %" PRIuBUSSIZE " byte (%d entries) indirect "
+ "descriptors\n", size_indirect, maxnsegs * vq_num);
return 0;
CVS commit: src/sys/kern
Module Name:src
Committed By: nakayama
Date: Fri Sep 2 06:01:38 UTC 2022
Modified Files:
src/sys/kern: subr_lockdebug.c
Log Message:
Fix "error: cast from pointer to integer of different size" on
sparc build.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/kern/subr_lockdebug.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/kern/subr_lockdebug.c
diff -u src/sys/kern/subr_lockdebug.c:1.82 src/sys/kern/subr_lockdebug.c:1.83
--- src/sys/kern/subr_lockdebug.c:1.82 Wed Aug 31 05:24:41 2022
+++ src/sys/kern/subr_lockdebug.c Fri Sep 2 06:01:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_lockdebug.c,v 1.82 2022/08/31 05:24:41 msaitoh Exp $ */
+/* $NetBSD: subr_lockdebug.c,v 1.83 2022/09/02 06:01:38 nakayama Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.82 2022/08/31 05:24:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.83 2022/09/02 06:01:38 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -729,7 +729,7 @@ lockdebug_dump(lwp_t *l, lockdebug_t *ld
char locksym[128], initsym[128], lockedsym[128], unlockedsym[128];
#ifdef DDB
- db_symstr(locksym, sizeof(locksym), (db_expr_t)ld->ld_lock,
+ db_symstr(locksym, sizeof(locksym), (db_expr_t)(intptr_t)ld->ld_lock,
DB_STGY_ANY);
db_symstr(initsym, sizeof(initsym), (db_expr_t)ld->ld_initaddr,
DB_STGY_PROC);
@@ -855,7 +855,7 @@ lockdebug_lock_print(void *addr,
uintptr_t word;
(*pr)("WARNING: lock print is unreliable without LOCKDEBUG\n");
- db_symstr(sym, sizeof(sym), (db_expr_t)addr, DB_STGY_ANY);
+ db_symstr(sym, sizeof(sym), (db_expr_t)(intptr_t)addr, DB_STGY_ANY);
db_read_bytes((db_addr_t)addr, sizeof(word), (char *)&word);
(*pr)("%s: possible owner: %p, bits: 0x%" PRIxPTR "\n", sym,
(void *)(word & ~(uintptr_t)ALIGNBYTES), word & ALIGNBYTES);
@@ -1075,7 +1075,8 @@ lockdebug_abort(const char *func, size_t
char locksym[128];
#ifdef DDB
- db_symstr(locksym, sizeof(locksym), (db_expr_t)lock, DB_STGY_ANY);
+ db_symstr(locksym, sizeof(locksym), (db_expr_t)(intptr_t)lock,
+ DB_STGY_ANY);
#else
snprintf(locksym, sizeof(locksym), "%#018lx", (unsigned long)lock);
#endif
CVS commit: src/sys/kern
Module Name:src Committed By: nakayama Date: Fri Sep 2 06:01:38 UTC 2022 Modified Files: src/sys/kern: subr_lockdebug.c Log Message: Fix "error: cast from pointer to integer of different size" on sparc build. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/kern/subr_lockdebug.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/ic
Module Name:src
Committed By: nakayama
Date: Wed Feb 2 22:43:14 UTC 2022
Modified Files:
src/sys/dev/ic: spdmem.c
Log Message:
Fix misplaced comma.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/spdmem.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/ic/spdmem.c
diff -u src/sys/dev/ic/spdmem.c:1.37 src/sys/dev/ic/spdmem.c:1.38
--- src/sys/dev/ic/spdmem.c:1.37 Sat Jan 29 08:17:03 2022
+++ src/sys/dev/ic/spdmem.c Wed Feb 2 22:43:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.37 2022/01/29 08:17:03 msaitoh Exp $ */
+/* $NetBSD: spdmem.c,v 1.38 2022/02/02 22:43:14 nakayama Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.37 2022/01/29 08:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.38 2022/02/02 22:43:14 nakayama Exp $");
#include
#include
@@ -81,9 +81,9 @@ static const char* const spdmem_basic_ty
"unknown",
"DDR4E SDRAM",
"LPDDR3 SDRAM",
- "LPDDR4 SDRAM"
+ "LPDDR4 SDRAM",
"LPDDR4X SDRAM",
- "DDR5 SDRAM",
+ "DDR5 SDRAM"
};
static const char* const spdmem_ddr4_module_types[] = {
CVS commit: src/sys/dev/ic
Module Name:src Committed By: nakayama Date: Wed Feb 2 22:43:14 UTC 2022 Modified Files: src/sys/dev/ic: spdmem.c Log Message: Fix misplaced comma. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/spdmem.c 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/tls
>>> Joerg Sonnenberger wrote > > On Fri, Nov 22, 2019 at 08:53:25AM +0900, Takeshi Nakayama wrote: > > >>> Takeshi Nakayama wrote > > > > > >>> Joerg Sonnenberger wrote > > > > > > > On Thu, Nov 21, 2019 at 11:06:16PM +, Takeshi Nakayama wrote: > > > > > Module Name: src > > > > > Committed By: nakayama > > > > > Date: Thu Nov 21 23:06:16 UTC 2019 > > > > > > > > > > Modified Files: > > > > > src/lib/libc/tls: tls.c > > > > > > > > > > Log Message: > > > > > Fix PR/54074 and PR/54093 completely. > > > > > > > > > > More similar to the ld.elf_so logic, it is necessary to align with > > > > > p_align first. Also, invert the #ifdef condition for consistency. > > > > > > > > This commit just wastes space without reason. > > > > > > No, without this commit the TLS offset calculation is mismatch if > > > alignof(max_align_t)) != p_align. > > > > Ah, this is wrong. > > Correctly, the TLS offset calculation is mismatch with what ld(1) > > expected if p_memsz is not aligned with p_align. > > For TLS variant I, it literally just adds padding at the end of the > allocation. For TLS variant II, it is redundant, because the rounding is > already done in with max_align_t. We do not support p_align > malloc > alignment and the patch is certainly nowhere near enough to change that. > It is actively harmful in that it can make people believe that it could > ever work. I don't want to do anything about the case of p_align > malloc alignment. I just want to fix an usual 32-bit sparc statically linked binaries not working properly. The new jemalloc now uses TLS, and the 32-bit sparc statically linked binary ELF header looks like this: % readelf -l rescue/sh | egrep 'MemSiz|TLS' Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align TLS0x6dc000 0x0075c000 0x0075c000 0x00b10 0x00b14 R 0x8 The point is when MemSiz (p_memsz) is not aligned with Align (p_align) as above. In tls.c rev 1.13: tls_size = p_memsz --> 0x00b14 tls_allocation = roundup2(tls_size, alignof(max_align_t)) --> 0x00b18 tcb = calloc() + tls_allocation --> calloc() + 0x00b18 p = tcb - tls_size --> calloc() + 4 memcpy(p, tls_initaddr, tls_initsize) So, the TLS initialization image is copied to calloc() + 4. However, ld(1) assumes that the TLS area starts with: tcb - roundup2(p_memsz, p_align) = tcb - 0x00b18 --> calloc() Since this is 4 bytes different, the initial value of the thread local variable is not set correctly. To fix this problem, I added the same thing as this line in ld.elf_so: https://nxr.netbsd.org/xref/src/libexec/ld.elf_so/tls.c#236 * obj->tlssize = p_memsz, obj->tlsalign = p_align -- Takeshi Nakayama
Re: CVS commit: src/lib/libc/tls
>>> Takeshi Nakayama wrote > >>> Joerg Sonnenberger wrote > > > On Thu, Nov 21, 2019 at 11:06:16PM +, Takeshi Nakayama wrote: > > > Module Name: src > > > Committed By: nakayama > > > Date: Thu Nov 21 23:06:16 UTC 2019 > > > > > > Modified Files: > > > src/lib/libc/tls: tls.c > > > > > > Log Message: > > > Fix PR/54074 and PR/54093 completely. > > > > > > More similar to the ld.elf_so logic, it is necessary to align with > > > p_align first. Also, invert the #ifdef condition for consistency. > > > > This commit just wastes space without reason. > > No, without this commit the TLS offset calculation is mismatch if > alignof(max_align_t)) != p_align. Ah, this is wrong. Correctly, the TLS offset calculation is mismatch with what ld(1) expected if p_memsz is not aligned with p_align. -- Takeshi Nakayama
Re: CVS commit: src/lib/libc/tls
>>> Joerg Sonnenberger wrote > On Thu, Nov 21, 2019 at 11:06:16PM +0000, Takeshi Nakayama wrote: > > Module Name:src > > Committed By: nakayama > > Date: Thu Nov 21 23:06:16 UTC 2019 > > > > Modified Files: > > src/lib/libc/tls: tls.c > > > > Log Message: > > Fix PR/54074 and PR/54093 completely. > > > > More similar to the ld.elf_so logic, it is necessary to align with > > p_align first. Also, invert the #ifdef condition for consistency. > > This commit just wastes space without reason. No, without this commit the TLS offset calculation is mismatch if alignof(max_align_t)) != p_align. -- Takeshi Nakayama
CVS commit: src/lib/libc/tls
Module Name:src Committed By: nakayama Date: Thu Nov 21 23:06:16 UTC 2019 Modified Files: src/lib/libc/tls: tls.c Log Message: Fix PR/54074 and PR/54093 completely. More similar to the ld.elf_so logic, it is necessary to align with p_align first. Also, invert the #ifdef condition for consistency. Should fix regression for static linking binaries: http://releng.netbsd.org/b5reports/sparc/commits-2019.11.html#2019.11.10.23.39.03 http://releng.netbsd.org/b5reports/sparc64/commits-2019.11.html#2019.11.16.04.10.33 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libc/tls/tls.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/tls
Module Name:src
Committed By: nakayama
Date: Thu Nov 21 23:06:16 UTC 2019
Modified Files:
src/lib/libc/tls: tls.c
Log Message:
Fix PR/54074 and PR/54093 completely.
More similar to the ld.elf_so logic, it is necessary to align with
p_align first. Also, invert the #ifdef condition for consistency.
Should fix regression for static linking binaries:
http://releng.netbsd.org/b5reports/sparc/commits-2019.11.html#2019.11.10.23.39.03
http://releng.netbsd.org/b5reports/sparc64/commits-2019.11.html#2019.11.16.04.10.33
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/tls/tls.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/tls/tls.c
diff -u src/lib/libc/tls/tls.c:1.12 src/lib/libc/tls/tls.c:1.13
--- src/lib/libc/tls/tls.c:1.12 Thu Nov 7 22:25:21 2019
+++ src/lib/libc/tls/tls.c Thu Nov 21 23:06:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.12 2019/11/07 22:25:21 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.13 2019/11/21 23:06:15 nakayama Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: tls.c,v 1.12 2019/11/07 22:25:21 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.13 2019/11/21 23:06:15 nakayama Exp $");
#include "namespace.h"
@@ -85,10 +85,10 @@ _rtld_tls_allocate(void)
uint8_t *p;
if (initial_thread_tcb == NULL) {
-#ifdef __HAVE_TLS_VARIANT_II
- tls_allocation = roundup2(tls_size, alignof(max_align_t));
-#else
+#ifdef __HAVE_TLS_VARIANT_I
tls_allocation = tls_size;
+#else
+ tls_allocation = roundup2(tls_size, alignof(max_align_t));
#endif
initial_thread_tcb = p = mmap(NULL,
@@ -152,7 +152,11 @@ __libc_static_tls_setup_cb(struct dl_phd
continue;
tls_initaddr = (void *)(phdr->p_vaddr + data->dlpi_addr);
tls_initsize = phdr->p_filesz;
+#ifdef __HAVE_TLS_VARIANT_I
tls_size = phdr->p_memsz;
+#else
+ tls_size = roundup2(phdr->p_memsz, phdr->p_align);
+#endif
}
return 0;
}
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: nakayama Date: Wed Nov 13 10:06:39 UTC 2019 Modified Files: src/sys/arch/sparc64/include: ctlreg.h psl.h Log Message: Revert workarounds for clang. In-tree clang can now handle the "r" asm constraint for 64-bit values properly. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc64/include/ctlreg.h cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sparc64/include/psl.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/sparc64/include
Module Name:src
Committed By: nakayama
Date: Wed Nov 13 10:06:39 UTC 2019
Modified Files:
src/sys/arch/sparc64/include: ctlreg.h psl.h
Log Message:
Revert workarounds for clang.
In-tree clang can now handle the "r" asm constraint for 64-bit values properly.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/sparc64/include/ctlreg.h
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/sparc64/include/psl.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/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.66 src/sys/arch/sparc64/include/ctlreg.h:1.67
--- src/sys/arch/sparc64/include/ctlreg.h:1.66 Fri Apr 5 23:09:18 2019
+++ src/sys/arch/sparc64/include/ctlreg.h Wed Nov 13 10:06:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.66 2019/04/05 23:09:18 nakayama Exp $ */
+/* $NetBSD: ctlreg.h,v 1.67 2019/11/13 10:06:38 nakayama Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -485,13 +485,12 @@
#ifdef __arch64__
/* 64-bit kernel, non-constant */
-#define SPARC64_LD_NONCONST(ld, type) \
+#define SPARC64_LD_NONCONST(ld) \
__asm volatile( \
"wr %2,%%g0,%%asi; "\
#ld " [%1]%%asi,%0 "\
: "=r" (_v) \
- : "r" ((__uintptr_t)(loc)), "r" (asi), \
- "m" (*(type *)(__uintptr_t)(loc)))
+ : "r" ((__uintptr_t)(loc)), "r" (asi))
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define SPARC64_LD_DEF(ld, type, vtype) \
@@ -502,10 +501,9 @@ static __inline type ld(paddr_t loc, int
__asm volatile( \
#ld " [%1]%2,%0 " \
: "=r" (_v) \
- : "r" ((__uintptr_t)(loc)), "n" (asi), \
- "m" (*(type *)(__uintptr_t)(loc))); \
+ : "r" ((__uintptr_t)(loc)), "n" (asi)); \
else\
- SPARC64_LD_NONCONST(ld, type);\
+ SPARC64_LD_NONCONST(ld);\
return _v; \
}
#else
@@ -513,7 +511,7 @@ static __inline type ld(paddr_t loc, int
static __inline type ld(paddr_t loc, int asi)\
{ \
vtype _v; \
- SPARC64_LD_NONCONST(ld, type); \
+ SPARC64_LD_NONCONST(ld); \
return _v; \
}
#endif
@@ -679,12 +677,12 @@ SPARC64_LD_DEF64(ldxa, uint64_t)
#ifdef __arch64__
/* 64-bit kernel, non-constant */
-#define SPARC64_ST_NONCONST(st, type) \
+#define SPARC64_ST_NONCONST(st) \
__asm volatile( \
- "wr %3,%%g0,%%asi; "\
- #st " %1,[%2]%%asi "\
- : "=m" (*(type *)(__uintptr_t)(loc)) \
- : "r" (value), "r" ((__uintptr_t)(loc)), "r" (asi))
+ "wr %2,%%g0,%%asi; "\
+ #st " %0,[%1]%%asi "\
+ : : "r" (value), "r" ((__uintptr_t)(loc)), \
+ "r" (asi))
#if defined(__GNUC__) && defined(__OPTIMIZE__)
#define SPARC64_ST_DEF(st, type) \
@@ -692,18 +690,17 @@ static __inline void st(paddr_t loc, int
{ \
if (__builtin_constant_p(asi)) \
__asm volatile( \
- #st " %1,[%2]%3 " \
- : "=m" (*(type *)(__uintptr_t)(loc)) \
- : "r" (value), "r" ((__uintptr_t)(loc)), \
- "n" (asi)); \
+ #st " %0,[%1]%2 " \
+ : : "r" (value), "r" ((__uintptr_t)(loc)), \
+ "n" (asi)); \
else\
- SPARC64_ST_NONCONST(st, type);\
+ SPARC64_ST_NONCONST(st);\
}
#else
#define SPARC64_ST_DEF(st, type) \
static __inline void st(paddr_t loc, int asi, type value) \
{ \
- SPARC64_ST_NONCONST(st, type); \
+ SPARC64_ST_NONCONST(st); \
}
#endif
#define SPARC64_ST_DEF64(st, type) SPARC64_ST_DEF(st, type)
Index: src/sys/arch/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.60 src/sys/arch/sparc64/include/psl.h:1.61
--- src/sys/arch/sparc64/include/psl.h:1.60 Sat Apr 6 21:40:15 2019
+++ src/sys/arch/sparc64/include/psl.h Wed Nov 13 10:06:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.60 2019/04/06 21:40:15 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.61 2019/11/13 10:06:38 nakayama Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -322,13 +322,11 @@ static __inline void set##name(type _val
__asm volatile(#wr " %0,0,%" #reg : : "r" (_val) : "memory"); \
}
-/*
- * XXX: clang's "r" constraint cannot handle 64-bit,
- * so use 32-bit kernel code as a workaround.
- */
-#if defined(__arch64__) && !defined(__clang__)
+#ifdef __arch64__
#define SPARC64_RDCONST64_DEF(rd, name, reg) \
SPARC64_RDCONST_DEF(rd, name, reg, uint64_t)
+#define SPARC64_RD64_DEF(rd, name, reg) SPARC64_RD_DEF(rd, name, reg, uint64_t)
+#define SPARC64_WR64_DEF(wr, name, reg) SPARC64_WR_DEF(wr, name, reg, uint64_t)
#else
#define SPARC64_RDCONST64_DEF(rd, name, reg)\
static __inline __constfunc uint64_t get##name(void) \
@@ -338,12 +336,6 @@ static __inline __constfunc uint64_t get
: "=r" (_hi), "=r" (_lo) : : constasm_clobbers); \
return ((uint64_t)_hi << 32) | _lo;\
}
-#endif
-
-#ifdef __arch64__
-#define SPARC64_RD64_DEF(rd, name, reg) SPARC64_RD_DEF(rd, name, reg, uint64_t)
-#define SPARC64_WR64_DEF(wr, name, reg) SPARC64_WR_DEF(wr, name, reg, uint64_t)
-#else
#define SPA
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: nakayama
Date: Tue Sep 24 13:27:39 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
Add ${DEST_DIR} prefix to check target directory not host directory.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: nakayama
Date: Tue Sep 24 13:27:39 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
Add ${DEST_DIR} prefix to check target directory not host directory.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.6 src/usr.sbin/postinstall/postinstall.in:1.7
--- src/usr.sbin/postinstall/postinstall.in:1.6 Thu Sep 12 21:56:55 2019
+++ src/usr.sbin/postinstall/postinstall.in Tue Sep 24 13:27:39 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.6 2019/09/12 21:56:55 uwe Exp $
+# $NetBSD: postinstall.in,v 1.7 2019/09/24 13:27:39 nakayama Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2254,7 +2254,7 @@ getarchsubdirs() {
getcompatlibdirs() {
for i in $(getarchsubdirs); do
echo $i 1>&2
- if [ -d /usr/lib/$i ]; then
+ if [ -d "${DEST_DIR}/usr/lib/$i" ]; then
echo /usr/lib/$i
fi
done
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: nakayama Date: Mon Aug 26 10:05:35 UTC 2019 Modified Files: src/sys/dev/sysmon: sysmon.c Log Message: Module class of sysmon_envsys, sysmon_wdog and sysmon_power is MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC. Fix that invoking envsys without sysmon_envsys kernel module failes with: WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3) To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sysmon/sysmon.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/sysmon
Module Name:src
Committed By: nakayama
Date: Mon Aug 26 10:05:35 UTC 2019
Modified Files:
src/sys/dev/sysmon: sysmon.c
Log Message:
Module class of sysmon_envsys, sysmon_wdog and sysmon_power is
MODULE_CLASS_DRIVER, not MODULE_CLASS_MISC.
Fix that invoking envsys without sysmon_envsys kernel module failes with:
WARNING: module error: incompatible module class for `sysmon_envsys' (1 != 3)
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/sysmon/sysmon.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/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.29 src/sys/dev/sysmon/sysmon.c:1.30
--- src/sys/dev/sysmon/sysmon.c:1.29 Fri Apr 26 08:38:25 2019
+++ src/sys/dev/sysmon/sysmon.c Mon Aug 26 10:05:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.29 2019/04/26 08:38:25 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.30 2019/08/26 10:05:34 nakayama Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.29 2019/04/26 08:38:25 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.30 2019/08/26 10:05:34 nakayama Exp $");
#include
#include
@@ -151,7 +151,7 @@ sysmonopen(dev_t dev, int flag, int mode
if (sysmon_opvec_table[minor(dev)] == NULL) {
mutex_exit(&sysmon_minor_mtx);
error = module_autoload(sysmon_mod[minor(dev)],
- MODULE_CLASS_MISC);
+ MODULE_CLASS_DRIVER);
if (error)
return error;
mutex_enter(&sysmon_minor_mtx);
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: nakayama Date: Wed Aug 21 13:48:37 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: Remove obsolete entry for libgomp.so.1.2. Upgrading from netbsd-8 to netbsd-9 removes this library file, but some programs (eg. packages compiled on netbsd-8) still use it. To generate a diff of this commit: cvs rdiff -u -r1.866 -r1.867 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.866 src/distrib/sets/lists/base/shl.mi:1.867 --- src/distrib/sets/lists/base/shl.mi:1.866 Sun Jun 30 22:15:06 2019 +++ src/distrib/sets/lists/base/shl.mi Wed Aug 21 13:48:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.866 2019/06/30 22:15:06 blymn Exp $ +# $NetBSD: shl.mi,v 1.867 2019/08/21 13:48:37 nakayama Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -305,7 +305,6 @@ ./usr/lib/libgnumalloc.so.1.0 base-sys-shlib compatfile ./usr/lib/libgomp.sobase-sys-shlib compatfile,gcc ./usr/lib/libgomp.so.1base-sys-shlib compatfile,gcc=6 -./usr/lib/libgomp.so.1.2 base-obsolete obsolete ./usr/lib/libgomp.so.1.3 base-sys-shlib compatfile,gcc=6,!machine_arch=mips64eb,!machine_arch=mips64el ./usr/lib/libgomp.so.1.3 base-sys-shlib gcc=6,machine_arch=mips64eb ./usr/lib/libgomp.so.1.3 base-sys-shlib gcc=6,machine_arch=mips64el
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: nakayama Date: Wed Aug 21 13:48:37 UTC 2019 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: Remove obsolete entry for libgomp.so.1.2. Upgrading from netbsd-8 to netbsd-9 removes this library file, but some programs (eg. packages compiled on netbsd-8) still use it. To generate a diff of this commit: cvs rdiff -u -r1.866 -r1.867 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src Committed By: nakayama Date: Wed Aug 7 19:30:00 UTC 2019 Modified Files: src/etc/rc.d: automount automountd autounmountd ip6addrctl Log Message: Add $_rc_subr_loaded before ". /etc/rc.subr" for speedup and consistency. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/automount src/etc/rc.d/automountd \ src/etc/rc.d/autounmountd cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/ip6addrctl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src Committed By: nakayama Date: Wed Aug 7 19:30:00 UTC 2019 Modified Files: src/etc/rc.d: automount automountd autounmountd ip6addrctl Log Message: Add $_rc_subr_loaded before ". /etc/rc.subr" for speedup and consistency. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/automount src/etc/rc.d/automountd \ src/etc/rc.d/autounmountd cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/ip6addrctl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/automount diff -u src/etc/rc.d/automount:1.1 src/etc/rc.d/automount:1.2 --- src/etc/rc.d/automount:1.1 Tue Jan 9 03:31:14 2018 +++ src/etc/rc.d/automount Wed Aug 7 19:30:00 2019 @@ -1,13 +1,13 @@ #!/bin/sh # -# $NetBSD: automount,v 1.1 2018/01/09 03:31:14 christos Exp $ +# $NetBSD: automount,v 1.2 2019/08/07 19:30:00 nakayama Exp $ # # PROVIDE: automount # REQUIRE: automountd # KEYWORD: nojail shutdown -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="automount" rcvar="autofs" Index: src/etc/rc.d/automountd diff -u src/etc/rc.d/automountd:1.1 src/etc/rc.d/automountd:1.2 --- src/etc/rc.d/automountd:1.1 Tue Jan 9 03:31:14 2018 +++ src/etc/rc.d/automountd Wed Aug 7 19:30:00 2019 @@ -1,13 +1,13 @@ #!/bin/sh # -# $NetBSD: automountd,v 1.1 2018/01/09 03:31:14 christos Exp $ +# $NetBSD: automountd,v 1.2 2019/08/07 19:30:00 nakayama Exp $ # # PROVIDE: automountd # REQUIRE: DAEMON # KEYWORD: nojail -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="automountd" rcvar="autofs" Index: src/etc/rc.d/autounmountd diff -u src/etc/rc.d/autounmountd:1.1 src/etc/rc.d/autounmountd:1.2 --- src/etc/rc.d/autounmountd:1.1 Tue Jan 9 03:31:14 2018 +++ src/etc/rc.d/autounmountd Wed Aug 7 19:30:00 2019 @@ -7,7 +7,7 @@ # REQUIRE: DAEMON # KEYWORD: nojail -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="autounmountd" rcvar="autofs" Index: src/etc/rc.d/ip6addrctl diff -u src/etc/rc.d/ip6addrctl:1.2 src/etc/rc.d/ip6addrctl:1.3 --- src/etc/rc.d/ip6addrctl:1.2 Wed Dec 23 04:38:00 2015 +++ src/etc/rc.d/ip6addrctl Wed Aug 7 19:30:00 2019 @@ -6,7 +6,7 @@ # PROVIDE: ip6addrctl # REQUIRE: root bootconf mountcritlocal tty -. /etc/rc.subr +$_rc_subr_loaded . /etc/rc.subr name="ip6addrctl" rcvar="ip6addrctl"
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Fri Aug 2 19:58:00 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Change uname and gname to sync with etc/mtree/special. It was missing in rev 1.195 changes. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.200 src/etc/mtree/NetBSD.dist.base:1.201 --- src/etc/mtree/NetBSD.dist.base:1.200 Wed Jul 24 06:53:42 2019 +++ src/etc/mtree/NetBSD.dist.base Fri Aug 2 19:58:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.200 2019/07/24 06:53:42 wiz Exp $ +# $NetBSD: NetBSD.dist.base,v 1.201 2019/08/02 19:58:00 nakayama Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1271,7 +1271,7 @@ ./var/chroot/named ./var/chroot/named/dev ./var/chroot/named/etc -./var/chroot/named/etc/namedb +./var/chroot/named/etc/namedb mode=0755 uname=named gname=named ./var/chroot/named/etc/namedb/cache mode=0775 uname=named gname=named ./var/chroot/named/etc/namedb/keys type=dir mode=0775 uname=named gname=named ./var/chroot/named/etc/namedb/nta type=dir mode=0775 uname=named gname=named
CVS commit: src/etc/mtree
Module Name:src Committed By: nakayama Date: Fri Aug 2 19:58:00 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Change uname and gname to sync with etc/mtree/special. It was missing in rev 1.195 changes. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src
Committed By: nakayama
Date: Sat Jul 27 20:10:29 UTC 2019
Modified Files:
src/usr.sbin/bta2dpd/bta2dpd: Makefile bta2dpd.8 bta2dpd.c
Log Message:
Add option -D to run in the background using daemon(3).
Also changed the message output to using syslog(3).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/bta2dpd/bta2dpd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.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.sbin/bta2dpd/bta2dpd/Makefile
diff -u src/usr.sbin/bta2dpd/bta2dpd/Makefile:1.2 src/usr.sbin/bta2dpd/bta2dpd/Makefile:1.3
--- src/usr.sbin/bta2dpd/bta2dpd/Makefile:1.2 Sat Jan 28 23:19:20 2017
+++ src/usr.sbin/bta2dpd/bta2dpd/Makefile Sat Jul 27 20:10:29 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/01/28 23:19:20 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/07/27 20:10:29 nakayama Exp $
.include
@@ -9,8 +9,8 @@ SRCS= bta2dpd.c avdtp.c sbc_encode.c
MAN= bta2dpd.8
CFLAGS+= -I.
-DPADD+= ${LIBBLUETOOTH} ${LIBEVENT}
-LDADD+= -lbluetooth -levent
+DPADD+= ${LIBBLUETOOTH} ${LIBEVENT} ${LIBUTIL}
+LDADD+= -lbluetooth -levent -lutil
CLEANFILES+= sbc_crc.h sbc_coeffs.h
sbc_encode.c: sbc_coeffs.h sbc_crc.h
Index: src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8
diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.3 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.4
--- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.3 Tue May 15 04:25:25 2018
+++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Sat Jul 27 20:10:29 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: bta2dpd.8,v 1.3 2018/05/15 04:25:25 nat Exp $
+.\" $NetBSD: bta2dpd.8,v 1.4 2019/07/27 20:10:29 nakayama Exp $
.\"
.\" Copyright (c) 2015 - 2016 Nathanial Sloss
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 2, 2016
+.Dd July 27, 2019
.Dt BTA2DPD 8
.Os
.Sh NAME
@@ -37,7 +37,7 @@
.Nd Bluetooth Advanced Audio Distribution Profile daemon
.Sh SYNOPSIS
.Nm
-.Op Fl v
+.Op Fl \&Dv
.Op Fl A Ar bitpool_allocation
.Op Fl B Ar bitpool
.Op Fl b Ar blocks
@@ -52,7 +52,7 @@
.Ar files ...
.Nm
.Fl K
-.Op Fl Iv
+.Op Fl DIv
.Op Fl A Ar bitpool_allocation
.Op Fl B Ar bitpool
.Op Fl b Ar blocks
@@ -105,6 +105,8 @@ Use
with only the
.Fl v
option and the maximum bitpool for your device will be printed to stdout.
+.It Fl D
+Run in the background.
.It Fl d Ar device
Local device address.
May be given as BDADDR or device name.
Index: src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.5 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.6
--- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.5 Sat Jan 13 10:20:45 2018
+++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c Sat Jul 27 20:10:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bta2dpd.c,v 1.5 2018/01/13 10:20:45 nat Exp $ */
+/* $NetBSD: bta2dpd.c,v 1.6 2019/07/27 20:10:29 nakayama Exp $ */
/*-
* Copyright (c) 2015 - 2016 Nathanial Sloss
@@ -82,7 +82,9 @@ __RCSID("$NetBSD");
#include
#include
#include
+#include
#include
+#include
#include
#include "avdtp_signal.h"
@@ -216,6 +218,7 @@ static struct event recv_ev; /* audio
static struct event ctl_ev; /* avdtp ctl event */
struct l2cap_info info;
+static bool runasDaemon;
static bool asSpeaker;
static bool initDiscover; /* initiate avdtp discover */
static bool verbose; /* copy to stdout */
@@ -250,10 +253,11 @@ static void do_interrupt(int, short, voi
static void do_recv(int, short, void *);
static void do_ctlreq(int, short, void *);
-#define log_err(x, ...) if (verbose) { fprintf (stderr, x "\n",\
- __VA_ARGS__); }
-#define log_info(x, ...) if (verbose) { fprintf (stderr, x "\n",\
- __VA_ARGS__); }
+#define log_err(st, fmt, args...) \
+ do { syslog(LOG_ERR, fmt, ##args); exit(st); } while (0)
+#define log_warn(fmt, args...) syslog(LOG_WARNING, fmt, ##args)
+#define log_info(fmt, args...) syslog(LOG_INFO, fmt, ##args)
+#define log_debug(fmt, args...) syslog(LOG_DEBUG, fmt, ##args)
int
main(int ac, char *av[])
@@ -263,7 +267,7 @@ main(int ac, char *av[])
bdaddr_copy(&info.laddr, BDADDR_ANY);
sc = hc = -1;
- verbose = asSpeaker = test_mode = initDiscover = false;
+ verbose = asSpeaker = test_mode = initDiscover = runasDaemon = false;
n = m = l = i = j = o = 0;
freqs[0] = frequency;
channel_config[0] = channel_mode;
@@ -272,7 +276,7 @@ main(int ac, char *av[])
alloc_config[0] = alloc_method;
channel_config[0] = channel_mode;
- while ((ch = getopt(ac, av, "A:a:B:b:d:e:f:IKM:m:p:r:tV:v")) != EOF) {
+ while ((ch = getopt(ac, av, "A:a:B:b:Dd:e:f:IKM:m:p:r:tV:v")) != EOF) {
switch (ch) {
case 'A':
for (k = 0; k < (int)strlen(optarg); k++) {
@@ -331,6 +335,9 @@ main(int ac, char *av[])
usage();
}
break;
+ case 'D
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nakayama Date: Sat Jul 27 20:10:29 UTC 2019 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: Makefile bta2dpd.8 bta2dpd.c Log Message: Add option -D to run in the background using daemon(3). Also changed the message output to using syslog(3). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/bta2dpd/bta2dpd/Makefile cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.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/pckbport
Module Name:src Committed By: nakayama Date: Mon Jul 22 09:58:39 UTC 2019 Modified Files: src/sys/dev/pckbport: files.pckbport Log Message: hvkbd requires pckbd_keydesctab in wskbdmap_mfii.c. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pckbport/files.pckbport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: nakayama Date: Mon Jul 22 09:58:39 UTC 2019 Modified Files: src/sys/dev/pckbport: files.pckbport Log Message: hvkbd requires pckbd_keydesctab in wskbdmap_mfii.c. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pckbport/files.pckbport 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/pckbport/files.pckbport diff -u src/sys/dev/pckbport/files.pckbport:1.9 src/sys/dev/pckbport/files.pckbport:1.10 --- src/sys/dev/pckbport/files.pckbport:1.9 Sun Aug 13 08:49:27 2017 +++ src/sys/dev/pckbport/files.pckbport Mon Jul 22 09:58:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.pckbport,v 1.9 2017/08/13 08:49:27 christos Exp $ +# $NetBSD: files.pckbport,v 1.10 2019/07/22 09:58:39 nakayama Exp $ # devices attached at pckbport, for use with wscons defflag opt_wskbdmap.h WSKBD_USONLY @@ -9,7 +9,7 @@ file dev/pckbport/pckbport.c pckbport | device pckbd: wskbddev attach pckbd at pckbport file dev/pckbport/pckbd.c pckbd needs-flag -file dev/pckbport/wskbdmap_mfii.c pckbd +file dev/pckbport/wskbdmap_mfii.c pckbd | hvkbd defparam PCKBD_LAYOUT defflag PCKBD_CNATTACH_MAY_FAIL
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: nakayama Date: Tue Jul 9 10:07:11 UTC 2019 Modified Files: src/sys/dev/hyperv: vmbus.c Log Message: Zero clear the allocated ring buffer for vmbus_channel. This change makes Hyper-V's vmbus devices work properly even after reboot. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hyperv/vmbus.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/hyperv/vmbus.c diff -u src/sys/dev/hyperv/vmbus.c:1.3 src/sys/dev/hyperv/vmbus.c:1.4 --- src/sys/dev/hyperv/vmbus.c:1.3 Fri May 24 14:28:48 2019 +++ src/sys/dev/hyperv/vmbus.c Tue Jul 9 10:07:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: vmbus.c,v 1.3 2019/05/24 14:28:48 nonaka Exp $ */ +/* $NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $ */ /* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */ /*- @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.3 2019/05/24 14:28:48 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $"); #include #include @@ -1263,6 +1263,7 @@ vmbus_channel_ring_create(struct vmbus_c "failed to allocate channel ring\n"); return ENOMEM; } + memset(ch->ch_ring, 0, ch->ch_ring_size); memset(&ch->ch_wrd, 0, sizeof(ch->ch_wrd)); ch->ch_wrd.rd_ring = (struct vmbus_bufring *)ch->ch_ring;
CVS commit: src/sys/dev/hyperv
Module Name:src Committed By: nakayama Date: Tue Jul 9 10:07:11 UTC 2019 Modified Files: src/sys/dev/hyperv: vmbus.c Log Message: Zero clear the allocated ring buffer for vmbus_channel. This change makes Hyper-V's vmbus devices work properly even after reboot. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hyperv/vmbus.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/drm2/radeon
Module Name:src Committed By: nakayama Date: Sat Jun 1 05:55:45 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: files.radeon Log Message: radeondrmkmsfb now requires drmfb and drmfb_pci. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/radeon/files.radeon 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/drm2/radeon/files.radeon diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.25 src/sys/external/bsd/drm2/radeon/files.radeon:1.26 --- src/sys/external/bsd/drm2/radeon/files.radeon:1.25 Mon Feb 4 08:18:08 2019 +++ src/sys/external/bsd/drm2/radeon/files.radeon Sat Jun 1 05:55:45 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.radeon,v 1.25 2019/02/04 08:18:08 mrg Exp $ +# $NetBSD: files.radeon,v 1.26 2019/06/01 05:55:45 nakayama Exp $ version 20180827 @@ -7,7 +7,7 @@ device radeon: drmkms, drmkms_pci, drmkm attach radeon at pci # XXX Rename this to radeonfb when the legacy radeonfb(4) is gone. -device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev +device radeondrmkmsfb: radeonfbbus, drmfb, drmfb_pci, wsemuldisplaydev attach radeondrmkmsfb at radeonfbbus # Our overrides first.
CVS commit: src/sys/external/bsd/drm2/radeon
Module Name:src Committed By: nakayama Date: Sat Jun 1 05:55:45 UTC 2019 Modified Files: src/sys/external/bsd/drm2/radeon: files.radeon Log Message: radeondrmkmsfb now requires drmfb and drmfb_pci. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/drm2/radeon/files.radeon 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: nakayama
Date: Fri May 17 13:51:36 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/disklabel: Makefile
src/tools/gpt: Makefile
src/tools/vgrind: Makefile
Log Message:
Use ${_TOOL_PREFIX} instead of hardcoding "nb" for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.1136 -r1.1137 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/tools/disklabel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gpt/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/vgrind/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.1136 src/share/mk/bsd.own.mk:1.1137
--- src/share/mk/bsd.own.mk:1.1136 Fri May 17 13:44:55 2019
+++ src/share/mk/bsd.own.mk Fri May 17 13:51:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
+# $NetBSD: bsd.own.mk,v 1.1137 2019/05/17 13:51:36 nakayama Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -374,7 +374,7 @@ TOOL_CTFCONVERT= ${TOOLDIR}/bin/${_TOOL_
TOOL_CTFMERGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
TOOL_CVSLATEST= ${TOOLDIR}/bin/${_TOOL_PREFIX}cvslatest
TOOL_DB= ${TOOLDIR}/bin/${_TOOL_PREFIX}db
-TOOL_DISKLABEL= ${TOOLDIR}/bin/nbdisklabel
+TOOL_DISKLABEL= ${TOOLDIR}/bin/${_TOOL_PREFIX}disklabel
TOOL_DTC= ${TOOLDIR}/bin/${_TOOL_PREFIX}dtc
TOOL_EQN= ${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
TOOL_FDISK= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
Index: src/tools/disklabel/Makefile
diff -u src/tools/disklabel/Makefile:1.7 src/tools/disklabel/Makefile:1.8
--- src/tools/disklabel/Makefile:1.7 Tue May 1 12:38:39 2018
+++ src/tools/disklabel/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbdisklabel
+HOSTPROGNAME= ${_TOOL_PREFIX}disklabel
HOST_SRCDIR= sbin/disklabel
HOST_SRCS= disklabel.c
Index: src/tools/gpt/Makefile
diff -u src/tools/gpt/Makefile:1.4 src/tools/gpt/Makefile:1.5
--- src/tools/gpt/Makefile:1.4 Tue May 1 12:38:39 2018
+++ src/tools/gpt/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/05/01 12:38:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbgpt
+HOSTPROGNAME= ${_TOOL_PREFIX}gpt
HOST_SRCDIR= sbin/gpt
HOST_CPPFLAGS+= -I${.CURDIR}
Index: src/tools/vgrind/Makefile
diff -u src/tools/vgrind/Makefile:1.2 src/tools/vgrind/Makefile:1.3
--- src/tools/vgrind/Makefile:1.2 Tue Jul 15 16:04:35 2014
+++ src/tools/vgrind/Makefile Fri May 17 13:51:36 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2014/07/15 16:04:35 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/17 13:51:36 nakayama Exp $
-HOSTPROGNAME= nbvfontedpr
+HOSTPROGNAME= ${_TOOL_PREFIX}vfontedpr
HOST_BINDIR= ${TOOLDIR}/libexec
HOST_SRCDIR= usr.bin/vgrind
HOST_FILESDIR= ${TOOLDIR}/share/misc
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Fri May 17 13:51:36 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/disklabel: Makefile
src/tools/gpt: Makefile
src/tools/vgrind: Makefile
Log Message:
Use ${_TOOL_PREFIX} instead of hardcoding "nb" for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.1136 -r1.1137 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.7 -r1.8 src/tools/disklabel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tools/gpt/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/vgrind/Makefile
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: nakayama Date: Fri May 17 13:44:55 UTC 2019 Modified Files: src/share/mk: bsd.own.mk src/tools/llvm-clang-tblgen: Makefile src/tools/llvm-tblgen: Makefile Log Message: Revert previous. The binaries created are different, but according to joerg@ there is no difference in functionality. To generate a diff of this commit: cvs rdiff -u -r1.1135 -r1.1136 src/share/mk/bsd.own.mk cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-clang-tblgen/Makefile cvs rdiff -u -r1.3 -r1.4 src/tools/llvm-tblgen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
>>> Joerg Sonnenberger wrote
> On Fri, May 17, 2019 at 09:35:03AM +0900, Takeshi Nakayama wrote:
> > >>> Joerg Sonnenberger wrote
> >
> > > On Thu, May 16, 2019 at 08:00:49PM +, Takeshi Nakayama wrote:
> > > > Module Name:src
> > > > Committed By: nakayama
> > > > Date: Thu May 16 20:00:49 UTC 2019
> > > >
> > > > Modified Files:
> > > > src/share/mk: bsd.own.mk
> > > > src/tools/llvm-clang-tblgen: Makefile
> > > > src/tools/llvm-tblgen: Makefile
> > > >
> > > > Log Message:
> > > > Rename nb{clang,llvm}-tblgen to
> > > > ${MACHINE_GNU_PLATFORM}-{clang,llvm}-tblgen
> > > > since they contain the default target (e.g. x86_64--netbsd).
> > >
> > > This is wrong. Nothing in tblgen depends on the default target. Please
> > > revert.
> >
> > I thought that there is no functional difference, but different
> > binaries are created for each architecture because the binary
> > contains default target name.
> >
> > How can we avoid creating different binaries for each architecture?
>
> It doesn't matter that the binary is different. The functions that
> differ are never used by tblgen.
Anyway I just reverted.
-- Takeshi Nakayama
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Fri May 17 13:44:55 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/llvm-clang-tblgen: Makefile
src/tools/llvm-tblgen: Makefile
Log Message:
Revert previous.
The binaries created are different, but according to joerg@ there
is no difference in functionality.
To generate a diff of this commit:
cvs rdiff -u -r1.1135 -r1.1136 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-clang-tblgen/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tools/llvm-tblgen/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.1135 src/share/mk/bsd.own.mk:1.1136
--- src/share/mk/bsd.own.mk:1.1135 Thu May 16 20:00:49 2019
+++ src/share/mk/bsd.own.mk Fri May 17 13:44:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1135 2019/05/16 20:00:49 nakayama Exp $
+# $NetBSD: bsd.own.mk,v 1.1136 2019/05/17 13:44:55 nakayama Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -365,7 +365,7 @@ TOOL_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_CAP_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
TOOL_CAT= ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
TOOL_CKSUM= ${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
-TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang-tblgen
+TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}clang-tblgen
TOOL_COMPILE_ET= ${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
TOOL_CONFIG= ${TOOLDIR}/bin/${_TOOL_PREFIX}config
TOOL_CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
@@ -399,7 +399,7 @@ TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PR
TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFIX}join
-TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-llvm-tblgen
+TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4
TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
Index: src/tools/llvm-clang-tblgen/Makefile
diff -u src/tools/llvm-clang-tblgen/Makefile:1.2 src/tools/llvm-clang-tblgen/Makefile:1.3
--- src/tools/llvm-clang-tblgen/Makefile:1.2 Thu May 16 20:00:49 2019
+++ src/tools/llvm-clang-tblgen/Makefile Fri May 17 13:44:55 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2019/05/16 20:00:49 nakayama Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/17 13:44:55 nakayama Exp $
-HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-clang-tblgen
-HOSTPROG_CXX= ${MACHINE_GNU_PLATFORM}-clang-tblgen
+HOSTPROGNAME= ${_TOOL_PREFIX}clang-tblgen
+HOSTPROG_CXX= ${_TOOL_PREFIX}clang-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/clang-tblgen
.include "${.CURDIR}/../Makefile.host"
Index: src/tools/llvm-tblgen/Makefile
diff -u src/tools/llvm-tblgen/Makefile:1.3 src/tools/llvm-tblgen/Makefile:1.4
--- src/tools/llvm-tblgen/Makefile:1.3 Thu May 16 20:00:49 2019
+++ src/tools/llvm-tblgen/Makefile Fri May 17 13:44:55 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/05/16 20:00:49 nakayama Exp $
+# $NetBSD: Makefile,v 1.4 2019/05/17 13:44:55 nakayama Exp $
-HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-llvm-tblgen
-HOSTPROG_CXX= ${MACHINE_GNU_PLATFORM}-llvm-tblgen
+HOSTPROGNAME= ${_TOOL_PREFIX}llvm-tblgen
+HOSTPROG_CXX= ${_TOOL_PREFIX}llvm-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/tblgen
.include "${.CURDIR}/../Makefile.host"
Re: CVS commit: src
>>> Joerg Sonnenberger wrote
> On Thu, May 16, 2019 at 08:00:49PM +0000, Takeshi Nakayama wrote:
> > Module Name:src
> > Committed By: nakayama
> > Date: Thu May 16 20:00:49 UTC 2019
> >
> > Modified Files:
> > src/share/mk: bsd.own.mk
> > src/tools/llvm-clang-tblgen: Makefile
> > src/tools/llvm-tblgen: Makefile
> >
> > Log Message:
> > Rename nb{clang,llvm}-tblgen to ${MACHINE_GNU_PLATFORM}-{clang,llvm}-tblgen
> > since they contain the default target (e.g. x86_64--netbsd).
>
> This is wrong. Nothing in tblgen depends on the default target. Please
> revert.
I thought that there is no functional difference, but different
binaries are created for each architecture because the binary
contains default target name.
How can we avoid creating different binaries for each architecture?
-- Takeshi Nakayama
CVS commit: src/etc
Module Name:src Committed By: nakayama Date: Thu May 16 20:12:35 UTC 2019 Modified Files: src/etc: newsyslog.conf Log Message: Specify PID file to properly rotate npf log file. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/etc/newsyslog.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: nakayama Date: Thu May 16 20:12:35 UTC 2019 Modified Files: src/etc: newsyslog.conf Log Message: Specify PID file to properly rotate npf log file. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/etc/newsyslog.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/newsyslog.conf diff -u src/etc/newsyslog.conf:1.23 src/etc/newsyslog.conf:1.24 --- src/etc/newsyslog.conf:1.23 Sat Jan 7 18:50:50 2017 +++ src/etc/newsyslog.conf Thu May 16 20:12:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: newsyslog.conf,v 1.23 2017/01/07 18:50:50 christos Exp $ +# $NetBSD: newsyslog.conf,v 1.24 2019/05/16 20:12:35 nakayama Exp $ # # Configuration file for newsyslog(8). # @@ -8,7 +8,7 @@ /var/log/cron root:wheel 600 3100 *Z /var/log/kerberos.log 640 7*24 ZN /var/log/lpd-errs 640 7100 *Z -/var/log/npflog0.pcap 600 7100 *ZB +/var/log/npflog0.pcap 600 7100 *ZB /var/run/npfd.pid /var/log/maillog 600 7*24 Z /var/log/messages 644 10 250 *Z /var/log/wtmp root:utmp 664 7*168 ZBN
CVS commit: src
Module Name:src
Committed By: nakayama
Date: Thu May 16 20:00:49 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/llvm-clang-tblgen: Makefile
src/tools/llvm-tblgen: Makefile
Log Message:
Rename nb{clang,llvm}-tblgen to ${MACHINE_GNU_PLATFORM}-{clang,llvm}-tblgen
since they contain the default target (e.g. x86_64--netbsd).
To generate a diff of this commit:
cvs rdiff -u -r1.1134 -r1.1135 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.1 -r1.2 src/tools/llvm-clang-tblgen/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-tblgen/Makefile
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: nakayama
Date: Thu May 16 20:00:49 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/llvm-clang-tblgen: Makefile
src/tools/llvm-tblgen: Makefile
Log Message:
Rename nb{clang,llvm}-tblgen to ${MACHINE_GNU_PLATFORM}-{clang,llvm}-tblgen
since they contain the default target (e.g. x86_64--netbsd).
To generate a diff of this commit:
cvs rdiff -u -r1.1134 -r1.1135 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.1 -r1.2 src/tools/llvm-clang-tblgen/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tools/llvm-tblgen/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.1134 src/share/mk/bsd.own.mk:1.1135
--- src/share/mk/bsd.own.mk:1.1134 Sat May 11 02:40:31 2019
+++ src/share/mk/bsd.own.mk Thu May 16 20:00:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1134 2019/05/11 02:40:31 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1135 2019/05/16 20:00:49 nakayama Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -365,7 +365,7 @@ TOOL_AWK= ${TOOLDIR}/bin/${_TOOL_PREFIX
TOOL_CAP_MKDB= ${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
TOOL_CAT= ${TOOLDIR}/bin/${_TOOL_PREFIX}cat
TOOL_CKSUM= ${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
-TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}clang-tblgen
+TOOL_CLANG_TBLGEN= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang-tblgen
TOOL_COMPILE_ET= ${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
TOOL_CONFIG= ${TOOLDIR}/bin/${_TOOL_PREFIX}config
TOOL_CRUNCHGEN= MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
@@ -399,7 +399,7 @@ TOOL_INDXBIB= ${TOOLDIR}/bin/${_TOOL_PR
TOOL_INSTALLBOOT= ${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
TOOL_INSTALL_INFO= ${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
TOOL_JOIN= ${TOOLDIR}/bin/${_TOOL_PREFIX}join
-TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
+TOOL_LLVM_TBLGEN= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-llvm-tblgen
TOOL_M4= ${TOOLDIR}/bin/${_TOOL_PREFIX}m4
TOOL_MACPPCFIXCOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
TOOL_MAKEFS= ${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
Index: src/tools/llvm-clang-tblgen/Makefile
diff -u src/tools/llvm-clang-tblgen/Makefile:1.1 src/tools/llvm-clang-tblgen/Makefile:1.2
--- src/tools/llvm-clang-tblgen/Makefile:1.1 Tue Oct 11 13:54:01 2011
+++ src/tools/llvm-clang-tblgen/Makefile Thu May 16 20:00:49 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2011/10/11 13:54:01 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2019/05/16 20:00:49 nakayama Exp $
-HOSTPROGNAME= ${_TOOL_PREFIX}clang-tblgen
-HOSTPROG_CXX= ${_TOOL_PREFIX}clang-tblgen
+HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-clang-tblgen
+HOSTPROG_CXX= ${MACHINE_GNU_PLATFORM}-clang-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/clang-tblgen
.include "${.CURDIR}/../Makefile.host"
Index: src/tools/llvm-tblgen/Makefile
diff -u src/tools/llvm-tblgen/Makefile:1.2 src/tools/llvm-tblgen/Makefile:1.3
--- src/tools/llvm-tblgen/Makefile:1.2 Tue Oct 11 13:54:01 2011
+++ src/tools/llvm-tblgen/Makefile Thu May 16 20:00:49 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/10/11 13:54:01 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/16 20:00:49 nakayama Exp $
-HOSTPROGNAME= ${_TOOL_PREFIX}llvm-tblgen
-HOSTPROG_CXX= ${_TOOL_PREFIX}llvm-tblgen
+HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-llvm-tblgen
+HOSTPROG_CXX= ${MACHINE_GNU_PLATFORM}-llvm-tblgen
HOST_SRCDIR= external/bsd/llvm/bin/tblgen
.include "${.CURDIR}/../Makefile.host"
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc
Committed By: nakayama
Date: Thu May 16 09:59:37 UTC 2019
Modified Files:
xsrc/external/mit/fontconfig/dist/src: fcdir.c
Log Message:
Do not remove UUID file when a scanned directory is empty.
pulled from the following upstream change:
https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/5f12f564f8748deaa603adb7a4b8f616b6390ad4
It fixes that a cache file for an empty font directory is created
every time fc-cache is executed.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcdir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/fontconfig/dist/src/fcdir.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.1.1.8 xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.1.1.8 Fri Mar 8 09:40:41 2019
+++ xsrc/external/mit/fontconfig/dist/src/fcdir.c Thu May 16 09:59:37 2019
@@ -421,13 +421,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBo
/* Not using existing cache file, construct new cache */
if (!cache)
cache = FcDirCacheScan (dir, config);
-if (cache)
-{
- FcFontSet *fs = FcCacheSet (cache);
-
- if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
- FcDirCacheDeleteUUID (dir, config);
-}
return cache;
}
CVS commit: xsrc/external/mit/fontconfig/dist/src
Module Name:xsrc Committed By: nakayama Date: Thu May 16 09:59:37 UTC 2019 Modified Files: xsrc/external/mit/fontconfig/dist/src: fcdir.c Log Message: Do not remove UUID file when a scanned directory is empty. pulled from the following upstream change: https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/5f12f564f8748deaa603adb7a4b8f616b6390ad4 It fixes that a cache file for an empty font directory is created every time fc-cache is executed. To generate a diff of this commit: cvs rdiff -u -r1.1.1.8 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcdir.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/audio
Module Name:src
Committed By: nakayama
Date: Mon May 13 08:50:25 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
audio_open:
On full duplex hardware, the flags passed to hw_if->open() is always
(FREAD | FWRITE). But some devices (e.g. uaudio) check its
capabilities at open(), so unidirection devices like USB speakers
always return EACCES.
Avoid open() failure on such devices by checking the capabilities of
the device and changing the flags passed to hw_if->open().
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.6 src/sys/dev/audio/audio.c:1.7
--- src/sys/dev/audio/audio.c:1.6 Mon May 13 07:53:56 2019
+++ src/sys/dev/audio/audio.c Mon May 13 08:50:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.6 2019/05/13 07:53:56 nakayama Exp $ */
+/* $NetBSD: audio.c,v 1.7 2019/05/13 08:50:25 nakayama Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.6 2019/05/13 07:53:56 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.7 2019/05/13 08:50:25 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -2046,12 +2046,17 @@ audio_open(dev_t dev, struct audio_softc
* hw_if->open() is always (FREAD | FWRITE)
* regardless of this open()'s flags.
* see also dev/isa/aria.c
+ * but ckeck its playback or recording capability.
* On half duplex hardware, the flags passed to
* hw_if->open() is either FREAD or FWRITE.
* see also arch/evbarm/mini2440/audio_mini2440.c
*/
if (fullduplex) {
hwflags = FREAD | FWRITE;
+if (!audio_can_playback(sc))
+ hwflags &= ~FWRITE;
+if (!audio_can_capture(sc))
+ hwflags &= ~FREAD;
} else {
/* Construct hwflags from af->mode. */
hwflags = 0;
CVS commit: src/sys/dev/audio
Module Name:src Committed By: nakayama Date: Mon May 13 08:50:25 UTC 2019 Modified Files: src/sys/dev/audio: audio.c Log Message: audio_open: On full duplex hardware, the flags passed to hw_if->open() is always (FREAD | FWRITE). But some devices (e.g. uaudio) check its capabilities at open(), so unidirection devices like USB speakers always return EACCES. Avoid open() failure on such devices by checking the capabilities of the device and changing the flags passed to hw_if->open(). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/audio/audio.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/audio
Module Name:src
Committed By: nakayama
Date: Mon May 13 07:53:56 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
sysctl "multiuser" type is CTLTYPE_BOOL, so use bool instead of int.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.5 src/sys/dev/audio/audio.c:1.6
--- src/sys/dev/audio/audio.c:1.5 Mon May 13 04:11:04 2019
+++ src/sys/dev/audio/audio.c Mon May 13 07:53:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.5 2019/05/13 04:11:04 nakayama Exp $ */
+/* $NetBSD: audio.c,v 1.6 2019/05/13 07:53:56 nakayama Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.5 2019/05/13 04:11:04 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.6 2019/05/13 07:53:56 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -7511,7 +7511,8 @@ audio_sysctl_multiuser(SYSCTLFN_ARGS)
{
struct sysctlnode node;
struct audio_softc *sc;
- int t, error;
+ bool t;
+ int error;
node = *rnode;
sc = node.sysctl_data;
CVS commit: src/sys/dev/audio
Module Name:src Committed By: nakayama Date: Mon May 13 07:53:56 UTC 2019 Modified Files: src/sys/dev/audio: audio.c Log Message: sysctl "multiuser" type is CTLTYPE_BOOL, so use bool instead of int. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/audio/audio.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/audio
Module Name:src Committed By: nakayama Date: Mon May 13 04:11:04 UTC 2019 Modified Files: src/sys/dev/audio: audio.c Log Message: audio_hw_probe: Return error if both play and record probes failed. Avoid audio is disabled on devices with only play like USB speakers. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/audio/audio.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/audio
Module Name:src
Committed By: nakayama
Date: Mon May 13 04:11:04 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
audio_hw_probe:
Return error if both play and record probes failed.
Avoid audio is disabled on devices with only play like USB speakers.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.4 src/sys/dev/audio/audio.c:1.5
--- src/sys/dev/audio/audio.c:1.4 Mon May 13 04:09:35 2019
+++ src/sys/dev/audio/audio.c Mon May 13 04:11:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.4 2019/05/13 04:09:35 nakayama Exp $ */
+/* $NetBSD: audio.c,v 1.5 2019/05/13 04:11:04 nakayama Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.4 2019/05/13 04:09:35 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.5 2019/05/13 04:11:04 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -6149,17 +6149,23 @@ audio_hw_probe(struct audio_softc *sc, i
"invalid mode = %x", mode);
if (is_indep) {
+ int errorp = 0, errorr = 0;
+
/* On independent devices, probe separately. */
if ((mode & AUMODE_PLAY) != 0) {
- error = audio_hw_probe_fmt(sc, phwfmt, AUMODE_PLAY);
- if (error)
+ errorp = audio_hw_probe_fmt(sc, phwfmt, AUMODE_PLAY);
+ if (errorp)
mode &= ~AUMODE_PLAY;
}
if ((mode & AUMODE_RECORD) != 0) {
- error = audio_hw_probe_fmt(sc, rhwfmt, AUMODE_RECORD);
- if (error)
+ errorr = audio_hw_probe_fmt(sc, rhwfmt, AUMODE_RECORD);
+ if (errorr)
mode &= ~AUMODE_RECORD;
}
+
+ /* Return error if both play and record probes failed. */
+ if (errorp && errorr)
+ error = errorp;
} else {
/* On non independent devices, probe simultaneously. */
error = audio_hw_probe_fmt(sc, &fmt, mode);
CVS commit: src/sys/dev/audio
Module Name:src Committed By: nakayama Date: Mon May 13 04:09:35 UTC 2019 Modified Files: src/sys/dev/audio: audio.c Log Message: audioattach: Output the cause of the audio device disabled along with the error code. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/audio/audio.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/audio
Module Name:src
Committed By: nakayama
Date: Mon May 13 04:09:35 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
audioattach:
Output the cause of the audio device disabled along with the error code.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.3 src/sys/dev/audio/audio.c:1.4
--- src/sys/dev/audio/audio.c:1.3 Sat May 11 03:26:43 2019
+++ src/sys/dev/audio/audio.c Mon May 13 04:09:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.3 2019/05/11 03:26:43 maya Exp $ */
+/* $NetBSD: audio.c,v 1.4 2019/05/13 04:09:35 nakayama Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -149,7 +149,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.3 2019/05/11 03:26:43 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.4 2019/05/13 04:09:35 nakayama Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -928,12 +928,16 @@ audioattach(device_t parent, device_t se
memset(&pfil, 0, sizeof(pfil));
memset(&rfil, 0, sizeof(rfil));
mutex_enter(sc->sc_lock);
- if (audio_hw_probe(sc, is_indep, &mode, &phwfmt, &rhwfmt) != 0) {
+ error = audio_hw_probe(sc, is_indep, &mode, &phwfmt, &rhwfmt);
+ if (error) {
mutex_exit(sc->sc_lock);
+ aprint_error_dev(self, "audio_hw_probe failed, "
+ "error = %d\n", error);
goto bad;
}
if (mode == 0) {
mutex_exit(sc->sc_lock);
+ aprint_error_dev(self, "audio_hw_probe failed, no mode\n");
goto bad;
}
/* Init hardware. */
@@ -941,6 +945,8 @@ audioattach(device_t parent, device_t se
error = audio_hw_set_format(sc, mode, &phwfmt, &rhwfmt, &pfil, &rfil);
if (error) {
mutex_exit(sc->sc_lock);
+ aprint_error_dev(self, "audio_hw_set_format failed, "
+ "error = %d\n", error);
goto bad;
}
@@ -950,8 +956,11 @@ audioattach(device_t parent, device_t se
*/
error = audio_mixers_init(sc, mode, &phwfmt, &rhwfmt, &pfil, &rfil);
mutex_exit(sc->sc_lock);
- if (sc->sc_pmixer == NULL && sc->sc_rmixer == NULL)
+ if (sc->sc_pmixer == NULL && sc->sc_rmixer == NULL) {
+ aprint_error_dev(self, "audio_mixers_init failed, "
+ "error = %d\n", error);
goto bad;
+ }
selinit(&sc->sc_wsel);
selinit(&sc->sc_rsel);
Re: CVS commit: src/sys/arch/sparc64/include
>>> Joerg Sonnenberger wrote > On Fri, Apr 05, 2019 at 12:16:13PM +0000, Takeshi Nakayama wrote: > > Module Name:src > > Committed By: nakayama > > Date: Fri Apr 5 12:16:13 UTC 2019 > > > > Modified Files: > > src/sys/arch/sparc64/include: ctlreg.h > > > > Log Message: > > Add dummy constraints to avoid excessive optimization in clang. > > GENERIC kernel compiled with clang now boot at least on my Fire V100. > > The constraint still seems to be wrong to me. The store variant should > list the content as output constraint, not as input? Thanks for looking > at this. When I put it in the output constraint, the code size increased in the case of gcc, so I put it in the input constraint for now. However, I think so too that it should be put in the output constraint, so I will change it. -- Takeshi Nakayama
Re: CVS commit: src/sys/arch/sparc64/include
>>> Joerg Sonnenberger wrote > On Fri, Apr 05, 2019 at 12:15:41PM +0000, Takeshi Nakayama wrote: > > Module Name:src > > Committed By: nakayama > > Date: Fri Apr 5 12:15:41 UTC 2019 > > > > Modified Files: > > src/sys/arch/sparc64/include: psl.h > > > > Log Message: > > Put "memory" to asm inline reading privilege registers for clang to > > prevent it from being removed by excessive optimization. > > Why excessive optimization? With the the clobber or volatile, the asm > statement is declared to be removable. With? Without? Excessive may be overstated, but in the case of gcc it is not removed, so I thought so. -- Takeshi Nakayama
Re: CVS commit: src/external/bsd/mdocml/include
>>> chris...@astron.com (Christos Zoulas) wrote
> In article <20180317235857.ga5...@homeworld.netbsd.org>,
> wrote:
> >Hi,
> >
> >I'm not sure what the changes affect. Does this mean UTF-8 won't work
> >either? that's sounds like a big price to pay.
> >Also, the problem doesn't sound specific to mdocml.
>
> Well, yes it is a bit drastic. Perhaps it can be handled with an
> environment variable instead (to disable for locales that don't work).
I thought about the following change, but it is too ugly.
-- Takeshi Nakayama
--- external/bsd/mdocml/dist/term_ascii.c.orig 2017-03-21 19:13:13.0
+0900
+++ external/bsd/mdocml/dist/term_ascii.c 2018-03-18 15:30:41.0
+0900
@@ -22,6 +22,7 @@
#include
#if HAVE_WCHAR
#include
+#include
#endif
#include
#include
@@ -99,7 +100,7 @@
v = TERMENC_LOCALE == enc ?
setlocale(LC_CTYPE, "") :
setlocale(LC_CTYPE, UTF8_LOCALE);
- if (NULL != v && MB_CUR_MAX > 1) {
+ if (NULL != v && MB_CUR_MAX > 1 && NULL != strstr(v, ".UTF-8"))
{
p->enc = enc;
p->advance = locale_advance;
p->endline = locale_endline;
Re: CVS commit: src/external/bsd/mdocml/include
>>> m...@netbsd.org wrote > Hi, > > I'm not sure what the changes affect. Does this mean UTF-8 won't work > either? that's sounds like a big price to pay. > Also, the problem doesn't sound specific to mdocml. No, this is specific to mdocml. mdocml assums wchar_t's internal representation UCS-4 (__STDC_ISO_10646__). See line 31 of: http://mandoc.bsd.lv/cgi-bin/cvsweb/configure.local.example?annotate=1.33 But our locale's wchar_t is not always UCS-4, we use a locale-dependent encoding for now (eg. ja_JP.eucJP). If branch perseant-stdc-iso10646 is merged, I think that the situation will change. > Is the problem: netbsd mishandles some locales it claims to support? No. -- Takeshi Nakayama
Re: CVS commit: src
>>> "matthew green" wrote
> Module Name: src
> Committed By: mrg
> Date: Thu Jan 18 00:32:49 UTC 2018
>
> Modified Files:
> src/sbin/raidctl: raidctl.8 raidctl.c rf_configure.c
> src/sys/conf: files
> src/sys/dev/raidframe: files.raidframe raidframeio.h raidframevar.h
> rf_compat50.c rf_decluster.c rf_decluster.h rf_kintf.h
> rf_netbsdkintf.c rf_reconutil.c
> src/sys/modules/raid: Makefile
> src/sys/rump: Makefile.rump
> src/sys/rump/dev/lib/libraidframe: Makefile
> src/tests/dev/raidframe: t_raid.sh
> Added Files:
> src/sys/dev/raidframe: rf_compat32.c rf_compat32.h rf_compat80.c
> rf_compat80.h
>
> Log Message:
> implement 32-bit compat support for raidframe.
>
> convert several raidframe ioctls to be bitsize idempotent so that
> they work the same in 32 and 64 bit worlds, allowing netbsd32 to
> configure and query raid properly. remove useless 'row' in a few
> places. add COMPAT_80 and put the old ioctls there.
>
> raidframeio.h:
> RAIDFRAME_TEST_ACC
> - remove, unused
> RAIDFRAME_GET_COMPONENT_LABEL
> - convert to label not pointer to label
> RAIDFRAME_CHECK_RECON_STATUS_EXT
> RAIDFRAME_CHECK_PARITYREWRITE_STATUS_EXT
> RAIDFRAME_CHECK_COPYBACK_STATUS_EXT
> - convert to progress info not pointer to info
> RAIDFRAME_GET_INFO
> - version entirely.
> raidframevar.h:
> - rf_recon_req{} has row, flags and raidPtr removed (they're
> not a useful part of this interface.)
> - RF_Config_s{} and RF_DeviceConfig_s{} have numRow/rows removed.
> - RF_RaidDisk_s{} is re-ordered slightly to fix alignment
> padding - the actual data was already OK.
> - InstallSpareTable() loses row argument
>
> rf_compat32.c has code for RF_Config_s{} in 32 bit mode, used
> by RAIDFRAME_CONFIGURE and RAIDFRAME_GET_INFO32.
>
> rf_compat80.c has code for rf_recon_req{}, RF_RaidDisk_s{} and
> RF_DeviceConfig_s{} to handle RAIDFRAME_FAIL_DISK,
> RAIDFRAME_GET_COMPONENT_LABEL, RAIDFRAME_CHECK_RECON_STATUS_EXT,
> RAIDFRAME_CHECK_PARITYREWRITE_STATUS_EXT,
> RAIDFRAME_CHECK_COPYBACK_STATUS_EXT, RAIDFRAME_GET_INFO.
>
> move several of the per-ioctl code blocks into separate functions.
>
> add rf_recon_req_internal{} to replace old usage of global
> rf_recon_req{} that had unused void * in the structure, ruining
> it's 32/64 bit ABI.
>
> add missing case for RAIDFRAME_GET_INFO50.
>
> adjust raid tests to use the new .conf format, and add a case to
> test the old method as well.
>
> raidctl:
> deal with lack of 'row' members in a couple of places.
> fail request no longer takes row.
> handle "START array" sections with just "numCol numSpare", ie
> no "numRow" specified. for now, generate old-style configuration
> but update raidctl.8 to specify the new style (keeping reference
> to the old style.)
>
> note that: RF_ComponentLabel_s::{row,num_rows} and
> RF_SingleComponent_s::row are obsolete but not removed yet.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.73 -r1.74 src/sbin/raidctl/raidctl.8
> cvs rdiff -u -r1.65 -r1.66 src/sbin/raidctl/raidctl.c
> cvs rdiff -u -r1.32 -r1.33 src/sbin/raidctl/rf_configure.c
> cvs rdiff -u -r1.1191 -r1.1192 src/sys/conf/files
> cvs rdiff -u -r1.9 -r1.10 src/sys/dev/raidframe/files.raidframe
> cvs rdiff -u -r1.7 -r1.8 src/sys/dev/raidframe/raidframeio.h \
> src/sys/dev/raidframe/rf_decluster.h
> cvs rdiff -u -r1.17 -r1.18 src/sys/dev/raidframe/raidframevar.h
> cvs rdiff -u -r0 -r1.1 src/sys/dev/raidframe/rf_compat32.c \
> src/sys/dev/raidframe/rf_compat32.h src/sys/dev/raidframe/rf_compat80.c \
> src/sys/dev/raidframe/rf_compat80.h
> cvs rdiff -u -r1.2 -r1.3 src/sys/dev/raidframe/rf_compat50.c
> cvs rdiff -u -r1.24 -r1.25 src/sys/dev/raidframe/rf_decluster.c \
> src/sys/dev/raidframe/rf_kintf.h
> cvs rdiff -u -r1.352 -r1.353 src/sys/dev/raidframe/rf_netbsdkintf.c
> cvs rdiff -u -r1.35 -r1.36 src/sys/dev/raidframe/rf_reconutil.c
> cvs rdiff -u -r1.1 -r1.2 src/sys/modules/raid/Makefile
> cvs rdiff -u -r1.122 -r1.123 src/sys/rump/Makefile.rump
> cvs rdiff -u -r1.10 -r1.11 src/sys/rump/dev/lib/libraidframe/Makefile
> cvs rdiff -u -r1.12 -r1.13 src/tests/dev/raidframe/t_raid.sh
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
The kernel with this changes cannot configure the RAIDframe device
with old raidctl(8) as follows, since RF_Config_s has been changed
(remove numRow) but no compat code.
| dk_lookup on device: failed!
| RAIDFRAME: failed rf_ConfigureDisks with 2
| raidctl: ioctl (RAIDFRAME_CONFIGURE) failed: No such file or directory
-- Takeshi Nakayama
Re: CVS commit: src/sys/dev
>>> Michael van Elst wrote > On Fri, Nov 03, 2017 at 09:22:36AM +0900, Takeshi Nakayama wrote: > > errno 5 is EIO. > > > > This is why we check WDF_LOADED is not set and !RAW_PART or !S_IFCHR > > in wdopen(). WDF_LOADED is set only in wd_fistopen(), so we cannot > > open disks unless open with RAW_PART and S_IFCHR in the first time. > > > > Possible fix is remove useless check as follows or introduce > > WDF_OPEN if we want to mimic the sd(4). > > Please try > > http://ftp.netbsd.org/pub/NetBSD/misc/mlelstv/wd.diff > > this is the "introduce WDF_OPEN" that is missing. I just confirmed that works well. Thank you for fixing. -- Takehi Nakayama
Re: CVS commit: src/sys/dev
>>> Robert Swindells wrote
>
> "Michael van Elst" wrote:
> >Module Name:src
> >Committed By: mlelstv
> >Date: Wed Nov 1 19:34:46 UTC 2017
> >
> >Modified Files:
> >src/sys/dev: files.dev
> >src/sys/dev/ata: ata_raid_adaptec.c ata_raid_intel.c
> > ata_raid_jmicron.c
> >ata_raid_nvidia.c ata_raid_promise.c ata_raid_via.c wd.c wdvar.h
> >
> >Log Message:
> >refactor wd and ataraid drivers to use common disk subroutines.
>
> Should this work if wedges are not being used ?
>
> Without any DKWEDGE_* options I now get:
>
> ...
> opendisk: can't open dev wd0 (5)
> opendisk: can't open dev wd0 (5)
> opendisk: can't open dev wd0 (5)
> boot device:
> root on wd0a dumps on wd0b
> vfs_mountroot: can't open root device
> cannot mount root, error = 5
errno 5 is EIO.
This is why we check WDF_LOADED is not set and !RAW_PART or !S_IFCHR
in wdopen(). WDF_LOADED is set only in wd_fistopen(), so we cannot
open disks unless open with RAW_PART and S_IFCHR in the first time.
Possible fix is remove useless check as follows or introduce
WDF_OPEN if we want to mimic the sd(4).
Index: wd.c
===
RCS file: /cvsroot/src/sys/dev/ata/wd.c,v
retrieving revision 1.434
diff -u -d -r1.434 wd.c
--- wd.c1 Nov 2017 19:34:46 - 1.434
+++ wd.c3 Nov 2017 00:10:33 -
@@ -964,7 +964,7 @@
{
struct wd_softc *wd;
struct dk_softc *dksc;
- int unit, part, error;
+ int unit, error;
ATADEBUG_PRINT(("wdopen\n"), DEBUG_FUNCS);
unit = WDUNIT(dev);
@@ -976,20 +976,9 @@
if (! device_is_active(dksc->sc_dev))
return (ENODEV);
- part = WDPART(dev);
-
if (wd->sc_capacity == 0)
return (ENODEV);
- /*
-* If any partition is open, but the disk has been invalidated,
-* disallow further opens.
-*/
- if ((wd->sc_flags & WDF_LOADED) == 0) {
- if (part != RAW_PART || fmt != S_IFCHR)
- return EIO;
- }
-
error = dk_open(dksc, dev, flag, fmt, l);
return error;
-- Takeshi Nakayama
Re: CVS commit: src/sys/arch/sparc64/sparc64
>>> "Palle Lyckegaard" wrote > Module Name: src > Committed By: palle > Date: Sat Feb 11 23:41:36 UTC 2017 > > Modified Files: > src/sys/arch/sparc64/sparc64: trap.c > > Log Message: > sun4v: Fix calculation of mmu data fault address (pointer arithmetic) paddr_t is "unsigned long int" or "unsigned long long int", so not a pointer. Why did you add "/ sizeof(paddr_t)" ? -- Takeshi Nakayama
Re: CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch
>>> Takeshi Nakayama wrote > >>> "Joerg Sonnenberger" wrote > > > Module Name:src > > Committed By: joerg > > Date: Fri Jun 3 15:42:15 UTC 2016 > > > > Modified Files: > > src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: x86cpuid.S > > src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: > > x86_64cpuid.S > > > > Log Message: > > Regenerate to use .ctor. > > It seems that libcrypto on amd64 and i386 is broken by this change. > > http://releng.netbsd.org/b5reports/amd64/ > http://releng.netbsd.org/b5reports/i386/ Oops, thanks to christos for reverting. -- Takeshi Nakayama
Re: CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch
>>> "Joerg Sonnenberger" wrote
> Module Name: src
> Committed By: joerg
> Date: Fri Jun 3 15:42:15 UTC 2016
>
> Modified Files:
> src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: x86cpuid.S
> src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64:
> x86_64cpuid.S
>
> Log Message:
> Regenerate to use .ctor.
It seems that libcrypto on amd64 and i386 is broken by this change.
http://releng.netbsd.org/b5reports/amd64/
http://releng.netbsd.org/b5reports/i386/
-- Takeshi Nakayama
Re: CVS commit: [netbsd-7] src/sys/sys
>>> "SAITOH Masanobu" wrote > Module Name: src > Committed By: msaitoh > Date: Mon Mar 7 08:08:52 UTC 2016 > > Modified Files: > src/sys/sys [netbsd-7]: exec_elf.h > > Log Message: > Pullup the following revision (requested by htodd in ticket #1132): > > sys/sys/exec_elf.h1.143 > > Add definition of EM_IAMCU. This change fixes build break caused by > ticket 1126. Wrong commit message? This is for 1.153 not 1.143. -- Takeshi Nakayama
Re: CVS commit: src/share/mk
>>> Taylor R Campbell wrote >Date: Sat, 23 Jan 2016 17:38:51 +0900 (JST) > From: Takeshi Nakayama > >>>> "Jeff Rizzo" wrote > >> Module Name: src >> Committed By:riz >> Date:Fri Jan 22 21:55:51 UTC 2016 >> >> Modified Files: >> src/share/mk: bsd.own.mk >> >> Log Message: >> Build DTrace userland by default on i386, amd64 and earm* > >Cross build on non supported architecture (e.g. host: sparc64, >target: i386) fails at tools build. > > Is it fixed by this? > > https://mail-index.netbsd.org/source-changes/2016/01/23/msg072070.html Yes, this change fixes the failure of tools build. Thanks, Takeshi Nakayama
Re: CVS commit: src/share/mk
>>> "Jeff Rizzo" wrote > Module Name: src > Committed By: riz > Date: Fri Jan 22 21:55:51 UTC 2016 > > Modified Files: > src/share/mk: bsd.own.mk > > Log Message: > Build DTrace userland by default on i386, amd64 and earm* Cross build on non supported architecture (e.g. host: sparc64, target: i386) fails at tools build. # compile libctf/ctf_create.lo cc -pipe -O2 -mcpu=ultrasparc -DCTF_OLD_VERSIONS -I/export/anoncvs/src/tools/libctf/../compat -I/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/sys -I/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/include -I/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/head -I/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/common/ctf -I/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/lib/libctf/common -I/export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/uts/common -I/export/anoncvs/src/tools/libctf/../../external/bsd/elftoolchain/dist/libelf -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -I/w0/tools/include/compat -I/export/anoncvs/src/tools/compat -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -I/w0/tools/include -I/w0/tools/include/nbinclude -c -o ctf_create.lo.o /export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/common/ctf/ctf_create.c In file included from /export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/uts/common/sys/debug.h:32:0, from /export/anoncvs/src/tools/libctf/../../external/cddl/osnet/sys/sys/debug.h:47, from /export/anoncvs/src/tools/libctf/../../external/cddl/osnet/dist/common/ctf/ctf_create.c:38: /export/anoncvs/src/tools/libctf/../../external/cddl/osnet/sys/sys/isa_defs.h:50:2: error: #error "architecture not supported" #error "architecture not supported" ^ *** Failed target: ctf_create.lo -- Takeshi Nakayama
Re: CVS commit: src
>>> "enami tsugutomo" wrote > Module Name: src > Committed By: enami > Date: Mon Mar 2 03:17:24 UTC 2015 > > Modified Files: > src/bin/cp: utils.c > src/bin/mv: mv.c > src/sbin/restore: dirs.c tape.c > src/usr.bin/touch: touch.c > > Log Message: > Don't truncate at sub-microsecond while preserving timestamps. > > One of motivation of this change is to make the behavior of test(1) > -nt/ot with preserved copy (like cp -p) closer to the NetBSD 6. > Of course whether full timestamps are kept or not depends also on > underlying file system. > > The ifdef added in mv(1) since existing ifdefs was our local change > to compile it on solaris (though I couldn't test it): > http://mail-index.netbsd.org/tech-userlevel/2014/11/28/msg008831.html > > > To generate a diff of this commit: > cvs rdiff -u -r1.42 -r1.43 src/bin/cp/utils.c > cvs rdiff -u -r1.43 -r1.44 src/bin/mv/mv.c > cvs rdiff -u -r1.50 -r1.51 src/sbin/restore/dirs.c > cvs rdiff -u -r1.67 -r1.68 src/sbin/restore/tape.c > cvs rdiff -u -r1.32 -r1.33 src/usr.bin/touch/touch.c Would you please send a request to pull this and related changes up to netbsd-7? My local script gets wrong behavior after upgrading to NetBSD 7.0 since it uses cp -p and test -nt. Thanks, -- Takeshi Nakayama
Re: CVS commit: src/usr.bin/xinstall
>>> "Christos Zoulas" wrote
>
> Module Name: src
> Committed By: christos
> Date: Mon Jun 15 16:33:38 UTC 2015
>
> Modified Files:
> src/usr.bin/xinstall: Makefile xinstall.c
>
> Log Message:
> - improve error printing
> - deduplicate run functions and don't use the shell so that we handle
> filenames with spaces and metacharacters consistently.
The latter change seems to make incompatibility as before:
- wait(2) after posix_spawnp? is missing.
- don't unlink file when execution of strip(1) is failed.
The following is a quick fix.
Index: xinstall.c
===
RCS file: /cvsroot/src/usr.bin/xinstall/xinstall.c,v
retrieving revision 1.119
diff -u -d -p -r1.119 xinstall.c
--- xinstall.c 15 Jun 2015 16:33:38 - 1.119
+++ xinstall.c 17 Jun 2015 10:40:45 -
@@ -990,7 +990,8 @@ run(const char *command, const char *fla
if (rv != 0) {
warnc(rv, "Cannot execute %s", command);
rv = -1;
- }
+ } else
+ rv = wait(&status);
#else
switch (vfork()) {
case -1:
@@ -1042,7 +1043,7 @@ strip(const char *to_name)
stripprog = _PATH_STRIP;
#endif
}
- run(stripprog, stripArgs, to_name, 0);
+ run(stripprog, stripArgs, to_name, 1);
}
/*
-- Takeshi Nakayama
Re: CVS commit: src
>>> "enami tsugutomo" wrote > Module Name: src > Committed By: enami > Date: Wed Nov 26 23:44:21 UTC 2014 > > Modified Files: > src/lib/libc/net: rcmd.c > src/usr.bin/rsh: rsh.c > > Log Message: > Changes done in rsh.c rev. 1.35 was incomplete. As chuq pointed > in private mail, it broke rcp(1). > > To achieve the documented behavior and to fix long standing incorrect > rsh(1) behavior which I've tried to fix in rev. 1.35, rcmd(1) should have > two operation mode; whether it should relay signal information on > auxiliary channel or not, depending on the argument `fd2p' passed to rcmd(3). > So, make rcmd(1) behave differntly depending on the environment variable and > set it when necessary in rcmd(3) according to how auxiliary channel > is set up by rcmd(3). > > > To generate a diff of this commit: > cvs rdiff -u -r1.70 -r1.71 src/lib/libc/net/rcmd.c > cvs rdiff -u -r1.37 -r1.38 src/usr.bin/rsh/rsh.c Please handle PR bin/49023. -- Takeshi Nakayama
Re: CVS commit: src/sys
>>> Justin Cormack wrote > You also need to wrap the #include in sys/netsmb/iconv.c in > #ifdef as well, as some platforms do not have the header. Committed yesterday. > How does it work when not using rump? Do we really need in kernel iconv? It works as before, -E option is silently ignored. If mount_smbfs should works as described in mount_smbfs(8), kernel iconv or other similar function is needed. -- Takeshi Nakayama
Re: CVS commit: src/sys
>>> Antti Kantee wrote > On 15/11/14 23:46, Takeshi Nakayama wrote: > >>>> Justin Cormack wrote > > > >> Er, you can't do that. > >> > >> 1. It breaks the rump builds on most platforms > >> http://build.myriabit.eu:8012/waterfall as the prototypes dont match > >> eg see > >> http://build.myriabit.eu:8012/builders/ppc64-cross/builds/5585/steps/shell_3/logs/stdio > > > > It seems that posix says 2nd arg of iconv(3) is char **, but > > NetBSD's one is const char **. > > > >> 2. There is no requirement that rump runs on a platform that has iconv > >> anyway, it may be running on bare metal, or non Posix platform. > >> > >> Not sure what the intention was though - I am sure we can find a way > >> around it... > > > > I would like to include this at least on NetBSD host since we don't > > have kernel iconv and then mount_smbfs(8) is useless for filename > > conversions. > > > > So is it ok to add a compile-time option as below and define it > > somewhere? Or are there any more appropriate make variables to > > detect host OS? > > Is the effect that the smbfs driver has more functionality when it is > run in a rump kernel than when it is run in the NetBSD kernel? That is > not a good change. In addition to reason "2" cited above, there is a > usability problem: mount with and without "-o rump" is supposed to > provide the same functionality. If "-o rump" starts meaning "with > working iconv", it will make configuration and documentation difficult. I plan to add the following lines to mount_smbfs(8). The -E option was the same as -c before my change was commited. | BUGS | The -E option works only if you mount with rump_smbfs(8) instead of | mount_smbfs. | | The -c option is not implemented yet. It is silently ignored for now. > While it is possible to add compile-time conditionals to the effect that > your change does not per se break anything, I would rather see a fix > which also works with mount_smbfs. It is not easy to work, so I think it is a good idea to work partially using rump kernel. -- Takeshi Nakayama
Re: CVS commit: src/sys
>>> Takeshi Nakayama wrote
> >>> Justin Cormack wrote
>
> > Er, you can't do that.
> >
> > 1. It breaks the rump builds on most platforms
> > http://build.myriabit.eu:8012/waterfall as the prototypes dont match
> > eg see
> > http://build.myriabit.eu:8012/builders/ppc64-cross/builds/5585/steps/shell_3/logs/stdio
>
> It seems that posix says 2nd arg of iconv(3) is char **, but
> NetBSD's one is const char **.
>
> > 2. There is no requirement that rump runs on a platform that has iconv
> > anyway, it may be running on bare metal, or non Posix platform.
> >
> > Not sure what the intention was though - I am sure we can find a way
> > around it...
>
> I would like to include this at least on NetBSD host since we don't
> have kernel iconv and then mount_smbfs(8) is useless for filename
> conversions.
>
> So is it ok to add a compile-time option as below and define it
> somewhere? Or are there any more appropriate make variables to
> detect host OS?
On second thought, it seems user component can use __NetBSD__
definition, how about this change?
-- Takeshi Nakayama
Index: netsmb_user.c
===
RCS file: /cvsroot/src/sys/rump/dev/lib/libnetsmb/netsmb_user.c,v
retrieving revision 1.1
diff -u -d -r1.1 netsmb_user.c
--- netsmb_user.c 15 Nov 2014 18:49:04 - 1.1
+++ netsmb_user.c 16 Nov 2014 00:21:28 -
@@ -36,6 +36,7 @@
int
rumpcomp_netsmb_iconv_open(const char *to, const char *from, void **handle)
{
+#ifdef __NetBSD__
iconv_t cd;
int rv;
@@ -49,11 +50,16 @@
}
return rumpuser_component_errtrans(rv);
+#else
+ /* fallback to use stub functions */
+ return 0;
+#endif
}
int
rumpcomp_netsmb_iconv_close(void *handle)
{
+#ifdef __NetBSD__
int rv;
if (iconv_close((iconv_t)handle) == -1)
@@ -62,12 +68,17 @@
rv = 0;
return rumpuser_component_errtrans(rv);
+#else
+ /* do nothing */
+ return 0;
+#endif
}
int
rumpcomp_netsmb_iconv_conv(void *handle, const char **inbuf,
size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
{
+#ifdef __NetBSD__
int rv;
if (iconv((iconv_t)handle, inbuf, inbytesleft, outbuf, outbytesleft)
@@ -77,5 +88,9 @@
rv = 0;
return rumpuser_component_errtrans(rv);
+#else
+ /* do nothing */
+ return 0;
+#endif
}
#endif
Re: CVS commit: src/sys
>>> Justin Cormack wrote
> Er, you can't do that.
>
> 1. It breaks the rump builds on most platforms
> http://build.myriabit.eu:8012/waterfall as the prototypes dont match
> eg see
> http://build.myriabit.eu:8012/builders/ppc64-cross/builds/5585/steps/shell_3/logs/stdio
It seems that posix says 2nd arg of iconv(3) is char **, but
NetBSD's one is const char **.
> 2. There is no requirement that rump runs on a platform that has iconv
> anyway, it may be running on bare metal, or non Posix platform.
>
> Not sure what the intention was though - I am sure we can find a way
> around it...
I would like to include this at least on NetBSD host since we don't
have kernel iconv and then mount_smbfs(8) is useless for filename
conversions.
So is it ok to add a compile-time option as below and define it
somewhere? Or are there any more appropriate make variables to
detect host OS?
-- Takeshi Nakayama
Index: Makefile
===
RCS file: /cvsroot/src/sys/rump/dev/lib/libnetsmb/Makefile,v
retrieving revision 1.5
diff -u -d -r1.5 Makefile
--- Makefile15 Nov 2014 18:49:04 - 1.5
+++ Makefile15 Nov 2014 22:56:53 -
@@ -13,8 +13,10 @@
CPPFLAGS+= -I${RUMPTOP}/librump/rumpvfs
#CPPFLAGS+=-DSMB_SOCKET_DEBUG -DSMB_IOD_DEBUG
+.if ${RUMP_NETSMB_ICONV:Uno} == "yes"
SRCS+= netsmb_iconv.c
RUMPCOMP_USER_SRCS=netsmb_user.c
+.endif
.include
.include
Re: CVS commit: src/external/gpl3/gcc
>>> Christoph Egger wrote > On 26.02.14 11:50, matthew green wrote: > > +date=$(date +%Y%m%M-%H%M) > > I think, it isn't necessary to invoke a subshell. > > date=`date +%Y%m%M-%H%M` is enough. date +%Y%m%d-%H%M ? -- Takeshi Nakayama
Re: CVS commit: src/sys/netsmb
>>> Joerg Sonnenberger wrote > On Thu, Feb 20, 2014 at 08:41:36PM +0900, Takeshi Nakayama wrote: > > >>> "Joerg Sonnenberger" wrote > > > > > Module Name: src > > > Committed By: joerg > > > Date: Thu Feb 20 11:08:57 UTC 2014 > > > > > > Modified Files: > > > src/sys/netsmb: iconv.c > > > > > > Log Message: > > > Don't dereference NULL pointers. > > > > I guess proper fix is to move NULL check in iconv_conv(). > > The issue was not so much the inbuf check, but that inbytesleft is a > NULL pointer. That said, I don't understand what the first call was > supposed to do. iconv_conv() is a function correspond to iconv(3), so the first call intends to initialize the internal state. But iconv_open() and iconv_close() are competely dummy functions, so it does nothing for now. -- Takeshi Nakayama
Re: CVS commit: src/sys/netsmb
>>> "Joerg Sonnenberger" wrote
> Module Name: src
> Committed By: joerg
> Date: Thu Feb 20 11:08:57 UTC 2014
>
> Modified Files:
> src/sys/netsmb: iconv.c
>
> Log Message:
> Don't dereference NULL pointers.
I guess proper fix is to move NULL check in iconv_conv().
-- Takeshi Nakayama
Index: iconv.c
===
RCS file: /cvsroot/src/sys/netsmb/iconv.c,v
retrieving revision 1.12
diff -u -d -r1.12 iconv.c
--- iconv.c 16 Nov 2006 01:33:51 - 1.12
+++ iconv.c 20 Feb 2014 11:38:05 -
@@ -30,12 +30,12 @@
iconv_conv(void *handle, const char **inbuf,
size_t *inbytesleft, char **outbuf, size_t *outbytesleft)
{
- if (*inbytesleft > *outbytesleft)
- return(E2BIG);
-
if (inbuf == NULL)
return(0); /* initial shift state */
+ if (*inbytesleft > *outbytesleft)
+ return(E2BIG);
+
(void)memcpy(*outbuf, *inbuf, *inbytesleft);
*outbytesleft -= *inbytesleft;
Re: CVS commit: src/sys/arch/sparc64/include
>>> "Michael Lorenz" wrote > Module Name: src > Committed By: macallan > Date: Thu Jan 9 12:51:27 UTC 2014 > > Modified Files: > src/sys/arch/sparc64/include: cpu.h > > Log Message: > allow non-SUN4V kernels to build I think that fixing sparc64/genassym.cf is a porper fix, but this change is also necessary as mrg pointed out. -- Takeshi Nakayama
Re: CVS commit: src/lib/csu/common
>>> "Martin Husemann" wrote > Module Name: src > Committed By: martin > Date: Sat Nov 16 10:50:43 UTC 2013 > > Modified Files: > src/lib/csu/common: Makefile.inc > > Log Message: > We do not want to build the code model markes when creating the 32bit > compat libs for sparc64 I think proper fix is to use CSU_MACHINE_ARCH instead of MACHINE_ARCH. -- Takeshi Nakayama
Re: CVS commit: src/sys/arch/sparc64/sparc64
>>> Michael wrote > Hello, > > on Thursday 22 August 2013 06:00:43 Takeshi Nakayama wrote: > > Module Name:src > > Committed By: nakayama > > Date: Thu Aug 22 10:00:43 UTC 2013 > > > > Modified Files: > > src/sys/arch/sparc64/sparc64: clock.c > > > > Log Message: > > Make timecounter "tick-counter" mandatory. > > This is going to bite us when we actually mess with the CPU's clock speed ( > which is the whole point of using %stick and STICK ) This change provides a chance to select a prefer timecounter to users via sysctl kern.timecounter.hardware. stick-counter's quality is larger than tick-counter's one. The default choice becomes to stick-counter, so it's no problem. -- Takeshi Nakayama
Re: CVS commit: src/distrib/sets/lists
>>> chris...@astron.com (Christos Zoulas) wrote > In article <20130702175606.b41c...@cvs.netbsd.org>, > Takeshi Nakayama wrote: > > I think that's wrong. All tests except the t_raw test don't. They certainly > don't link with rump! > > christos I think so too. I just enabled them. -- Takeshi Nakayama
Re: CVS commit: src/sys/arch/sparc64
>>> Martin Husemann wrote > On Mon, Jun 24, 2013 at 10:41:11AM +0900, Takeshi Nakayama wrote: > > It seems sparc64's MD codes don't treat about kpreempt, so I didn't > > care about kpreempt. > > Yet - but this will change. > > Martin Yes, I understand it. I just forgot to write "for now". -- Takeshi Nakayama
Re: CVS commit: src/sys/arch/sparc64
>>> matthew green wrote > > i'm curious - what were you going to trigger this problem? Discussion about bge driver in last month's port-sparc64. I have known this method since I was adding a cardbus support to sparc64 a decade ago. But I adopted the method checking a OFW's node instead of it. I've been meaning to implement it if I have a chance. > > Module Name:src > > Committed By: nakayama > > Date: Fri Jun 21 20:09:59 UTC 2013 > > > > Modified Files: > > src/sys/arch/sparc64/dev: psycho.c pyro.c schizo.c > > src/sys/arch/sparc64/include: cpu.h > > src/sys/arch/sparc64/sparc64: trap.c > > > > Log Message: > > Avoid data_access_error trap panic when reading unused PCI > > configuration space. > > > > This method is described in UltraSPARC IIi User's Manual "16.2.1 > > Probing PCI during boot using deferred errors", and refer to the > > implementation of OpenBSD. > > hmmm, i wonder if kpreempt_disable()/enable() should go > around these calls now. we don't want these accesses > to migrate to another cpu in the middle .. > > i don't think there's any reason pci_conf_* have to be > called in a context that has kpreempt already disabled. It seems sparc64's MD codes don't treat about kpreempt, so I didn't care about kpreempt. Thanks, -- Takeshi Nakayama
Re: CVS commit: [netbsd-5] src
>>> "Jeff Rizzo" wrote > Module Name: src > Committed By: riz > Date: Sat Apr 21 15:52:55 UTC 2012 > > Modified Files: > src/crypto/dist/openssl/crypto [netbsd-5]: mem.c > src/crypto/dist/openssl/crypto/asn1 [netbsd-5]: a_d2i_fp.c > src/crypto/dist/openssl/crypto/buffer [netbsd-5]: buffer.c > src/sys/miscfs/genfs [netbsd-5]: genfs_io.c > > Log Message: > Pull up following revision(s) (requested by spz in ticket #1750): > crypto/dist/openssl/crypto/mem.c patch > crypto/dist/openssl/crypto/asn1/a_d2i_fp.cpatch > crypto/dist/openssl/crypto/buffer/buffer.cpatch > sys/miscfs/genfs/genfs_io.c patch > > Address CVE-2012-2110. > [spz, ticket #1750] Is the change for genfs_io.c intended? -- Takeshi Nakayama
Re: CVS commit: src/sys/arch/sparc64/sparc64
>>> David Laight wrote > Is that a gcc bug? I don't know. > Or are the high register bits usually undefined for 32bit values, > and this to do with using 64bit asm in a 32bit kernel? But I guess it's undefined from looking at the generated codes. Our kernel code is shared between 32-bit and 64-bit, and 64-bit asm is usually used in locore.s. -- Takeshi Nakayama
Re: CVS commit: [netbsd-6] src/usr.sbin/postinstall
>>> Alan Barrett wrote > If revision 1.132 of postinstall is pulled up, then you also need > revision 1.133. I just sent the pullup request (ticket #44). -- Takeshi Nakayama
Re: CVS commit: src/sys/dev/pci
>>> "Marc Balmer" wrote > Module Name: src > Committed By: mbalmer > Date: Sat Oct 8 10:21:16 UTC 2011 > > Modified Files: > src/sys/dev/pci: if_iwn.c > > Log Message: > Make this compile again: Use the device_xname() macro to get the devic name. It should use aprint_error_dev() just like other messages. -- Takeshi Nakayama
Re: CVS commit: src/crypto/external/bsd/libsaslc/dist/src
>>> "Christos Zoulas" wrote
> Module Name: src
> Committed By: christos
> Date: Sun Feb 13 05:39:52 UTC 2011
>
> Modified Files:
> src/crypto/external/bsd/libsaslc/dist/src: mech.c
>
> Log Message:
> Make all mechanisms optional, so we can compile in only the ones we want.
> @@ -100,7 +106,9 @@
> saslc__error_set_errno(ERR(ctx), ERROR_NOMEM);
> return NULL;
> }
> - for (i = 0; saslc__mechanisms[i] != NULL; i++) {
> + for (i = 0; __arraycount(saslc__mechanisms); i++) {
> + if (saslc__mechanisms[i] == NULL)
> + continue;
> if ((node = calloc(1, sizeof(*node))) == NULL)
> goto error;
"i <" is missing?
-- Takeshi Nakayama
Re: CVS commit: src/sys/dev/pci
>>> Erik Fair wrote > Has a pull-up request to netbsd-5 been submitted? Yes, ticket pullup-5 #1471. -- Takeshi Nakayama > Erik > > On Nov 3, 2010, at 04:46, Takeshi Nakayama wrote: > > > Module Name:src > > Committed By: nakayama > > Date: Wed Nov 3 11:46:31 UTC 2010 > > > > Modified Files: > > src/sys/dev/pci: aceride.c > > > > Log Message: > > Add a workaround for 48-bit LBA DMA access bug on M5229 rev. <= 0xc4. > > - use DMA in 28-bit LBA addressing. > > - use PIO in 48-bit LBA addressing. > > > > Idea and message are from FreeBSD, and tested on M5229 rev. 0xc3 in > > my Sun Netra X1 with 160GB drive. > > > > > > To generate a diff of this commit: > > cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/aceride.c > > > > Please note that diffs are not public domain; they are subject to the > > copyright notices on the relevant files. > > >
Re: CVS commit: src/sys/arch/sparc64
>>> Martin Husemann wrote
> Module Name: src
> Committed By: martin
> Date: Fri Apr 2 18:34:16 UTC 2010
>
> Modified Files:
> src/sys/arch/sparc64/include: bootinfo.h
> src/sys/arch/sparc64/sparc64: autoconf.c
>
> Log Message:
> Add a bootinfo node to allow the loader to override the boot device
This change makes -current kernel cannot boot with old ofwboot.
NetBSD 5.99.25 (GENERIC) #37: Sun Apr 4 06:36:29 JST 2010
take...@nyx:/usr/src/sys/arch/sparc64/compile/GENERIC
total memory = 768 MB
avail memory = 741 MB
panic: lookup_bootinfo: No BTINFO_BOOTDEV found.
The following patch fixes the problem.
-- Takeshi Nakayama
Index: autoconf.c
===
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/autoconf.c,v
retrieving revision 1.174
diff -u -d -r1.174 autoconf.c
--- autoconf.c 2 Apr 2010 18:34:16 - 1.174
+++ autoconf.c 4 Apr 2010 11:34:32 -
@@ -356,8 +356,8 @@
if ((chosen = OF_finddevice("/chosen")) == -1)
return;
- LOOKUP_BOOTINFO(bdev, BTINFO_BOOTDEV);
- if (bdev) {
+ bdev = lookup_bootinfo(BTINFO_BOOTDEV);
+ if (bdev != NULL) {
strcpy(ofbootpath, bdev->name);
} else {
if (OF_getprop(chosen, "bootpath", sbuf, sizeof(sbuf)) < 0)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Tue Mar 2 12:18:36 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: Make kernel buildable without device ecadc. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/arch/sparc64/conf/files.sparc64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: nakayama Date: Tue Mar 2 12:18:36 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: files.sparc64 Log Message: Make kernel buildable without device ecadc. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/arch/sparc64/conf/files.sparc64 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/sparc64/conf/files.sparc64 diff -u src/sys/arch/sparc64/conf/files.sparc64:1.125 src/sys/arch/sparc64/conf/files.sparc64:1.126 --- src/sys/arch/sparc64/conf/files.sparc64:1.125 Sun Feb 28 11:49:44 2010 +++ src/sys/arch/sparc64/conf/files.sparc64 Tue Mar 2 12:18:35 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.sparc64,v 1.125 2010/02/28 11:49:44 martin Exp $ +# $NetBSD: files.sparc64,v 1.126 2010/03/02 12:18:35 nakayama Exp $ # @(#)files.sparc64 8.1 (Berkeley) 7/19/93 # sparc64-specific configuration info @@ -74,11 +74,11 @@ device pcfiic: sysmon_envsys, pcf8584, i2cbus attach pcfiic at ebus -file arch/sparc64/dev/pcfiic_ebus.c pcfiic +file arch/sparc64/dev/pcfiic_ebus.c pcfiic device ecadc attach ecadc at iic -file arch/sparc64/dev/pcf8591_envctrl.c +file arch/sparc64/dev/pcf8591_envctrl.c ecadc device lom: sysmon_envsys, sysmon_wdog attach lom at ebus
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Mon Feb 15 11:46:54 UTC 2010 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: Fix linker error of GENERIC32 kernel. To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/sys/arch/sparc64/sparc64/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: nakayama Date: Sat Feb 13 11:55:48 UTC 2010 Modified Files: src/sys/arch/sparc64/dev: schizo.c schizoreg.h Log Message: Make 32-bit kernels compilable. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc64/dev/schizo.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/schizoreg.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/sparc64/sparc64
Module Name:src Committed By: nakayama Date: Fri Jan 15 23:57:07 UTC 2010 Modified Files: src/sys/arch/sparc64/sparc64: ipifuncs.c Log Message: UltraSPARC-IIIi CPUs select the BUSY/NACK pair in the interrupt vector dispatch status register based on the lower two bits of the ITID. >From OpenBSD and details are described in the section 10.4.3 of UltraSPARC IIIi Processor User's Manual. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc64/sparc64/ipifuncs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
