CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: andvar Date: Mon Sep 11 22:09:29 UTC 2023 Modified Files: src/sys/arch/hpcmips/vr: flash_vrip.c Log Message: hpcmips/vrflash(4): custom DPRINTF definition requires additional brackets around the arguments. Fixes FLUSH_DEBUG build. However the driver fails to link due to missing reference to flash_cd, my guess because of obsoleted flash device-major. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcmips/vr/flash_vrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpcmips/vr
Module Name:src Committed By: andvar Date: Mon Sep 11 22:09:29 UTC 2023 Modified Files: src/sys/arch/hpcmips/vr: flash_vrip.c Log Message: hpcmips/vrflash(4): custom DPRINTF definition requires additional brackets around the arguments. Fixes FLUSH_DEBUG build. However the driver fails to link due to missing reference to flash_cd, my guess because of obsoleted flash device-major. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hpcmips/vr/flash_vrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcmips/vr/flash_vrip.c diff -u src/sys/arch/hpcmips/vr/flash_vrip.c:1.13 src/sys/arch/hpcmips/vr/flash_vrip.c:1.14 --- src/sys/arch/hpcmips/vr/flash_vrip.c:1.13 Sat Nov 21 21:23:48 2020 +++ src/sys/arch/hpcmips/vr/flash_vrip.c Mon Sep 11 22:09:28 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: flash_vrip.c,v 1.13 2020/11/21 21:23:48 thorpej Exp $ */ +/* $NetBSD: flash_vrip.c,v 1.14 2023/09/11 22:09:28 andvar Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: flash_vrip.c,v 1.13 2020/11/21 21:23:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: flash_vrip.c,v 1.14 2023/09/11 22:09:28 andvar Exp $"); #include #include @@ -188,15 +188,15 @@ flash_probe(device_t parent, cfdata_t ma if (bus_space_map(va->va_iot, va->va_addr, va->va_size, 0, )) return 0; if (!probe_cfi(va->va_iot, ioh)) { - DPRINTF("CFI ID str and command set recognized\n"); + DPRINTF(("CFI ID str and command set recognized\n")); goto detect; } if (!i28f128_probe(va->va_iot, ioh)) { - DPRINTF("28F128 detected\n"); + DPRINTF(("28F128 detected\n")); goto detect; } if (!mbm29160_probe(va->va_iot, ioh)) { - DPRINTF("29LV160 detected\n"); + DPRINTF(("29LV160 detected\n")); goto detect; } return 0;
Re: CVS commit: src/external/gpl3/binutils/dist/ld/emultempl
On Mon, Sep 11, 2023 at 12:27:25PM +1000, matthew green wrote: > "Rin Okuyama" writes: > > Module Name:src > > Committed By: rin > > Date: Mon Sep 11 01:54:18 UTC 2023 > > > > Modified Files: > > src/external/gpl3/binutils/dist/ld/emultempl: aarch64elf.em armelf.em > > elf.em > > > > Log Message: > > ld: Enable --copy-dt-needed-entries by default again > > thanks for fixing -lcurses. > > can we put this into bsd.*.mk instead? > > ie, if we want this, declare it explicitly, rather than > reply upon patched binutils? (this is eg, unfriendly to > EXTERNAL_TOOLCHAIN etc.) We (TNF) consider this the default a bug. Red Hat etc who've been pushing for this mess don't, for reasons that don't really make sense. Basically, the Linux toolchain folks decided that ELF should no longer be recursive except it still is for every use case were performance matters. Joerg
CVS commit: src/crypto/external/bsd/heimdal/dist
Module Name:src Committed By: christos Date: Mon Sep 11 15:12:12 UTC 2023 Modified Files: src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c Log Message: Explicitly load the legacy provider instead of using EVP_CIPHER_fetch() which leaks memory. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h diff -u src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.6 src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.7 --- src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.6 Mon Jun 19 19:10:48 2023 +++ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h Mon Sep 11 11:12:12 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: crypto-headers.h,v 1.6 2023/06/19 23:10:48 christos Exp $ */ +/* $NetBSD: crypto-headers.h,v 1.7 2023/09/11 15:12:12 christos Exp $ */ #ifndef __crypto_header__ #define __crypto_header__ @@ -33,9 +33,6 @@ # define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0) # define BN_is_negative(bn) ((bn)->neg != 0) # endif -#if OPENSSL_VERSION_NUMBER >= 0x3000UL -# define EVP_rc4() EVP_CIPHER_fetch(NULL, "rc4", "provider=legacy") -#endif #endif #include Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.7 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.8 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.7 Mon Jun 19 17:41:44 2023 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Mon Sep 11 11:12:12 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: context.c,v 1.7 2023/06/19 21:41:44 christos Exp $ */ +/* $NetBSD: context.c,v 1.8 2023/09/11 15:12:12 christos Exp $ */ /* * Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan @@ -38,6 +38,9 @@ #include "krb5_locl.h" #include #include +#if OPENSSL_VERSION_NUMBER >= 0x3000UL +#include +#endif #define INIT_FIELD(C, T, E, D, F) \ (C)->E = krb5_config_get_ ## T ## _default ((C), NULL, (D), \ @@ -396,6 +399,9 @@ init_context_once(void *ctx) krb5_config_free_strings(dirs); bindtextdomain(HEIMDAL_TEXTDOMAIN, HEIMDAL_LOCALEDIR); +#if OPENSSL_VERSION_NUMBER >= 0x3000UL +OSSL_PROVIDER_load(NULL, "legacy"); +#endif }
CVS commit: src/crypto/external/bsd/heimdal/dist
Module Name:src Committed By: christos Date: Mon Sep 11 15:12:12 UTC 2023 Modified Files: src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c Log Message: Explicitly load the legacy provider instead of using EVP_CIPHER_fetch() which leaks memory. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h cvs rdiff -u -r1.7 -r1.8 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Mon Sep 11 15:07:52 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +RAT remoate access trojan To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.362 src/share/misc/acronyms.comp:1.363 --- src/share/misc/acronyms.comp:1.362 Wed Sep 6 19:56:57 2023 +++ src/share/misc/acronyms.comp Mon Sep 11 15:07:52 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.362 2023/09/06 19:56:57 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.363 2023/09/11 15:07:52 jschauma Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1357,6 +1357,7 @@ RAS remote access service RAS restartable atomic sequence RAS row address strobe RAT register allocation table +RAT remote access trojan RBF radial basis function RBL reputation block list RBL real-time blackhole list
CVS commit: src/share/misc
Module Name:src Committed By: jschauma Date: Mon Sep 11 15:07:52 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +RAT remoate access trojan To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Sep 11 14:58:57 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #361 - #370 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Sep 11 14:58:57 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #361 - #370 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.121 src/doc/CHANGES-10.0:1.1.2.122 --- src/doc/CHANGES-10.0:1.1.2.121 Sat Sep 9 15:02:43 2023 +++ src/doc/CHANGES-10.0 Mon Sep 11 14:58:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.121 2023/09/09 15:02:43 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.122 2023/09/11 14:58:56 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -11844,3 +11844,71 @@ sys/arch/sparc64/sparc64/autoconf.c 1.2 on SBUS-based machines [jdc, ticket #360] +sys/arch/i386/stand/efiboot/Makefile.efiboot 1.22 +sys/arch/i386/stand/efiboot/eficons.c 1.13 +sys/arch/i386/stand/efiboot/eficpufunc.c 1.1 +sys/arch/i386/stand/efiboot/eficpufunc.h 1.1 + + efiboot/x86: PR 57523: add serial console support via raw I/O port + access. + [rin, ticket #361] + +sys/arch/i386/stand/efiboot/efipxe.c 1.2 +sys/stand/efiboot/efipxe.c 1.3 + + MI and x86 efiboot: fix device path type for PXE boot device. + [rin, ticket #362] + +sys/arch/aarch64/conf/Makefile.aarch64 1.24,1.25 +sys/arch/alpha/conf/Makefile.alpha 1.88 +sys/arch/arm/conf/Makefile.arm 1.56,1.57 +sys/arch/cats/conf/Makefile.cats.inc 1.37 +sys/arch/mips/conf/Makefile.mips 1.73 +sys/arch/riscv/conf/Makefile.riscv 1.10 +sys/arch/shark/conf/Makefile.shark.inc 1.28 +sys/conf/Makefile.kern.inc 1.298,1.299 + + PR 57146: fix kernel size inflation with COPY_SYMTAB. + [rin, ticket #363] + +external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c 1.26 + + zfs: disable swap/dump on zvol. + [riastradh, ticket #364] + + +sys/arch/vax/include/cpu.h 1.107 + + vax: PR 55415: work around ci_want_resched fallout on vax. + [oster, ticket #365] + +sys/conf/files 1.1309 +sys/dev/ic/ahcisata_core.c 1.108 +sys/dev/ic/ahcisatavar.h 1.28 +sys/dev/pci/ahcisata_pci.c 1.70 + + ahcisata(4): PR 56737: rework AHCI extra delay options. + [abs, ticket #366] + +build.sh 1.374 + + build.sh: add support for git worktree. + [khorben, ticket #367] + +share/locale/ctype/en_US.UTF-8.src 1.8-1.10 +share/locale/ctype/gen_ctype_utf8.pl 1.1,1.2 +tests/lib/libc/locale/t_mbstowcs.c 1.3 + + Update unicode tables. + [wiz, ticket #368] + +share/locale/time/de_AT.UTF-8.src 1.3 + + Add missing dot in abbreviation. + [wiz, ticket #369] + +tests/lib/libc/hash/t_hmac.c 1.3 + + libc: disable md4 hmac tests. + [riastradh, ticket #370] +
CVS commit: [netbsd-10] src/tests/lib/libc/hash
Module Name:src Committed By: martin Date: Mon Sep 11 14:57:12 UTC 2023 Modified Files: src/tests/lib/libc/hash [netbsd-10]: t_hmac.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #370): tests/lib/libc/hash/t_hmac.c: revision 1.3 no more md4 for you. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.14.1 src/tests/lib/libc/hash/t_hmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/hash/t_hmac.c diff -u src/tests/lib/libc/hash/t_hmac.c:1.2 src/tests/lib/libc/hash/t_hmac.c:1.2.14.1 --- src/tests/lib/libc/hash/t_hmac.c:1.2 Wed Feb 7 13:18:33 2018 +++ src/tests/lib/libc/hash/t_hmac.c Mon Sep 11 14:57:12 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: t_hmac.c,v 1.2 2018/02/07 13:18:33 christos Exp $ */ +/* $NetBSD: t_hmac.c,v 1.2.14.1 2023/09/11 14:57:12 martin Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: t_hmac.c,v 1.2 2018/02/07 13:18:33 christos Exp $"); +__RCSID("$NetBSD: t_hmac.c,v 1.2.14.1 2023/09/11 14:57:12 martin Exp $"); #include #include @@ -52,7 +52,9 @@ test(void) #if OPENSSL_VERSION_NUMBER < 0x1010L EVP_md2(), #endif +#if OPENSSL_VERSION_NUMBER < 0x3000L EVP_md4(), +#endif EVP_md5(), EVP_ripemd160(), EVP_sha1(), @@ -65,7 +67,9 @@ test(void) #if OPENSSL_VERSION_NUMBER < 0x1010L "md2", #endif +#if OPENSSL_VERSION_NUMBER < 0x3000L "md4", +#endif "md5", "rmd160", "sha1", @@ -91,7 +95,8 @@ test(void) memset(tmp1, 0, sizeof(tmp1)); memset(tmp2, 0, sizeof(tmp2)); e1 = HMAC(evps[t], key, i, data, j, tmp1, ); - ATF_REQUIRE(e1 != NULL); + ATF_REQUIRE_MSG(e1 != NULL, "hash %s could not be " + "created", names[t]); tmp2len = hmac(names[t], key, i, data, j, tmp2, sizeof(tmp2)); ATF_REQUIRE_MSG(tmp1len == tmp2len, "hash %s len %u "
CVS commit: [netbsd-10] src/tests/lib/libc/hash
Module Name:src Committed By: martin Date: Mon Sep 11 14:57:12 UTC 2023 Modified Files: src/tests/lib/libc/hash [netbsd-10]: t_hmac.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #370): tests/lib/libc/hash/t_hmac.c: revision 1.3 no more md4 for you. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.14.1 src/tests/lib/libc/hash/t_hmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/share/locale/time
Module Name:src Committed By: martin Date: Mon Sep 11 14:54:54 UTC 2023 Modified Files: src/share/locale/time [netbsd-10]: de_AT.UTF-8.src Log Message: Pull up following revision(s) (requested by wiz in ticket #369): share/locale/time/de_AT.UTF-8.src: revision 1.3 Add missing dot in abbreviation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.36.1 src/share/locale/time/de_AT.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/share/locale/time
Module Name:src Committed By: martin Date: Mon Sep 11 14:54:54 UTC 2023 Modified Files: src/share/locale/time [netbsd-10]: de_AT.UTF-8.src Log Message: Pull up following revision(s) (requested by wiz in ticket #369): share/locale/time/de_AT.UTF-8.src: revision 1.3 Add missing dot in abbreviation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.36.1 src/share/locale/time/de_AT.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/locale/time/de_AT.UTF-8.src diff -u src/share/locale/time/de_AT.UTF-8.src:1.2 src/share/locale/time/de_AT.UTF-8.src:1.2.36.1 --- src/share/locale/time/de_AT.UTF-8.src:1.2 Sun Aug 11 22:09:42 2013 +++ src/share/locale/time/de_AT.UTF-8.src Mon Sep 11 14:54:54 2023 @@ -1,4 +1,4 @@ -# $NetBSD: de_AT.UTF-8.src,v 1.2 2013/08/11 22:09:42 joerg Exp $ +# $NetBSD: de_AT.UTF-8.src,v 1.2.36.1 2023/09/11 14:54:54 martin Exp $ # # Locale: de_AT # Character set: UTF-8 @@ -48,7 +48,7 @@ Samstag # # Short month names (abmon) # -Jän +Jän. Feb. Mär. Apr.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Sep 11 14:53:01 UTC 2023 Modified Files: src/share/locale/ctype [netbsd-10]: en_US.UTF-8.src src/tests/lib/libc/locale [netbsd-10]: t_mbstowcs.c Added Files: src/share/locale/ctype [netbsd-10]: gen_ctype_utf8.pl Log Message: Pull up following revision(s) (requested by wiz in ticket #368): share/locale/ctype/en_US.UTF-8.src: revision 1.10 share/locale/ctype/en_US.UTF-8.src: revision 1.8 share/locale/ctype/en_US.UTF-8.src: revision 1.9 share/locale/ctype/gen_ctype_utf8.pl: revision 1.1 share/locale/ctype/gen_ctype_utf8.pl: revision 1.2 tests/lib/libc/locale/t_mbstowcs.c: revision 1.3 Update unicode tables. This version of the file, and the generator script, come from OpenBSD. The script was written by Andrew Fresh. The file covers the encodings from Unicode 13.0.0, based on the files distributed with perl 5.32.1. Add NetBSD RCS Id header instead of OpenBSD one. Update Unicode tables. These tables are for Unicode 14.0.0 using the data provided with perl 5.36.0. Update Unicode tables to 15.0.0. This is based on the tables provided by perl 5.37.7. adapt mbstowcs_basic test for unicode table update reformat so it's easier to find which result data belongs to which input To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.2.1 src/share/locale/ctype/en_US.UTF-8.src cvs rdiff -u -r0 -r1.2.2.2 src/share/locale/ctype/gen_ctype_utf8.pl cvs rdiff -u -r1.2 -r1.2.16.1 src/tests/lib/libc/locale/t_mbstowcs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Sep 11 14:45:05 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1730 To generate a diff of this commit: cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.99 src/doc/CHANGES-9.4:1.1.2.100 --- src/doc/CHANGES-9.4:1.1.2.99 Sat Sep 9 14:57:22 2023 +++ src/doc/CHANGES-9.4 Mon Sep 11 14:45:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.99 2023/09/09 14:57:22 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.100 2023/09/11 14:45:05 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2116,3 +2116,8 @@ sys/dev/raidframe/rf_reconstruct.c 1.12 raidframe: fix memory leaks (prevent diagnostic on shutdown). [oster, ticket #1729] +build.sh 1.374 + + build.sh: add support for git worktree. + [khorben, ticket #1730] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Sep 11 14:45:05 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1730 To generate a diff of this commit: cvs rdiff -u -r1.1.2.99 -r1.1.2.100 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Sep 11 14:43:27 UTC 2023 Modified Files: src [netbsd-9]: build.sh Log Message: Pull up following revision(s) (requested by khorben in ticket #1730): build.sh: revision 1.374 build.sh: add support for git worktree Git supports multiple working trees attached to the same repository, with the git-worktree(1) subcommand. When building from a Git working tree, the repository metadata in .git from the top source directory is a file (containing the actual location of the metadata) instead of the usual directory structure. With this change, build.sh allows .git to be a directory or a regular file instead, therefore letting the sources build as expected from a Git working tree. To test: (without this patch) src$ git worktree add ../src-clean-tree [...] src$ (cd ../src-clean-tree && ./build.sh tools) [...] ERROR: Cannot determine VCS for '.../src-clean-tree/' To generate a diff of this commit: cvs rdiff -u -r1.333.2.3 -r1.333.2.4 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Sep 11 14:43:27 UTC 2023 Modified Files: src [netbsd-9]: build.sh Log Message: Pull up following revision(s) (requested by khorben in ticket #1730): build.sh: revision 1.374 build.sh: add support for git worktree Git supports multiple working trees attached to the same repository, with the git-worktree(1) subcommand. When building from a Git working tree, the repository metadata in .git from the top source directory is a file (containing the actual location of the metadata) instead of the usual directory structure. With this change, build.sh allows .git to be a directory or a regular file instead, therefore letting the sources build as expected from a Git working tree. To test: (without this patch) src$ git worktree add ../src-clean-tree [...] src$ (cd ../src-clean-tree && ./build.sh tools) [...] ERROR: Cannot determine VCS for '.../src-clean-tree/' To generate a diff of this commit: cvs rdiff -u -r1.333.2.3 -r1.333.2.4 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.333.2.3 src/build.sh:1.333.2.4 --- src/build.sh:1.333.2.3 Mon Mar 13 21:38:13 2023 +++ src/build.sh Mon Sep 11 14:43:26 2023 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.333.2.3 2023/03/13 21:38:13 jdc Exp $ +# $NetBSD: build.sh,v 1.333.2.4 2023/09/11 14:43:26 martin Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -1953,7 +1953,7 @@ createmakewrapper() eval cat <
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Sep 11 14:41:51 UTC 2023 Modified Files: src [netbsd-10]: build.sh Log Message: Pull up following revision(s) (requested by khorben in ticket #367): build.sh: revision 1.374 build.sh: add support for git worktree Git supports multiple working trees attached to the same repository, with the git-worktree(1) subcommand. When building from a Git working tree, the repository metadata in .git from the top source directory is a file (containing the actual location of the metadata) instead of the usual directory structure. With this change, build.sh allows .git to be a directory or a regular file instead, therefore letting the sources build as expected from a Git working tree. To test: (without this patch) src$ git worktree add ../src-clean-tree [...] src$ (cd ../src-clean-tree && ./build.sh tools) [...] ERROR: Cannot determine VCS for '.../src-clean-tree/' To generate a diff of this commit: cvs rdiff -u -r1.365.2.1 -r1.365.2.2 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.365.2.1 src/build.sh:1.365.2.2 --- src/build.sh:1.365.2.1 Mon Mar 13 21:40:24 2023 +++ src/build.sh Mon Sep 11 14:41:51 2023 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.365.2.1 2023/03/13 21:40:24 jdc Exp $ +# $NetBSD: build.sh,v 1.365.2.2 2023/09/11 14:41:51 martin Exp $ # # Copyright (c) 2001-2022 The NetBSD Foundation, Inc. # All rights reserved. @@ -2010,7 +2010,7 @@ createmakewrapper() eval cat <
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Sep 11 14:41:51 UTC 2023 Modified Files: src [netbsd-10]: build.sh Log Message: Pull up following revision(s) (requested by khorben in ticket #367): build.sh: revision 1.374 build.sh: add support for git worktree Git supports multiple working trees attached to the same repository, with the git-worktree(1) subcommand. When building from a Git working tree, the repository metadata in .git from the top source directory is a file (containing the actual location of the metadata) instead of the usual directory structure. With this change, build.sh allows .git to be a directory or a regular file instead, therefore letting the sources build as expected from a Git working tree. To test: (without this patch) src$ git worktree add ../src-clean-tree [...] src$ (cd ../src-clean-tree && ./build.sh tools) [...] ERROR: Cannot determine VCS for '.../src-clean-tree/' To generate a diff of this commit: cvs rdiff -u -r1.365.2.1 -r1.365.2.2 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Mon Sep 11 14:39:21 UTC 2023 Modified Files: src/sys/conf [netbsd-10]: files src/sys/dev/ic [netbsd-10]: ahcisata_core.c ahcisatavar.h src/sys/dev/pci [netbsd-10]: ahcisata_pci.c Log Message: Pull up following revision(s) (requested by abs in ticket #366): sys/dev/pci/ahcisata_pci.c: revision 1.70 sys/dev/ic/ahcisata_core.c: revision 1.108 sys/dev/ic/ahcisatavar.h: revision 1.28 sys/conf/files: revision 1.1309 Rework AHCISATA_EXTRA_DELAY for kern/56737 - Remove AHCI_QUIRK_EXTRA_DELAY as issue appears to be drive and not controller related - Replace AHCISATA_EXTRA_DELAY with AHCISATA_REMOVE_EXTRA_DELAY, so defaulting to enabling the extra delay, as the downside of slower probing on systems which do not need it is less than having other systems intermittently fail to probe and attach drives - Also allow disabling extra delay with AHCISATA_EXTRA_DELAY_MS = 0 We should return to this code to work out which of the extra delays are needed, and how long they need to be. It may be that faster systems are more likely to trigger the issue (I've only seen it on a 13th gen i7-13700, though only tested on a limited set) To generate a diff of this commit: cvs rdiff -u -r1.1304.2.1 -r1.1304.2.2 src/sys/conf/files cvs rdiff -u -r1.107 -r1.107.4.1 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/dev/ic/ahcisatavar.h cvs rdiff -u -r1.68.2.1 -r1.68.2.2 src/sys/dev/pci/ahcisata_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1304.2.1 src/sys/conf/files:1.1304.2.2 --- src/sys/conf/files:1.1304.2.1 Fri Jan 13 19:00:21 2023 +++ src/sys/conf/files Mon Sep 11 14:39:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1304.2.1 2023/01/13 19:00:21 martin Exp $ +# $NetBSD: files,v 1.1304.2.2 2023/09/11 14:39:21 martin Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -1056,7 +1056,7 @@ device njata: ata, ata_piobm, wdc_common file dev/ic/ninjaata32.c njata # AHCI-compatible SATA controllers -defflag opt_ahcisata.h AHCISATA_EXTRA_DELAY +defflag opt_ahcisata.h AHCISATA_REMOVE_EXTRA_DELAY defparam opt_ahcisata.h AHCISATA_EXTRA_DELAY_MS define ahcisata_core file dev/ic/ahcisata_core.c ahcisata_core Index: src/sys/dev/ic/ahcisata_core.c diff -u src/sys/dev/ic/ahcisata_core.c:1.107 src/sys/dev/ic/ahcisata_core.c:1.107.4.1 --- src/sys/dev/ic/ahcisata_core.c:1.107 Mon Aug 1 07:37:18 2022 +++ src/sys/dev/ic/ahcisata_core.c Mon Sep 11 14:39:21 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_core.c,v 1.107 2022/08/01 07:37:18 mlelstv Exp $ */ +/* $NetBSD: ahcisata_core.c,v 1.107.4.1 2023/09/11 14:39:21 martin Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.107 2022/08/01 07:37:18 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.107.4.1 2023/09/11 14:39:21 martin Exp $"); #include #include @@ -119,15 +119,11 @@ static const struct scsipi_bustype ahci_ #define AHCISATA_EXTRA_DELAY_MS 500 /* XXX need to adjust */ #endif -#ifdef AHCISATA_EXTRA_DELAY +#if !defined(AHCISATA_REMOVE_EXTRA_DELAY) && AHCISATA_EXTRA_DELAY_MS > 0 #define AHCISATA_DO_EXTRA_DELAY(sc, chp, msg, flags) \ ata_delay(chp, AHCISATA_EXTRA_DELAY_MS, msg, flags) #else -#define AHCISATA_DO_EXTRA_DELAY(sc, chp, msg, flags) \ -do {\ - if ((sc)->sc_ahci_quirks & AHCI_QUIRK_EXTRA_DELAY) \ - ata_delay(chp, AHCISATA_EXTRA_DELAY_MS, msg, flags); \ -} while (0) +#define AHCISATA_DO_EXTRA_DELAY(sc, chp, msg, flags) do { } while (0) #endif const struct ata_bustype ahci_ata_bustype = { Index: src/sys/dev/ic/ahcisatavar.h diff -u src/sys/dev/ic/ahcisatavar.h:1.27 src/sys/dev/ic/ahcisatavar.h:1.27.4.1 --- src/sys/dev/ic/ahcisatavar.h:1.27 Fri Nov 19 23:46:55 2021 +++ src/sys/dev/ic/ahcisatavar.h Mon Sep 11 14:39:21 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisatavar.h,v 1.27 2021/11/19 23:46:55 rin Exp $ */ +/* $NetBSD: ahcisatavar.h,v 1.27.4.1 2023/09/11 14:39:21 martin Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -59,7 +59,6 @@ struct ahci_softc { #define AHCI_PCI_QUIRK_BAD64 __BIT(1) /* broken 64-bit DMA */ #define AHCI_QUIRK_BADPMP __BIT(2) /* broken PMP support, ignore */ #define AHCI_QUIRK_BADNCQ __BIT(3) /* possibly broken NCQ support, ignore */ -#define AHCI_QUIRK_EXTRA_DELAY __BIT(4) /* needs extra delay */ uint32_t sc_ahci_cap; /* copy of AHCI_CAP */ int sc_ncmds; /* number of command slots */ Index: src/sys/dev/pci/ahcisata_pci.c diff -u src/sys/dev/pci/ahcisata_pci.c:1.68.2.1 src/sys/dev/pci/ahcisata_pci.c:1.68.2.2 --- src/sys/dev/pci/ahcisata_pci.c:1.68.2.1 Tue Aug 22 15:57:38 2023 +++ src/sys/dev/pci/ahcisata_pci.c Mon Sep 11 14:39:21 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.68.2.1 2023/08/22
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Mon Sep 11 14:39:21 UTC 2023 Modified Files: src/sys/conf [netbsd-10]: files src/sys/dev/ic [netbsd-10]: ahcisata_core.c ahcisatavar.h src/sys/dev/pci [netbsd-10]: ahcisata_pci.c Log Message: Pull up following revision(s) (requested by abs in ticket #366): sys/dev/pci/ahcisata_pci.c: revision 1.70 sys/dev/ic/ahcisata_core.c: revision 1.108 sys/dev/ic/ahcisatavar.h: revision 1.28 sys/conf/files: revision 1.1309 Rework AHCISATA_EXTRA_DELAY for kern/56737 - Remove AHCI_QUIRK_EXTRA_DELAY as issue appears to be drive and not controller related - Replace AHCISATA_EXTRA_DELAY with AHCISATA_REMOVE_EXTRA_DELAY, so defaulting to enabling the extra delay, as the downside of slower probing on systems which do not need it is less than having other systems intermittently fail to probe and attach drives - Also allow disabling extra delay with AHCISATA_EXTRA_DELAY_MS = 0 We should return to this code to work out which of the extra delays are needed, and how long they need to be. It may be that faster systems are more likely to trigger the issue (I've only seen it on a 13th gen i7-13700, though only tested on a limited set) To generate a diff of this commit: cvs rdiff -u -r1.1304.2.1 -r1.1304.2.2 src/sys/conf/files cvs rdiff -u -r1.107 -r1.107.4.1 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.27 -r1.27.4.1 src/sys/dev/ic/ahcisatavar.h cvs rdiff -u -r1.68.2.1 -r1.68.2.2 src/sys/dev/pci/ahcisata_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/vax/include
Module Name:src Committed By: martin Date: Mon Sep 11 13:42:08 UTC 2023 Modified Files: src/sys/arch/vax/include [netbsd-10]: cpu.h Log Message: Pull up following revision(s) (requested by oster in ticket #365): sys/arch/vax/include/cpu.h: revision 1.107 With the overhaul of the scheduler code the semantics of ci_want_resched have changed, and for some reason vax still requires ci_want_resched set to 1 in order to do preemption. This commit contains a workaround for the preemption issued discussed in PR#55415. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.106.2.1 src/sys/arch/vax/include/cpu.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/vax/include/cpu.h diff -u src/sys/arch/vax/include/cpu.h:1.106 src/sys/arch/vax/include/cpu.h:1.106.2.1 --- src/sys/arch/vax/include/cpu.h:1.106 Sun Dec 11 18:02:40 2022 +++ src/sys/arch/vax/include/cpu.h Mon Sep 11 13:42:08 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.106 2022/12/11 18:02:40 oster Exp $ */ +/* $NetBSD: cpu.h,v 1.106.2.1 2023/09/11 13:42:08 martin Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden @@ -156,10 +156,15 @@ extern int cpu_printfataltraps; #define curcpu() (curlwp->l_cpu + 0) #define curlwp ((struct lwp *)mfpr(PR_SSP)) #define cpu_number() (curcpu()->ci_cpuid) +/* XXX RESCHED_REMOTE isn't the right flag name to be used here, +but we need to set ci_want_resched to '1' to make things work +on vax. See PR#55415 */ #define cpu_need_resched(ci, l, flags) \ do { \ struct pcb *pcb = lwp_getpcb(curlwp); \ __USE(flags); \ + /* XXX RESCHED_REMOTE isn't the right flag */ \ + (ci)->ci_want_resched = RESCHED_REMOTE; \ pcb->P0LR = (pcb->P0LR & ~AST_MASK) | AST_ON; \ mtpr(AST_OK,PR_ASTLVL);\ } while (/*CONSTCOND*/ 0)
CVS commit: [netbsd-10] src/sys/arch/vax/include
Module Name:src Committed By: martin Date: Mon Sep 11 13:42:08 UTC 2023 Modified Files: src/sys/arch/vax/include [netbsd-10]: cpu.h Log Message: Pull up following revision(s) (requested by oster in ticket #365): sys/arch/vax/include/cpu.h: revision 1.107 With the overhaul of the scheduler code the semantics of ci_want_resched have changed, and for some reason vax still requires ci_want_resched set to 1 in order to do preemption. This commit contains a workaround for the preemption issued discussed in PR#55415. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.106.2.1 src/sys/arch/vax/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Mon Sep 11 13:38:42 UTC 2023 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-10]: zfs_ioctl.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #364): external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c: revision 1.26 Revert "Teach zfs bdevsw to do b_psize." This is used only by dump and swap, which won't work safely on zvols anyway. We should make swap work eventually, but right now it's leading unwary ussers into deadlock scenarios, so let's make it fail early instead. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.2.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25.2.1 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25 Mon Oct 31 10:32:28 2022 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Mon Sep 11 13:38:42 2023 @@ -7062,29 +7062,6 @@ nb_zvol_strategy(struct buf *bp) (void) zvol_strategy(bp); } -static int -nb_zvol_psize(dev_t dev) -{ - minor_t minor = getminor(dev); - off_t nbytes; - unsigned bytespersector; - - if (minor == 0) /* /dev/zfs */ - return -1; - - if (zvol_ioctl(dev, DIOCGMEDIASIZE, (intptr_t), 0, - NOCRED, NULL)) - return -1; - if (zvol_ioctl(dev, DIOCGSECTORSIZE, (intptr_t), 0, - NOCRED, NULL)) - return -1; - if (bytespersector == 0) /* paranoia */ - return -1; - if (nbytes/bytespersector > INT_MAX) /* paranoia */ - return -1; - return nbytes/bytespersector; -} - static const struct fileops zfs_fileops = { .fo_name = "zfs", .fo_read = fbadop_read, @@ -7104,7 +7081,7 @@ const struct bdevsw zfs_bdevsw = { .d_strategy = nb_zvol_strategy, .d_ioctl = nb_zfsdev_ioctl, .d_dump = nodump, - .d_psize = nb_zvol_psize, + .d_psize = nosize, .d_flag = D_DISK | D_MPSAFE };
CVS commit: [netbsd-10] src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: martin Date: Mon Sep 11 13:38:42 UTC 2023 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-10]: zfs_ioctl.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #364): external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c: revision 1.26 Revert "Teach zfs bdevsw to do b_psize." This is used only by dump and swap, which won't work safely on zvols anyway. We should make swap work eventually, but right now it's leading unwary ussers into deadlock scenarios, so let's make it fail early instead. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.2.1 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Mon Sep 11 13:35:38 UTC 2023 Modified Files: src/sys/arch/aarch64/conf [netbsd-10]: Makefile.aarch64 src/sys/arch/alpha/conf [netbsd-10]: Makefile.alpha src/sys/arch/arm/conf [netbsd-10]: Makefile.arm src/sys/arch/cats/conf [netbsd-10]: Makefile.cats.inc src/sys/arch/mips/conf [netbsd-10]: Makefile.mips src/sys/arch/riscv/conf [netbsd-10]: Makefile.riscv src/sys/arch/shark/conf [netbsd-10]: Makefile.shark.inc src/sys/conf [netbsd-10]: Makefile.kern.inc Log Message: Pull up following revision(s) (requested by rin in ticket #363): sys/arch/aarch64/conf/Makefile.aarch64: revision 1.24 sys/arch/aarch64/conf/Makefile.aarch64: revision 1.25 sys/arch/shark/conf/Makefile.shark.inc: revision 1.28 sys/arch/alpha/conf/Makefile.alpha: revision 1.88 sys/arch/mips/conf/Makefile.mips: revision 1.73 sys/conf/Makefile.kern.inc: revision 1.298 sys/conf/Makefile.kern.inc: revision 1.299 sys/arch/cats/conf/Makefile.cats.inc: revision 1.37 sys/arch/arm/conf/Makefile.arm: revision 1.56 sys/arch/arm/conf/Makefile.arm: revision 1.57 sys/arch/riscv/conf/Makefile.riscv: revision 1.10 Always use arm-elf2aout; no a.out support both for binutils{,.old} Fix kernel size inflation for arm and aarch64 (PR toolchain/57146) For some conditions, SYSTEM_LD_TAIL is set for arm and aarch64. Then, ctfmerge(1) in default SYSTEM_LD_TAIL is unintentionally skipped, which results in the catastrophic kernel size inflation, as reported in the PR. Also, introduce and use OBJCOPY_STRIPFLAGS variable instead of STRIPFLAGS, as strip(1) is replaced by objcopy(1) during MI kernel build procedure. For Makefile.{arm,aarch64}, weird logic is used to determine how to handle debug symbols; MKDEBUG{,KERNEL} are taken into account later in sys/conf/Makefile.kern.inc. Use OBJCOPY_STRIPFLAGS instead of STRIPFLAGS. Simplify fix for PR toolchain/57146 Introduce ARCH_STRIP_SYMBOLS variable to centralize logic for debug symbols from MD Makefile's to Makefile.kern.inc. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.12.1 src/sys/arch/aarch64/conf/Makefile.aarch64 cvs rdiff -u -r1.87 -r1.87.14.1 src/sys/arch/alpha/conf/Makefile.alpha cvs rdiff -u -r1.55 -r1.55.20.1 src/sys/arch/arm/conf/Makefile.arm cvs rdiff -u -r1.36 -r1.36.30.1 src/sys/arch/cats/conf/Makefile.cats.inc cvs rdiff -u -r1.72 -r1.72.14.1 src/sys/arch/mips/conf/Makefile.mips cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/riscv/conf/Makefile.riscv cvs rdiff -u -r1.27 -r1.27.30.1 src/sys/arch/shark/conf/Makefile.shark.inc cvs rdiff -u -r1.295 -r1.295.4.1 src/sys/conf/Makefile.kern.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Mon Sep 11 13:35:38 UTC 2023 Modified Files: src/sys/arch/aarch64/conf [netbsd-10]: Makefile.aarch64 src/sys/arch/alpha/conf [netbsd-10]: Makefile.alpha src/sys/arch/arm/conf [netbsd-10]: Makefile.arm src/sys/arch/cats/conf [netbsd-10]: Makefile.cats.inc src/sys/arch/mips/conf [netbsd-10]: Makefile.mips src/sys/arch/riscv/conf [netbsd-10]: Makefile.riscv src/sys/arch/shark/conf [netbsd-10]: Makefile.shark.inc src/sys/conf [netbsd-10]: Makefile.kern.inc Log Message: Pull up following revision(s) (requested by rin in ticket #363): sys/arch/aarch64/conf/Makefile.aarch64: revision 1.24 sys/arch/aarch64/conf/Makefile.aarch64: revision 1.25 sys/arch/shark/conf/Makefile.shark.inc: revision 1.28 sys/arch/alpha/conf/Makefile.alpha: revision 1.88 sys/arch/mips/conf/Makefile.mips: revision 1.73 sys/conf/Makefile.kern.inc: revision 1.298 sys/conf/Makefile.kern.inc: revision 1.299 sys/arch/cats/conf/Makefile.cats.inc: revision 1.37 sys/arch/arm/conf/Makefile.arm: revision 1.56 sys/arch/arm/conf/Makefile.arm: revision 1.57 sys/arch/riscv/conf/Makefile.riscv: revision 1.10 Always use arm-elf2aout; no a.out support both for binutils{,.old} Fix kernel size inflation for arm and aarch64 (PR toolchain/57146) For some conditions, SYSTEM_LD_TAIL is set for arm and aarch64. Then, ctfmerge(1) in default SYSTEM_LD_TAIL is unintentionally skipped, which results in the catastrophic kernel size inflation, as reported in the PR. Also, introduce and use OBJCOPY_STRIPFLAGS variable instead of STRIPFLAGS, as strip(1) is replaced by objcopy(1) during MI kernel build procedure. For Makefile.{arm,aarch64}, weird logic is used to determine how to handle debug symbols; MKDEBUG{,KERNEL} are taken into account later in sys/conf/Makefile.kern.inc. Use OBJCOPY_STRIPFLAGS instead of STRIPFLAGS. Simplify fix for PR toolchain/57146 Introduce ARCH_STRIP_SYMBOLS variable to centralize logic for debug symbols from MD Makefile's to Makefile.kern.inc. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.12.1 src/sys/arch/aarch64/conf/Makefile.aarch64 cvs rdiff -u -r1.87 -r1.87.14.1 src/sys/arch/alpha/conf/Makefile.alpha cvs rdiff -u -r1.55 -r1.55.20.1 src/sys/arch/arm/conf/Makefile.arm cvs rdiff -u -r1.36 -r1.36.30.1 src/sys/arch/cats/conf/Makefile.cats.inc cvs rdiff -u -r1.72 -r1.72.14.1 src/sys/arch/mips/conf/Makefile.mips cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/arch/riscv/conf/Makefile.riscv cvs rdiff -u -r1.27 -r1.27.30.1 src/sys/arch/shark/conf/Makefile.shark.inc cvs rdiff -u -r1.295 -r1.295.4.1 src/sys/conf/Makefile.kern.inc 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/aarch64/conf/Makefile.aarch64 diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.23 src/sys/arch/aarch64/conf/Makefile.aarch64:1.23.12.1 --- src/sys/arch/aarch64/conf/Makefile.aarch64:1.23 Thu May 27 06:19:38 2021 +++ src/sys/arch/aarch64/conf/Makefile.aarch64 Mon Sep 11 13:35:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.aarch64,v 1.23 2021/05/27 06:19:38 ryo Exp $ +# $NetBSD: Makefile.aarch64,v 1.23.12.1 2023/09/11 13:35:37 martin Exp $ # Makefile for NetBSD # @@ -95,14 +95,9 @@ LOADADDRESS?= 0xc000 LINKFLAGS_NORMAL= -X # Strip AArch64 mapping symbols from the kernel image, as they interfere -# with ddb. Do it differently if 'makeoptions DEBUG="-g"' was specified. -.if !defined(DEBUG) || empty(DEBUG:M-g*) -SYSTEM_LD_TAIL?= ${OBJCOPY} -w --strip-symbol='[$$][dx]' \ - --strip-symbol='[$$][dx]\.*' $@ ;\ - ${SIZE} $@; chmod 755 $@ -.else -STRIPFLAGS=-g --strip-symbol='$$x' --strip-symbol='$$d' -.endif +# with ddb, but don't strip them in netbsd.gdb. See Makefile.kern.inc. +ARCH_STRIP_SYMBOLS= --strip-symbol='[$$][dx]' \ + --strip-symbol='[$$][dx]\.*' ## ## (6) port specific target dependencies Index: src/sys/arch/alpha/conf/Makefile.alpha diff -u src/sys/arch/alpha/conf/Makefile.alpha:1.87 src/sys/arch/alpha/conf/Makefile.alpha:1.87.14.1 --- src/sys/arch/alpha/conf/Makefile.alpha:1.87 Wed May 5 15:39:39 2021 +++ src/sys/arch/alpha/conf/Makefile.alpha Mon Sep 11 13:35:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.alpha,v 1.87 2021/05/05 15:39:39 thorpej Exp $ +# $NetBSD: Makefile.alpha,v 1.87.14.1 2023/09/11 13:35:37 martin Exp $ # Makefile for NetBSD # @@ -65,7 +65,7 @@ TEXTADDR?= fca0 ENTRYPOINT= __transfer KERNLDSCRIPT?= ${ALPHA}/conf/kern.ldscript EXTRA_LINKFLAGS= -G 4 -STRIPFLAGS= -g -X +OBJCOPY_STRIPFLAGS= -g -X ## ## (6) port specific target dependencies Index: src/sys/arch/arm/conf/Makefile.arm diff -u src/sys/arch/arm/conf/Makefile.arm:1.55 src/sys/arch/arm/conf/Makefile.arm:1.55.20.1 --- src/sys/arch/arm/conf/Makefile.arm:1.55 Fri Jul 10 12:25:09 2020 +++
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Mon Sep 11 13:30:36 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: efipxe.c src/sys/stand/efiboot [netbsd-10]: efipxe.c Log Message: Pull up following revision(s) (requested by rin in ticket #362): sys/arch/i386/stand/efiboot/efipxe.c: revision 1.2 sys/stand/efiboot/efipxe.c: revision 1.3 MI and x86 efiboot: Fix device path type for PXE boot device. It should be Messaging, not Media Device Path. Taken from OpenBSD, for which this code was originally written: https://cvsweb.openbsd.org/src/sys/arch/amd64/stand/efiboot/efipxe.c#rev1.6 Network-based device paths use Messaging and not Media types. Thus in reality the depth was always -1 which made the compare function a No-Op. Properly check the device path depth value and look for the Messaging type instead to find the correct NIC. This check never worked before and was uncovered by the last change. Regression noticed by bluhm@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.36.1 src/sys/arch/i386/stand/efiboot/efipxe.c cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/stand/efiboot/efipxe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/stand/efiboot/efipxe.c diff -u src/sys/arch/i386/stand/efiboot/efipxe.c:1.1 src/sys/arch/i386/stand/efiboot/efipxe.c:1.1.36.1 --- src/sys/arch/i386/stand/efiboot/efipxe.c:1.1 Wed Apr 11 10:32:09 2018 +++ src/sys/arch/i386/stand/efiboot/efipxe.c Mon Sep 11 13:30:36 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: efipxe.c,v 1.1 2018/04/11 10:32:09 nonaka Exp $ */ +/* $NetBSD: efipxe.c,v 1.1.36.1 2023/09/11 13:30:36 martin Exp $ */ /* $OpenBSD: efipxe.c,v 1.3 2018/01/30 20:19:06 naddy Exp $ */ /* @@ -64,7 +64,8 @@ efi_pxe_probe(void) if (EFI_ERROR(status)) continue; - depth = efi_device_path_depth(efi_bootdp, MEDIA_DEVICE_PATH); + depth = efi_device_path_depth(efi_bootdp, + MESSAGING_DEVICE_PATH); if (efi_device_path_ncmp(efi_bootdp, dp, depth)) continue; Index: src/sys/stand/efiboot/efipxe.c diff -u src/sys/stand/efiboot/efipxe.c:1.2 src/sys/stand/efiboot/efipxe.c:1.2.32.1 --- src/sys/stand/efiboot/efipxe.c:1.2 Thu Nov 15 23:52:33 2018 +++ src/sys/stand/efiboot/efipxe.c Mon Sep 11 13:30:36 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: efipxe.c,v 1.2 2018/11/15 23:52:33 jmcneill Exp $ */ +/* $NetBSD: efipxe.c,v 1.2.32.1 2023/09/11 13:30:36 martin Exp $ */ /* $OpenBSD: efipxe.c,v 1.3 2018/01/30 20:19:06 naddy Exp $ */ /* @@ -64,7 +64,8 @@ efi_pxe_probe(void) if (EFI_ERROR(status)) continue; - depth = efi_device_path_depth(efi_bootdp, MEDIA_DEVICE_PATH); + depth = efi_device_path_depth(efi_bootdp, + MESSAGING_DEVICE_PATH); if (efi_device_path_ncmp(efi_bootdp, dp, depth)) continue;
CVS commit: [netbsd-10] src/sys
Module Name:src Committed By: martin Date: Mon Sep 11 13:30:36 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: efipxe.c src/sys/stand/efiboot [netbsd-10]: efipxe.c Log Message: Pull up following revision(s) (requested by rin in ticket #362): sys/arch/i386/stand/efiboot/efipxe.c: revision 1.2 sys/stand/efiboot/efipxe.c: revision 1.3 MI and x86 efiboot: Fix device path type for PXE boot device. It should be Messaging, not Media Device Path. Taken from OpenBSD, for which this code was originally written: https://cvsweb.openbsd.org/src/sys/arch/amd64/stand/efiboot/efipxe.c#rev1.6 Network-based device paths use Messaging and not Media types. Thus in reality the depth was always -1 which made the compare function a No-Op. Properly check the device path depth value and look for the Messaging type instead to find the correct NIC. This check never worked before and was uncovered by the last change. Regression noticed by bluhm@ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.36.1 src/sys/arch/i386/stand/efiboot/efipxe.c cvs rdiff -u -r1.2 -r1.2.32.1 src/sys/stand/efiboot/efipxe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/i386/stand/efiboot
Module Name:src Committed By: martin Date: Mon Sep 11 13:25:42 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: Makefile.efiboot eficons.c Added Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: eficpufunc.c eficpufunc.h Log Message: Pull up following revision(s) (requested by rin in ticket #361): sys/arch/i386/stand/efiboot/Makefile.efiboot: revision 1.22 sys/arch/i386/stand/efiboot/eficpufunc.c: revision 1.1 sys/arch/i386/stand/efiboot/eficpufunc.h: revision 1.1 sys/arch/i386/stand/efiboot/eficons.c: revision 1.13 efiboot/x86: Add serial console support via raw I/O port access Unfortunately, some (most?) UEFI implementations do not support com ports by ``Serial I/O Protocol''. ``PNP0501-0'' and friends are not recognized also. In this case, if user explicitly requires to switch to serial console by ``consdev'' command, try to use raw I/O port access. Ugly, but what FreeBSD does, at least. Proposed as PR port-amd64/57523 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.4.1 \ src/sys/arch/i386/stand/efiboot/Makefile.efiboot cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/i386/stand/efiboot/eficons.c cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/i386/stand/efiboot/eficpufunc.c \ src/sys/arch/i386/stand/efiboot/eficpufunc.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/i386/stand/efiboot/Makefile.efiboot diff -u src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.19 src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.19.4.1 --- src/sys/arch/i386/stand/efiboot/Makefile.efiboot:1.19 Thu Nov 18 16:17:40 2021 +++ src/sys/arch/i386/stand/efiboot/Makefile.efiboot Mon Sep 11 13:25:42 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.efiboot,v 1.19 2021/11/18 16:17:40 manu Exp $ +# $NetBSD: Makefile.efiboot,v 1.19.4.1 2023/09/11 13:25:42 martin Exp $ S= ${.CURDIR}/../../../../.. @@ -14,9 +14,11 @@ AFLAGS.start.S= ${${ACTIVE_CC} == "clang SOURCES= start.S boot.c conf.c devopen.c dev_net.c self_reloc.c panic.c SOURCES+= efiboot.c efichar.c eficons.c efidelay.c efidev.c +SOURCES+= eficpufunc.c SOURCES+= efidisk.c efidisk_ll.c efigetsecs.c efimemory.c SOURCES+= efinet.c efipxe.c LIBI386SRCS= biosdisk.c bootinfo.c bootinfo_biosgeom.c bootmenu.c +LIBI386SRCS+= comio_direct.c LIBI386SRCS+= diskbuf.c exec.c menuutils.c parseutils.c pread.c LIBI386SRCS+= exec_multiboot1.c exec_multiboot2.c # use our own nfs implementation Index: src/sys/arch/i386/stand/efiboot/eficons.c diff -u src/sys/arch/i386/stand/efiboot/eficons.c:1.12 src/sys/arch/i386/stand/efiboot/eficons.c:1.12.4.1 --- src/sys/arch/i386/stand/efiboot/eficons.c:1.12 Thu Oct 28 06:13:13 2021 +++ src/sys/arch/i386/stand/efiboot/eficons.c Mon Sep 11 13:25:42 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: eficons.c,v 1.12 2021/10/28 06:13:13 kim Exp $ */ +/* $NetBSD: eficons.c,v 1.12.4.1 2023/09/11 13:25:42 martin Exp $ */ /*- * Copyright (c) 2016 Kimihiro Nonaka @@ -29,6 +29,8 @@ #include #include +#include + #include "efiboot.h" #include "bootinfo.h" @@ -60,6 +62,8 @@ static u_char serbuf[16]; static int serbuf_read = 0; static int serbuf_write = 0; +static int raw_com_addr = 0; + static void eficons_init_video(void); static void efi_switch_video_to_text_mode(void); @@ -76,6 +80,12 @@ static int efi_com_putc(int); static int efi_com_status(int); static int efi_com_waitforinputevent(uint64_t); +static int raw_com_init(int, int); +static int raw_com_getc(void); +static int raw_com_putc(int); +static int raw_com_status(int); +static int raw_com_waitforinputevent(uint64_t); + static int efi_find_gop_mode(char *); static int iodev; @@ -134,11 +144,8 @@ ok: case CONSDEV_COM3: iodev = dev; btinfo_console.addr = ioport; - if (btinfo_console.addr == 0) { - if (!efi_valid_com(iodev)) -goto nocom; + if (btinfo_console.addr == 0) btinfo_console.addr = getcomaddr(iodev - CONSDEV_COM0); - } if (speed != 0) btinfo_console.speed = speed; efi_com_init(btinfo_console.addr, btinfo_console.speed); @@ -149,8 +156,6 @@ ok: case CONSDEV_COM2KBD: case CONSDEV_COM3KBD: iodev = dev - CONSDEV_COM0KBD + CONSDEV_COM0; - if (!efi_valid_com(iodev)) - goto nocom; btinfo_console.addr = getcomaddr(iodev - CONSDEV_COM0); efi_cons_putc('0' + iodev - CONSDEV_COM0); @@ -869,7 +874,7 @@ efi_com_init(int addr, int speed) return 0; if (!efi_valid_com(iodev)) - return 0; + return raw_com_init(addr, speed); serio = serios[iodev - CONSDEV_COM0]; @@ -885,6 +890,7 @@ efi_com_init(int addr, int speed) } } + raw_com_addr = 0; default_comspeed = speed; internal_getchar = efi_com_getc; internal_putchar = efi_com_putc; @@ -1019,3 +1025,65 @@ efi_com_waitforinputevent(uint64_t timeo return ETIMEDOUT; return EINVAL; } + +static int +raw_com_init(int addr, int speed) +{ + + if (addr == 0 || speed <= 0) +
CVS commit: [netbsd-10] src/sys/arch/i386/stand/efiboot
Module Name:src Committed By: martin Date: Mon Sep 11 13:25:42 UTC 2023 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: Makefile.efiboot eficons.c Added Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: eficpufunc.c eficpufunc.h Log Message: Pull up following revision(s) (requested by rin in ticket #361): sys/arch/i386/stand/efiboot/Makefile.efiboot: revision 1.22 sys/arch/i386/stand/efiboot/eficpufunc.c: revision 1.1 sys/arch/i386/stand/efiboot/eficpufunc.h: revision 1.1 sys/arch/i386/stand/efiboot/eficons.c: revision 1.13 efiboot/x86: Add serial console support via raw I/O port access Unfortunately, some (most?) UEFI implementations do not support com ports by ``Serial I/O Protocol''. ``PNP0501-0'' and friends are not recognized also. In this case, if user explicitly requires to switch to serial console by ``consdev'' command, try to use raw I/O port access. Ugly, but what FreeBSD does, at least. Proposed as PR port-amd64/57523 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.19.4.1 \ src/sys/arch/i386/stand/efiboot/Makefile.efiboot cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/i386/stand/efiboot/eficons.c cvs rdiff -u -r0 -r1.1.2.2 src/sys/arch/i386/stand/efiboot/eficpufunc.c \ src/sys/arch/i386/stand/efiboot/eficpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libarch/sparc/v8
Module Name:src Committed By: uwe Date: Mon Sep 11 12:00:45 UTC 2023 Modified Files: src/lib/libarch/sparc/v8: sparc_v8.S Log Message: sparc_v8.S: fix v8 .mul/.umul versions to conform to psABI Both .mul and .umul are defined to return the most significant 32 bits of the result in %o1, but v8 multiplication instructions put them in %y. Move them to %o1. Nothing in the gcc generated code depends on this, but hand-written assembly can rely on this and e.g. Self does. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libarch/sparc/v8/sparc_v8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libarch/sparc/v8
Module Name:src Committed By: uwe Date: Mon Sep 11 12:00:45 UTC 2023 Modified Files: src/lib/libarch/sparc/v8: sparc_v8.S Log Message: sparc_v8.S: fix v8 .mul/.umul versions to conform to psABI Both .mul and .umul are defined to return the most significant 32 bits of the result in %o1, but v8 multiplication instructions put them in %y. Move them to %o1. Nothing in the gcc generated code depends on this, but hand-written assembly can rely on this and e.g. Self does. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libarch/sparc/v8/sparc_v8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libarch/sparc/v8/sparc_v8.S diff -u src/lib/libarch/sparc/v8/sparc_v8.S:1.2 src/lib/libarch/sparc/v8/sparc_v8.S:1.3 --- src/lib/libarch/sparc/v8/sparc_v8.S:1.2 Tue Sep 22 13:27:13 2015 +++ src/lib/libarch/sparc/v8/sparc_v8.S Mon Sep 11 12:00:45 2023 @@ -6,28 +6,45 @@ .file "sparc_v8.S" .section ".text" -/*--- .umul ---*/ + +/* + * unsigned .umul(unsigned a, unsigned b) + * + * This function computes a * b with unsigned integer + * multiplication. When .umul returns, the caller's register %o0 + * contains the least significant 32 bits of the 64-bit result; + * register %o1 holds the most significant 32 bits of the result. + * Upon return, the integer condition codes and registers %o2 + * through %o5 have unspecified values. + */ .align 4 .global .umul .type .umul,@function - .umul: - !#PROLOGUE# 0 - !#PROLOGUE# 1 + umul %o0, %o1, %o0 retl - umul %o0, %o1, %o0 + rd %y, %o1 .LLfe1: .size .umul,.LLfe1-.umul -/*--- .mul ---*/ + +/* + * int .mul(int a, int b) + * + * This function computes a * b with signed integer + * multiplication. When .mul returns, the caller's register %o0 + * contains the least significant 32 bits of the 64-bit result; + * register %o1 holds the most significant 32 bits of the result. + * Upon return, the integer condition codes and registers %o2 + * through %o5 have unspecified values. + */ .align 4 .global .mul .type .mul,@function .mul: - !#PROLOGUE# 0 - !#PROLOGUE# 1 + smul %o0, %o1, %o0 retl - smul %o0, %o1, %o0 + rd %y, %o1 .LLfe2: .size .mul,.LLfe2-.mul
CVS commit: src/sys/kern
Module Name:src Committed By: martin Date: Mon Sep 11 08:55:01 UTC 2023 Modified Files: src/sys/kern: subr_kcpuset.c Log Message: Add missing include (previously indirectly hidden via pool.h) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_kcpuset.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_kcpuset.c diff -u src/sys/kern/subr_kcpuset.c:1.17 src/sys/kern/subr_kcpuset.c:1.18 --- src/sys/kern/subr_kcpuset.c:1.17 Sun Sep 10 14:45:52 2023 +++ src/sys/kern/subr_kcpuset.c Mon Sep 11 08:55:01 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_kcpuset.c,v 1.17 2023/09/10 14:45:52 ad Exp $ */ +/* $NetBSD: subr_kcpuset.c,v 1.18 2023/09/11 08:55:01 martin Exp $ */ /*- * Copyright (c) 2011, 2023 The NetBSD Foundation, Inc. @@ -41,12 +41,13 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.17 2023/09/10 14:45:52 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_kcpuset.c,v 1.18 2023/09/11 08:55:01 martin Exp $"); #include #include #include +#include #include #include #include
CVS commit: src/sys/kern
Module Name:src Committed By: martin Date: Mon Sep 11 08:55:01 UTC 2023 Modified Files: src/sys/kern: subr_kcpuset.c Log Message: Add missing include (previously indirectly hidden via pool.h) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_kcpuset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.