rokuyama

diff --git a/external/gpl3/binutils/dist/bfd/config.bfd b/external/gpl3/binutils/dist/bfd/config.bfd
index 3ff5b24b8a4..89a157f4cd1 100644
--- a/external/gpl3/binutils/dist/bfd/config.bfd
+++ b/external/gpl3/binutils/dist/bfd/config.bfd
@@ -1375,6 +1375,7 @@ case "${targ}" in
   vax-*-netbsdelf*)
     targ_defvec=vax_elf32_vec
     targ_selvecs="vax_aout_nbsd_vec vax_aout_1knbsd_vec"
+    want64=true
     ;;

rokuyama

diff --git a/sys/dev/pci/if_aq.c b/sys/dev/pci/if_aq.c
index 50581641c01..41c1b9ea788 100644
--- a/sys/dev/pci/if_aq.c
+++ b/sys/dev/pci/if_aq.c
@@ -1808,10 +1808,8 @@ aq_attach(device_t parent, device_t self, void *aux)
 		sc->sc_msix = false;
 	}
 
-	/* on AQ1a0, AQ2, or FIBRE, linkstat interrupt doesn't work? */
-	if (aqp->aq_media_type == AQ_MEDIA_TYPE_FIBRE ||

rokuyama

From 3465eb99a65fcd5e87ad266ae230f1c6211426a7 Mon Sep 17 00:00:00 2001
From: Rin Okuyama <rin@iij.ad.jp>
Date: Wed, 13 Sep 2023 17:27:40 +0900
Subject: [PATCH] oea/pmap: Use pool_allocator_nointr for pmap_pool

Try to fix stall in pmap_create(9).
---
 sys/arch/powerpc/oea/pmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

rokuyama

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 5d00697ae82..b6971da77f7 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.79 2022/06/28 11:36:08 wiz Exp $
 
 DISTNAME=		aspell-0.60.8
-PKGREVISION=		4
+PKGREVISION=		5

rokuyama

SH IPL+g version 0.9, Copyright (C) 2000 Free Software Foundation, Inc.

This software comes with ABSOLUTELY NO WARRANTY; for details type `w'.
This is free software, and you are welcome to redistribute it under
certain conditions; type `l' for details.

2002/09/09 Making.  2003/10/16 I-O DATA NSD NWG Update.
266:133:33 on base clock 22.22MHz and SDRAM 4 burst. ATA boot.

A-Card ATP865 ATA controller found.

rokuyama

diff --git a/external/gpl3/gcc/dist/libsanitizer/asan/asan_allocator.cpp b/external/gpl3/gcc/dist/libsanitizer/asan/asan_allocator.cpp
index 3fa36742060b..c5d54e55d572 100644
--- a/external/gpl3/gcc/dist/libsanitizer/asan/asan_allocator.cpp
+++ b/external/gpl3/gcc/dist/libsanitizer/asan/asan_allocator.cpp
@@ -99,6 +99,9 @@ class ChunkHeader {
   u16 user_requested_size_hi;
   u32 user_requested_size_lo;
   atomic_uint64_t alloc_context_id;
+#ifdef SANITIZER_NO_64BIT_ATOMIC_OPS
+  u32 pad;

rokuyama

Index: lib/libcurses/clrtoeol.c
===================================================================
RCS file: /home/netbsd/src/lib/libcurses/clrtoeol.c,v
retrieving revision 1.35
diff -p -u -r1.35 clrtoeol.c
--- lib/libcurses/clrtoeol.c	12 May 2022 22:25:38 -0000	1.35
+++ lib/libcurses/clrtoeol.c	25 Oct 2022 09:18:37 -0000
@@ -113,9 +113,9 @@ wclrtoeol(WINDOW *win)
 #endif
 	}

rokuyama

--- external/bsd/nvi/usr.bin/nvi/Makefile.orig	2021-02-26 11:54:21.000000000 +0900
+++ external/bsd/nvi/usr.bin/nvi/Makefile	2022-10-25 20:22:33.424922552 +0900
@@ -33,7 +33,9 @@
 #CPPFLAGS+=-DDBDEBUG -DTRACE
 #CPPFLAGS+=-DQUEUEDEBUG
 
-LDADD+=	-lcurses -lterminfo -lutil
+#LDADD+=	-lcurses -lterminfo -lutil
+CPPFLAGS+= -DNCURSES_WIDECHAR -I/usr/pkg/include -I/usr/pkg/include/ncursesw
+LDADD+=	-L/usr/pkg/lib -Wl,-R,/usr/pkg/lib -lncursesw -lutil

rokuyama

Index: sys/dev/pci/genfb_pci.c
===================================================================
RCS file: /home/netbsd/src/sys/dev/pci/genfb_pci.c,v
retrieving revision 1.40
diff -p -u -r1.40 genfb_pci.c
--- sys/dev/pci/genfb_pci.c	7 Aug 2021 16:19:14 -0000	1.40
+++ sys/dev/pci/genfb_pci.c	30 Sep 2022 07:35:07 -0000
@@ -102,6 +102,7 @@ pci_genfb_attach(device_t parent, device
 	struct genfb_ops ops = zero_ops;
 	pcireg_t rom;

rokuyama

--- wsfb_driver.c.orig	2022-08-20 10:03:51.861996105 +0900
+++ wsfb_driver.c	2022-08-20 09:51:35.185068089 +0900
@@ -566,6 +566,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
 	bitsperpixel = fPtr->fbi.fbi_bitsperpixel == 15 ? 16 : fPtr->fbi.fbi_bitsperpixel;
 #if defined(__NetBSD__) && defined(WSDISPLAY_TYPE_LUNA)
 	if (wstype == WSDISPLAY_TYPE_LUNA) {
+#  if XORG_VERSION_CURRENT >= (1) * 10000000 + (20) * 100000
 		/*
 		 * XXX
 		 * LUNA's color framebuffers support 4bpp or 8bpp