CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Thu Aug 24 19:51:24 UTC 2023 Modified Files: src/sys/compat/linux/common: linux_inotify.c Log Message: fix a locking bug (Theodore Preduta) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/common/linux_inotify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: christos
Date: Thu Aug 24 19:51:24 UTC 2023
Modified Files:
src/sys/compat/linux/common: linux_inotify.c
Log Message:
fix a locking bug (Theodore Preduta)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/common/linux_inotify.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_inotify.c
diff -u src/sys/compat/linux/common/linux_inotify.c:1.4 src/sys/compat/linux/common/linux_inotify.c:1.5
--- src/sys/compat/linux/common/linux_inotify.c:1.4 Wed Aug 23 15:17:59 2023
+++ src/sys/compat/linux/common/linux_inotify.c Thu Aug 24 15:51:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_inotify.c,v 1.4 2023/08/23 19:17:59 christos Exp $ */
+/* $NetBSD: linux_inotify.c,v 1.5 2023/08/24 19:51:24 christos Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_inotify.c,v 1.4 2023/08/23 19:17:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_inotify.c,v 1.5 2023/08/24 19:51:24 christos Exp $");
#include
#include
@@ -790,9 +790,18 @@ inotify_readdir(file_t *fp, struct diren
/* XXX: should pass whether to lock or not */
if (needs_lock)
vn_lock(vp, LK_SHARED | LK_RETRY);
+ else
+ /*
+ * XXX We need to temprarily drop v_interlock because
+ * it may be temporarily acquired by biowait().
+ */
+ mutex_exit(vp->v_interlock);
+ KASSERT(!mutex_owned(vp->v_interlock));
error = VOP_READDIR(vp, , fp->f_cred, , NULL, NULL);
if (needs_lock)
VOP_UNLOCK(vp);
+ else
+ mutex_enter(vp->v_interlock);
mutex_enter(>f_lock);
fp->f_offset = uio.uio_offset;
@@ -1107,7 +1116,7 @@ inotify_filt_event(struct knote *kn, lon
cv_signal(>ifd_qcv);
mutex_enter(>ifd_lock);
- selnotify(>ifd_sel, 0, 0);
+ selnotify(>ifd_sel, 0, NOTE_LOWAT);
mutex_exit(>ifd_lock);
} else
DPRINTF(("%s: hint=%lx resulted in 0 inotify events\n",
@@ -1295,14 +1304,17 @@ inotify_read_filt_detach(struct knote *k
static int
inotify_read_filt_event(struct knote *kn, long hint)
{
- int rv;
struct inotifyfd *ifd = ((file_t *)kn->kn_obj)->f_data;
- mutex_enter(>ifd_qlock);
- rv = (ifd->ifd_qcount > 0);
- mutex_exit(>ifd_qlock);
+ if (hint != 0) {
+ KASSERT(mutex_owned(>ifd_lock));
+ KASSERT(mutex_owned(>ifd_qlock));
+ KASSERT(hint == NOTE_LOWAT);
+
+ kn->kn_data = ifd->ifd_qcount;
+ }
- return rv;
+ return kn->kn_data > 0;
}
/*
CVS commit: src/tools/compat
Module Name:src Committed By: palle Date: Thu Aug 24 19:30:48 UTC 2023 Modified Files: src/tools/compat: README Log Message: Update build instructions for Solaris 11.3 hosts To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/tools/compat/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/README diff -u src/tools/compat/README:1.27 src/tools/compat/README:1.28 --- src/tools/compat/README:1.27 Wed Aug 23 19:09:53 2023 +++ src/tools/compat/README Thu Aug 24 19:30:48 2023 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.27 2023/08/23 19:09:53 palle Exp $ +$NetBSD: README,v 1.28 2023/08/24 19:30:48 palle Exp $ Special notes for cross-hosting a NetBSD build on certain platforms. Only those platforms which have been tested to complete a "build.sh" run @@ -126,9 +126,9 @@ Solaris 11: * Solaris 11.3 * POSIX.1-2001, SUSv3 (see standards(7)) - * Using gcc-12 from pkgsrc.org (installed in GCC12INSTALLDIR) + * Using gcc-12 from pkgsrc.org (installed in $GCC12INSTALLDIR) * Set PATH to /usr/xpg6/bin:/usr/xpg4/bin:/usr/bin:$GCC12INSTALLDIR/bin - * Set HOST_CC to /usr/bin/gcc + * Set HOST_CC to $GCC12INSTALLDIR/bin/gcc * Set HOST_SH to /usr/bin/bash * Solaris 11.4 (CBE)
CVS commit: src/tools/compat
Module Name:src Committed By: palle Date: Thu Aug 24 19:30:48 UTC 2023 Modified Files: src/tools/compat: README Log Message: Update build instructions for Solaris 11.3 hosts To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/tools/compat/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs
Module Name:src Committed By: andvar Date: Thu Aug 24 14:56:03 UTC 2023 Modified Files: src/sys/ufs/lfs: ulfs_quota2_subr.c src/sys/ufs/ufs: quota2_subr.c Log Message: s/defaut/default/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_quota2_subr.c cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ufs/quota2_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs
Module Name:src
Committed By: andvar
Date: Thu Aug 24 14:56:03 UTC 2023
Modified Files:
src/sys/ufs/lfs: ulfs_quota2_subr.c
src/sys/ufs/ufs: quota2_subr.c
Log Message:
s/defaut/default/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_quota2_subr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/ufs/quota2_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/ulfs_quota2_subr.c
diff -u src/sys/ufs/lfs/ulfs_quota2_subr.c:1.6 src/sys/ufs/lfs/ulfs_quota2_subr.c:1.7
--- src/sys/ufs/lfs/ulfs_quota2_subr.c:1.6 Thu Jun 6 00:51:50 2013
+++ src/sys/ufs/lfs/ulfs_quota2_subr.c Thu Aug 24 14:56:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2_subr.c,v 1.6 2013/06/06 00:51:50 dholland Exp $ */
+/* $NetBSD: ulfs_quota2_subr.c,v 1.7 2023/08/24 14:56:03 andvar Exp $ */
/* from NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp */
/*-
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2_subr.c,v 1.6 2013/06/06 00:51:50 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2_subr.c,v 1.7 2023/08/24 14:56:03 andvar Exp $");
#include
#include
@@ -76,7 +76,7 @@ lfsquota2_create_blk0(uint64_t bsize, vo
q2h->q2h_type = type;
q2h->q2h_hash_shift = q2h_hash_shift;
q2h->q2h_hash_size = ulfs_rw16(quota2_hash_size, ns);
- /* setup defaut entry: unlimited, 7 days grace */
+ /* setup default entry: unlimited, 7 days grace */
for (i = 0; i < N_QL; i++) {
q2h->q2h_defentry.q2e_val[i].q2v_hardlimit =
q2h->q2h_defentry.q2e_val[i].q2v_softlimit =
Index: src/sys/ufs/ufs/quota2_subr.c
diff -u src/sys/ufs/ufs/quota2_subr.c:1.6 src/sys/ufs/ufs/quota2_subr.c:1.7
--- src/sys/ufs/ufs/quota2_subr.c:1.6 Wed Feb 22 21:49:45 2023
+++ src/sys/ufs/ufs/quota2_subr.c Thu Aug 24 14:56:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: quota2_subr.c,v 1.6 2023/02/22 21:49:45 riastradh Exp $ */
+/* $NetBSD: quota2_subr.c,v 1.7 2023/08/24 14:56:03 andvar Exp $ */
/*-
* Copyright (c) 2010, 2011 Manuel Bouyer
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.6 2023/02/22 21:49:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: quota2_subr.c,v 1.7 2023/08/24 14:56:03 andvar Exp $");
#include
#include
@@ -73,7 +73,7 @@ quota2_create_blk0(uint64_t bsize, void
q2h->q2h_type = type;
q2h->q2h_hash_shift = q2h_hash_shift;
q2h->q2h_hash_size = ufs_rw16(quota2_hash_size, ns);
- /* setup defaut entry: unlimited, 7 days grace */
+ /* setup default entry: unlimited, 7 days grace */
for (i = 0; i < N_QL; i++) {
q2h->q2h_defentry.q2e_val[i].q2v_hardlimit =
q2h->q2h_defentry.q2e_val[i].q2v_softlimit =
CVS commit: src/regress/sys/uvm/pdsim
Module Name:src
Committed By: andvar
Date: Thu Aug 24 14:53:02 UTC 2023
Modified Files:
src/regress/sys/uvm/pdsim: Makefile
Log Message:
s/defult/default/
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/regress/sys/uvm/pdsim/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/sys/uvm/pdsim/Makefile
diff -u src/regress/sys/uvm/pdsim/Makefile:1.2 src/regress/sys/uvm/pdsim/Makefile:1.3
--- src/regress/sys/uvm/pdsim/Makefile:1.2 Sat Oct 14 04:59:52 2006
+++ src/regress/sys/uvm/pdsim/Makefile Thu Aug 24 14:53:02 2023
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2006/10/14 04:59:52 yamt Exp $
+# $Id: Makefile,v 1.3 2023/08/24 14:53:02 andvar Exp $
CPROGS= lirs
HPROGS= lfu lru nbsd opt rand
@@ -50,7 +50,7 @@ pdsim.dbg.cpro_${_V}: pdsim.c ${PDPOL}
# clock
-CLOCK_CFLAGS.defult=
+CLOCK_CFLAGS.default=
CLOCK_CFLAGS.inact90= -DCLOCK_INACTIVEPCT=90
PDSIM_CLOCK_VARIANTS+= default
CVS commit: src/regress/sys/uvm/pdsim
Module Name:src Committed By: andvar Date: Thu Aug 24 14:53:02 UTC 2023 Modified Files: src/regress/sys/uvm/pdsim: Makefile Log Message: s/defult/default/ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/regress/sys/uvm/pdsim/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/dec
Module Name:src Committed By: andvar Date: Thu Aug 24 14:21:40 UTC 2023 Modified Files: src/sys/dev/dec: mcclock.c Log Message: s/MC_DFEAULTHZ/MC_DEFAULTHZ/ for alpha specific default rate definition. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dec/mcclock.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/dec/mcclock.c diff -u src/sys/dev/dec/mcclock.c:1.28 src/sys/dev/dec/mcclock.c:1.29 --- src/sys/dev/dec/mcclock.c:1.28 Mon Nov 17 02:15:49 2014 +++ src/sys/dev/dec/mcclock.c Thu Aug 24 14:21:40 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: mcclock.c,v 1.28 2014/11/17 02:15:49 christos Exp $ */ +/* $NetBSD: mcclock.c,v 1.29 2023/08/24 14:21:40 andvar Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.28 2014/11/17 02:15:49 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.29 2023/08/24 14:21:40 andvar Exp $"); #include #include @@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock.c,v * XXX default rate is machine-dependent. */ #ifdef __alpha__ -#define MC_DFEAULTHZ 1024 +#define MC_DEFAULTHZ 1024 #endif #ifdef pmax #define MC_DEFAULTHZ 256
CVS commit: src/sys/dev/dec
Module Name:src Committed By: andvar Date: Thu Aug 24 14:21:40 UTC 2023 Modified Files: src/sys/dev/dec: mcclock.c Log Message: s/MC_DFEAULTHZ/MC_DEFAULTHZ/ for alpha specific default rate definition. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dec/mcclock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Aug 24 06:35:57 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: zlib-1.3 is out To generate a diff of this commit: cvs rdiff -u -r1.1946 -r1.1947 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1946 src/doc/3RDPARTY:1.1947 --- src/doc/3RDPARTY:1.1946 Fri Aug 18 19:02:04 2023 +++ src/doc/3RDPARTY Thu Aug 24 06:35:57 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1946 2023/08/18 19:02:04 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1947 2023/08/24 06:35:57 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1462,7 +1462,7 @@ See /usr/src/external/bsd/wpa/NetBSD-upg Package: zlib Version: 1.2.13 -Current Vers: 1.2.13 +Current Vers: 1.3 Maintainer: Jean-loup Gailly and Mark Adler Archive Site: http://www.zlib.net/ Home Page: http://www.zlib.net/
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Aug 24 06:35:57 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: zlib-1.3 is out To generate a diff of this commit: cvs rdiff -u -r1.1946 -r1.1947 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: rin
Date: Thu Aug 24 06:31:19 UTC 2023
Modified Files:
src/external/bsd/jemalloc/lib: jemalloc_stub.c
Log Message:
jemalloc_stub.c: Forgot to update comment. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/jemalloc/lib/jemalloc_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/lib/jemalloc_stub.c
diff -u src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.3 src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.4
--- src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.3 Thu Aug 24 06:04:40 2023
+++ src/external/bsd/jemalloc/lib/jemalloc_stub.c Thu Aug 24 06:31:19 2023
@@ -141,4 +141,4 @@ void malloc_conf_set(const char *m)
{
__je_malloc_conf_set(m);
}
-#endif /* HAVE_JEMALLOC != 100 */
+#endif /* HAVE_JEMALLOC > 100 */
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: rin Date: Thu Aug 24 06:31:19 UTC 2023 Modified Files: src/external/bsd/jemalloc/lib: jemalloc_stub.c Log Message: jemalloc_stub.c: Forgot to update comment. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/jemalloc/lib/jemalloc_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: rin Date: Thu Aug 24 06:18:07 UTC 2023 Modified Files: src/share/mk: bsd.own.mk Log Message: bsd.own.mk: Switch mips64e[bl] to binutils 2.39 again Potential fix for PR toolchain/57241 has been committed. Let us see whether this works fine or not. To generate a diff of this commit: cvs rdiff -u -r1.1358 -r1.1359 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Thu Aug 24 06:18:07 UTC 2023
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
bsd.own.mk: Switch mips64e[bl] to binutils 2.39 again
Potential fix for PR toolchain/57241 has been committed.
Let us see whether this works fine or not.
To generate a diff of this commit:
cvs rdiff -u -r1.1358 -r1.1359 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1358 src/share/mk/bsd.own.mk:1.1359
--- src/share/mk/bsd.own.mk:1.1358 Sun Aug 20 02:11:21 2023
+++ src/share/mk/bsd.own.mk Thu Aug 24 06:18:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1358 2023/08/20 02:11:21 rin Exp $
+# $NetBSD: bsd.own.mk,v 1.1359 2023/08/24 06:18:07 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -102,11 +102,7 @@ MKGCCCMDS?= no
#
# What binutils is used?
#
-.if ${MACHINE_ARCH} != "mips64el" && ${MACHINE_ARCH} != "mips64eb"
HAVE_BINUTILS?= 239
-.else
-HAVE_BINUTILS?= 234
-.endif
.if ${HAVE_BINUTILS} == 239
EXTERNAL_BINUTILS_SUBDIR= binutils
CVS commit: src/external/gpl3/binutils
Module Name:src
Committed By: rin
Date: Thu Aug 24 06:14:57 UTC 2023
Modified Files:
src/external/gpl3/binutils/lib/libbfd/arch/mips64eb: bfd.h config.h
src/external/gpl3/binutils/lib/libbfd/arch/mips64el: bfd.h defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mips64eb: config.h
defs.mk
src/external/gpl3/binutils/lib/libiberty/arch/mips64el: defs.mk
src/external/gpl3/binutils/lib/libopcodes/arch/mips64eb: config.h
src/external/gpl3/binutils/usr.bin/common/arch/mips64eb: config.h
src/external/gpl3/binutils/usr.bin/gas/arch/mips64eb: config.h
src/external/gpl3/binutils/usr.bin/gas/arch/mips64el: config.h
src/external/gpl3/binutils/usr.bin/ld/arch/mips64eb: config.h
src/external/gpl3/binutils/usr.bin/ld/arch/mips64el: defs.mk
ldemul-list.h
Log Message:
binutils: mknative mips64e[bl] correctly
The previous version was very broken; SIZEOF_* seem like LP64, even
though this should be, and had been configured for n32 userland.
May fix random build failures reported as PR toolchain/57241.
XXX
There still remain oddies. mknative again soon with update for
configure scripts.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/binutils/lib/libbfd/arch/mips64el/bfd.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/binutils/lib/libbfd/arch/mips64el/defs.mk
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/binutils/lib/libiberty/arch/mips64eb/config.h \
src/external/gpl3/binutils/lib/libiberty/arch/mips64eb/defs.mk
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/binutils/lib/libiberty/arch/mips64el/defs.mk
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/binutils/lib/libopcodes/arch/mips64eb/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/binutils/usr.bin/common/arch/mips64eb/config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/binutils/usr.bin/gas/arch/mips64eb/config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/binutils/usr.bin/gas/arch/mips64el/config.h
cvs rdiff -u -r1.13 -r1.14 \
src/external/gpl3/binutils/usr.bin/ld/arch/mips64eb/config.h
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/binutils/usr.bin/ld/arch/mips64el/defs.mk
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/binutils/usr.bin/ld/arch/mips64el/ldemul-list.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h:1.13 src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h:1.14
--- src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h:1.13 Tue Feb 7 20:39:01 2023
+++ src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h Thu Aug 24 06:14:56 2023
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-binutils,v 1.14 2022/12/24 20:17:46 christos Exp */
+/* Generated from: NetBSD: mknative-binutils,v 1.15 2023/02/07 20:37:30 christos Exp */
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
/* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically
@@ -78,7 +78,7 @@ extern "C" {
#define BFD_ARCH_SIZE 64
/* The word size of the default bfd target. */
-#define BFD_DEFAULT_TARGET_SIZE 64
+#define BFD_DEFAULT_TARGET_SIZE 32
#include
@@ -124,7 +124,7 @@ typedef int64_t bfd_signed_vma;
typedef uint64_t bfd_size_type;
typedef uint64_t symvalue;
-#define BFD_VMA_FMT "l"
+#define BFD_VMA_FMT "ll"
#define fprintf_vma(f,x) fprintf (f, "%016" BFD_VMA_FMT "x", x)
#define sprintf_vma(s,x) sprintf (s, "%016" BFD_VMA_FMT "x", x)
Index: src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h
diff -u src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h:1.11 src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h:1.12
--- src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h:1.11 Tue Feb 7 20:39:01 2023
+++ src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h Thu Aug 24 06:14:56 2023
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-binutils,v 1.14 2022/12/24 20:17:46 christos Exp */
+/* Generated from: NetBSD: mknative-binutils,v 1.15 2023/02/07 20:37:30 christos Exp */
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
/* config.h. Generated from config.in by configure. */
@@ -266,7 +266,7 @@
#define SIZEOF_INT 4
/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 8
+#define SIZEOF_LONG 4
/* The size of `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG 8
@@
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: rin Date: Thu Aug 24 06:14:57 UTC 2023 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/mips64eb: bfd.h config.h src/external/gpl3/binutils/lib/libbfd/arch/mips64el: bfd.h defs.mk src/external/gpl3/binutils/lib/libiberty/arch/mips64eb: config.h defs.mk src/external/gpl3/binutils/lib/libiberty/arch/mips64el: defs.mk src/external/gpl3/binutils/lib/libopcodes/arch/mips64eb: config.h src/external/gpl3/binutils/usr.bin/common/arch/mips64eb: config.h src/external/gpl3/binutils/usr.bin/gas/arch/mips64eb: config.h src/external/gpl3/binutils/usr.bin/gas/arch/mips64el: config.h src/external/gpl3/binutils/usr.bin/ld/arch/mips64eb: config.h src/external/gpl3/binutils/usr.bin/ld/arch/mips64el: defs.mk ldemul-list.h Log Message: binutils: mknative mips64e[bl] correctly The previous version was very broken; SIZEOF_* seem like LP64, even though this should be, and had been configured for n32 userland. May fix random build failures reported as PR toolchain/57241. XXX There still remain oddies. mknative again soon with update for configure scripts. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/bfd.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64eb/config.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64el/bfd.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/binutils/lib/libbfd/arch/mips64el/defs.mk cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/binutils/lib/libiberty/arch/mips64eb/config.h \ src/external/gpl3/binutils/lib/libiberty/arch/mips64eb/defs.mk cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/binutils/lib/libiberty/arch/mips64el/defs.mk cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/binutils/lib/libopcodes/arch/mips64eb/config.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/binutils/usr.bin/common/arch/mips64eb/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/binutils/usr.bin/gas/arch/mips64eb/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/binutils/usr.bin/gas/arch/mips64el/config.h cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/binutils/usr.bin/ld/arch/mips64eb/config.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/binutils/usr.bin/ld/arch/mips64el/defs.mk cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/ld/arch/mips64el/ldemul-list.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: rin Date: Thu Aug 24 06:04:41 UTC 2023 Modified Files: src/external/bsd/jemalloc/lib: jemalloc_stub.c Log Message: jemalloc_stub.c: Provide stubs for HAVE_JEMALLOC > 100 Instead of HAVE_JEMALLOC != 100. Just for sure. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/jemalloc/lib/jemalloc_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: rin Date: Thu Aug 24 06:04:41 UTC 2023 Modified Files: src/external/bsd/jemalloc/lib: jemalloc_stub.c Log Message: jemalloc_stub.c: Provide stubs for HAVE_JEMALLOC > 100 Instead of HAVE_JEMALLOC != 100. Just for sure. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/jemalloc/lib/jemalloc_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/jemalloc/lib/jemalloc_stub.c diff -u src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.2 src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.3 --- src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.2 Thu Aug 24 06:02:44 2023 +++ src/external/bsd/jemalloc/lib/jemalloc_stub.c Thu Aug 24 06:04:40 2023 @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#if HAVE_JEMALLOC != 100 +#if HAVE_JEMALLOC > 100 #include void *__je_mallocx(size_t, int);
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: rin
Date: Thu Aug 24 06:02:44 UTC 2023
Modified Files:
src/external/bsd/jemalloc/lib: Makefile jemalloc_stub.c
Log Message:
libjemalloc: Compile in empty jemalloc_stub.c for HAVE_JEMALLOC=100
Fix strange parallel build failures observed on vax and sun2, which
should be due to empty SRCS.
No functional changes as library itself.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/jemalloc/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/jemalloc/lib/jemalloc_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/jemalloc/lib/Makefile
diff -u src/external/bsd/jemalloc/lib/Makefile:1.4 src/external/bsd/jemalloc/lib/Makefile:1.5
--- src/external/bsd/jemalloc/lib/Makefile:1.4 Mon Jul 10 07:59:24 2023
+++ src/external/bsd/jemalloc/lib/Makefile Thu Aug 24 06:02:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/07/10 07:59:24 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/08/24 06:02:44 rin Exp $
WARNS?= 5
.include
@@ -6,8 +6,7 @@ WARNS?= 5
LIB=jemalloc
# The symbols from the stub only exist in newer jemalloc.
-.if ${HAVE_JEMALLOC:U0} != 100
-SRCS=jemalloc_stub.c
-.endif
+CPPFLAGS+= -DHAVE_JEMALLOC=${HAVE_JEMALLOC:U0}
+SRCS= jemalloc_stub.c
.include
Index: src/external/bsd/jemalloc/lib/jemalloc_stub.c
diff -u src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.1 src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.2
--- src/external/bsd/jemalloc/lib/jemalloc_stub.c:1.1 Tue Mar 12 15:13:25 2019
+++ src/external/bsd/jemalloc/lib/jemalloc_stub.c Thu Aug 24 06:02:44 2023
@@ -26,6 +26,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
+
+#if HAVE_JEMALLOC != 100
#include
void *__je_mallocx(size_t, int);
@@ -139,3 +141,4 @@ void malloc_conf_set(const char *m)
{
__je_malloc_conf_set(m);
}
+#endif /* HAVE_JEMALLOC != 100 */
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src Committed By: rin Date: Thu Aug 24 06:02:44 UTC 2023 Modified Files: src/external/bsd/jemalloc/lib: Makefile jemalloc_stub.c Log Message: libjemalloc: Compile in empty jemalloc_stub.c for HAVE_JEMALLOC=100 Fix strange parallel build failures observed on vax and sun2, which should be due to empty SRCS. No functional changes as library itself. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/jemalloc/lib/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/jemalloc/lib/jemalloc_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
