CVS commit: src/sys
Module Name:src Committed By: ozaki-r Date: Fri Apr 19 01:52:56 UTC 2019 Modified Files: src/sys/kern: kern_lwp.c kern_softint.c subr_psref.c src/sys/rump/kern/lib/libsysproxy: sysproxy.c src/sys/sys: lwp.h userret.h Log Message: Implement a simple psref leak detector It detects leaks by counting up the number of held psref by an LWP and checking its zeroness at the end of syscalls and softint handlers. For the counter, a unused field of struct lwp is reused. The detector runs only if DIAGNOSTIC is turned on. To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/kern/kern_lwp.c cvs rdiff -u -r1.45 -r1.46 src/sys/kern/kern_softint.c cvs rdiff -u -r1.11 -r1.12 src/sys/kern/subr_psref.c cvs rdiff -u -r1.5 -r1.6 src/sys/rump/kern/lib/libsysproxy/sysproxy.c cvs rdiff -u -r1.181 -r1.182 src/sys/sys/lwp.h cvs rdiff -u -r1.26 -r1.27 src/sys/sys/userret.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/kern/kern_lwp.c diff -u src/sys/kern/kern_lwp.c:1.196 src/sys/kern/kern_lwp.c:1.197 --- src/sys/kern/kern_lwp.c:1.196 Fri Mar 1 09:02:03 2019 +++ src/sys/kern/kern_lwp.c Fri Apr 19 01:52:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_lwp.c,v 1.196 2019/03/01 09:02:03 hannken Exp $ */ +/* $NetBSD: kern_lwp.c,v 1.197 2019/04/19 01:52:55 ozaki-r Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -211,7 +211,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.196 2019/03/01 09:02:03 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.197 2019/04/19 01:52:55 ozaki-r Exp $"); #include "opt_ddb.h" #include "opt_lockdebug.h" @@ -836,6 +836,7 @@ lwp_create(lwp_t *l1, proc_t *p2, vaddr_ l2->l_flag = 0; l2->l_pflag = LP_MPSAFE; TAILQ_INIT(>l_ld_locks); + l2->l_psrefs = 0; /* * For vfork, borrow parent's lwpctl context if it exists. Index: src/sys/kern/kern_softint.c diff -u src/sys/kern/kern_softint.c:1.45 src/sys/kern/kern_softint.c:1.46 --- src/sys/kern/kern_softint.c:1.45 Thu Dec 28 03:39:48 2017 +++ src/sys/kern/kern_softint.c Fri Apr 19 01:52:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_softint.c,v 1.45 2017/12/28 03:39:48 msaitoh Exp $ */ +/* $NetBSD: kern_softint.c,v 1.46 2019/04/19 01:52:55 ozaki-r Exp $ */ /*- * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc. @@ -170,7 +170,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.45 2017/12/28 03:39:48 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_softint.c,v 1.46 2019/04/19 01:52:55 ozaki-r Exp $"); #include #include @@ -595,6 +595,9 @@ softint_execute(softint_t *si, lwp_t *l, KASSERTMSG(curcpu()->ci_mtx_count == 0, "%s: ci_mtx_count (%d) != 0, sh_func %p\n", __func__, curcpu()->ci_mtx_count, sh->sh_func); + /* Diagnostic: check that psrefs have not leaked. */ + KASSERTMSG(l->l_psrefs == 0, "%s: l_psrefs=%d, sh_func=%p\n", + __func__, l->l_psrefs, sh->sh_func); (void)splhigh(); KASSERT((sh->sh_flags & SOFTINT_ACTIVE) != 0); Index: src/sys/kern/subr_psref.c diff -u src/sys/kern/subr_psref.c:1.11 src/sys/kern/subr_psref.c:1.12 --- src/sys/kern/subr_psref.c:1.11 Thu Feb 1 03:17:00 2018 +++ src/sys/kern/subr_psref.c Fri Apr 19 01:52:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_psref.c,v 1.11 2018/02/01 03:17:00 ozaki-r Exp $ */ +/* $NetBSD: subr_psref.c,v 1.12 2019/04/19 01:52:55 ozaki-r Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_psref.c,v 1.11 2018/02/01 03:17:00 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_psref.c,v 1.12 2019/04/19 01:52:55 ozaki-r Exp $"); #include #include @@ -278,6 +278,10 @@ psref_acquire(struct psref *psref, const /* Release the CPU list and restore interrupts. */ percpu_putref(class->prc_percpu); splx(s); + +#ifdef DIAGNOSTIC + curlwp->l_psrefs++; +#endif } /* @@ -332,6 +336,11 @@ psref_release(struct psref *psref, const percpu_putref(class->prc_percpu); splx(s); +#ifdef DIAGNOSTIC + KASSERT(curlwp->l_psrefs > 0); + curlwp->l_psrefs--; +#endif + /* If someone is waiting for users to drain, notify 'em. */ if (__predict_false(target->prt_draining)) cv_broadcast(>prc_cv); @@ -388,6 +397,10 @@ psref_copy(struct psref *pto, const stru /* Release the CPU list and restore interrupts. */ percpu_putref(class->prc_percpu); splx(s); + +#ifdef DIAGNOSTIC + curlwp->l_psrefs++; +#endif } /* Index: src/sys/rump/kern/lib/libsysproxy/sysproxy.c diff -u src/sys/rump/kern/lib/libsysproxy/sysproxy.c:1.5 src/sys/rump/kern/lib/libsysproxy/sysproxy.c:1.6 --- src/sys/rump/kern/lib/libsysproxy/sysproxy.c:1.5 Thu Apr 18 08:31:44 2019 +++ src/sys/rump/kern/lib/libsysproxy/sysproxy.c Fri Apr 19 01:52:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sysproxy.c,v 1.5 2019/04/18 08:31:44 ozaki-r Exp $ */ +/* $NetBSD: sysproxy.c,v 1.6 2019/04/19
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: mrg
Date: Thu Apr 18 22:49:08 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
remove now dated comment.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.25 src/external/mit/xorg/lib/libGL/Makefile:1.26
--- src/external/mit/xorg/lib/libGL/Makefile:1.25 Thu Apr 11 10:15:53 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Apr 18 22:49:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/11 10:15:53 maya Exp $
+# $NetBSD: Makefile,v 1.26 2019/04/18 22:49:08 mrg Exp $
.include
@@ -202,7 +202,7 @@ PKGDIST.gl= ${X11SRCDIR.Mesa}/src/mesa
PKGCONFIG_VERSION.gl= ${MESA_VER}
# XXX remove these from bsd.x11.mk
-# XXX enable GLX TLS? it's enabled in the code, but not here..
+
PKGCONFIG_SED_FLAGS= \
-e "s,@GL_PC_REQ_PRIV@,libdrm x11 xext xdamage xfixes xcb-glx xcb-dri2 xxf86vm,; \
s,@GL_PKGCONF_LIB@,GL,; \
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Thu Apr 18 20:11:57 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
turn on MKCOMPAT for riscv64.
To generate a diff of this commit:
cvs rdiff -u -r1.1130 -r1.1131 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.1130 src/share/mk/bsd.own.mk:1.1131
--- src/share/mk/bsd.own.mk:1.1130 Tue Apr 16 21:20:51 2019
+++ src/share/mk/bsd.own.mk Thu Apr 18 20:11:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1130 2019/04/16 21:20:51 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1131 2019/04/18 20:11:57 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -962,7 +962,7 @@ MK${var}:= yes
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
|| ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
|| ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "aarch64" \
-|| !empty(MACHINE_ARCH:Mearm*)
+|| ${MACHINE_ARCH} == "riscv64" || !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= yes
.else
# Don't let this build where it really isn't supported.
CVS commit: src/sys/compat
Module Name:src
Committed By: christos
Date: Thu Apr 18 17:45:12 UTC 2019
Modified Files:
src/sys/compat/common: uipc_syscalls_40.c
src/sys/compat/linux/common: linux_socket.c
src/sys/compat/linux32/common: linux32_socket.c
Log Message:
Zero out the ifreq struct for SIOCGIFCONF to avoid up to 127 bytes of stack
disclosure. From Andy Nguyen, many thanks! This is the compat code part
pointed out by ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.144 -r1.145 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux32/common/linux32_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/uipc_syscalls_40.c
diff -u src/sys/compat/common/uipc_syscalls_40.c:1.18 src/sys/compat/common/uipc_syscalls_40.c:1.19
--- src/sys/compat/common/uipc_syscalls_40.c:1.18 Fri Mar 1 06:06:56 2019
+++ src/sys/compat/common/uipc_syscalls_40.c Thu Apr 18 13:45:12 2019
@@ -1,9 +1,9 @@
-/* $NetBSD: uipc_syscalls_40.c,v 1.18 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: uipc_syscalls_40.c,v 1.19 2019/04/18 17:45:12 christos Exp $ */
/* written by Pavel Cahyna, 2006. Public domain. */
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.18 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.19 2019/04/18 17:45:12 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -56,6 +56,7 @@ compat_ifconf(u_long cmd, void *data)
return ENOSYS;
}
+ memset(, 0, sizeof(ifr));
if (docopy) {
space = ifc->ifc_len;
ifrp = ifc->ifc_req;
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.144 src/sys/compat/linux/common/linux_socket.c:1.145
--- src/sys/compat/linux/common/linux_socket.c:1.144 Sun Feb 3 23:37:50 2019
+++ src/sys/compat/linux/common/linux_socket.c Thu Apr 18 13:45:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.144 2019/02/04 04:37:50 mrg Exp $ */
+/* $NetBSD: linux_socket.c,v 1.145 2019/04/18 17:45:12 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.144 2019/02/04 04:37:50 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.145 2019/04/18 17:45:12 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1136,6 +1136,7 @@ linux_getifconf(struct lwp *l, register_
if (error)
return error;
+ memset(, 0, sizeof(ifr));
docopy = ifc.ifc_req != NULL;
if (docopy) {
space = ifc.ifc_len;
Index: src/sys/compat/linux32/common/linux32_socket.c
diff -u src/sys/compat/linux32/common/linux32_socket.c:1.29 src/sys/compat/linux32/common/linux32_socket.c:1.30
--- src/sys/compat/linux32/common/linux32_socket.c:1.29 Wed May 9 21:32:24 2018
+++ src/sys/compat/linux32/common/linux32_socket.c Thu Apr 18 13:45:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_socket.c,v 1.29 2018/05/10 01:32:24 ozaki-r Exp $ */
+/* $NetBSD: linux32_socket.c,v 1.30 2019/04/18 17:45:12 christos Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.29 2018/05/10 01:32:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.30 2019/04/18 17:45:12 christos Exp $");
#include
#include
@@ -431,6 +431,7 @@ linux32_getifconf(struct lwp *l, registe
if (error)
return error;
+ memset(, 0, sizeof(ifr));
docopy = NETBSD32PTR64(ifc.ifc_req) != NULL;
if (docopy) {
space = ifc.ifc_len;
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: maya Date: Thu Apr 18 17:13:00 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC INSTALL Log Message: Follow arm64 and provide two sizes of fonts, so a larger one is chosen for larger displays. To generate a diff of this commit: cvs rdiff -u -r1.523 -r1.524 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.94 -r1.95 src/sys/arch/amd64/conf/INSTALL 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.523 src/sys/arch/amd64/conf/GENERIC:1.524 --- src/sys/arch/amd64/conf/GENERIC:1.523 Thu Apr 18 16:46:11 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Apr 18 17:13:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.523 2019/04/18 16:46:11 christos Exp $ +# $NetBSD: GENERIC,v 1.524 2019/04/18 17:13:00 maya Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.523 $" +#ident "GENERIC-$Revision: 1.524 $" maxusers 64 # estimated number of users @@ -1185,6 +1185,9 @@ pseudo-device nsmb # experimental - SM # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont +# Give us a choice of fonts based on monitor size +options FONT_BOLD8x16 +options FONT_BOLD16x32 # pseudo audio device driver pseudo-device pad Index: src/sys/arch/amd64/conf/INSTALL diff -u src/sys/arch/amd64/conf/INSTALL:1.94 src/sys/arch/amd64/conf/INSTALL:1.95 --- src/sys/arch/amd64/conf/INSTALL:1.94 Tue Dec 11 16:52:49 2018 +++ src/sys/arch/amd64/conf/INSTALL Thu Apr 18 17:13:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.94 2018/12/11 16:52:49 maya Exp $ +# $NetBSD: INSTALL,v 1.95 2019/04/18 17:13:00 maya Exp $ # # INSTALL - Installation kernel. # @@ -8,9 +8,11 @@ include "arch/amd64/conf/GENERIC" options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=115200 -#ident "INSTALL-$Revision: 1.94 $" +#ident "INSTALL-$Revision: 1.95 $" no options MEMORY_DISK_DYNAMIC +no options FONT_BOLD16x32 +no options FONT_BOLD8x16 options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support options MEMORY_DISK_ROOT_SIZE=1 # size of memory disk, in blocks
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Thu Apr 18 16:46:11 UTC 2019 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: Yes, we support FFS_EI but not DISKLABEL_EI... How does that make sense? To generate a diff of this commit: cvs rdiff -u -r1.522 -r1.523 src/sys/arch/amd64/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.522 src/sys/arch/amd64/conf/GENERIC:1.523 --- src/sys/arch/amd64/conf/GENERIC:1.522 Sat Apr 13 04:41:37 2019 +++ src/sys/arch/amd64/conf/GENERIC Thu Apr 18 12:46:11 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.522 2019/04/13 08:41:37 maxv Exp $ +# $NetBSD: GENERIC,v 1.523 2019/04/18 16:46:11 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.522 $" +#ident "GENERIC-$Revision: 1.523 $" maxusers 64 # estimated number of users @@ -204,7 +204,7 @@ options UFS_EXTATTR # Extended attribut #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. # other -#options DISKLABEL_EI # disklabel Endian Independent support +options DISKLABEL_EI # disklabel Endian Independent support options NFSSERVER # Network File System server # Networking options
CVS commit: src/external/bsd/jemalloc/include/jemalloc/internal
Module Name:src
Committed By: christos
Date: Thu Apr 18 16:44:26 UTC 2019
Modified Files:
src/external/bsd/jemalloc/include/jemalloc/internal:
jemalloc_internal_defs.h
Log Message:
no tls for sun2 either.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.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/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.6 src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.7
--- src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.6 Tue Apr 9 13:00:38 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Thu Apr 18 12:44:25 2019
@@ -151,7 +151,7 @@
/* #undef JEMALLOC_MUTEX_INIT_CB */
/* Non-empty if the tls_model attribute is supported. */
-#ifndef __vax__
+#if !defined(__vax__) && !defined(__mc68010__)
#define JEMALLOC_TLS_MODEL __attribute__((tls_model("initial-exec")))
#endif
@@ -235,7 +235,7 @@
/* #undef JEMALLOC_RETAIN */
/* TLS is used to map arenas and magazine caches to threads. */
-#ifndef __vax__
+#if !defined(__vax__) && !defined(__mc68010__)
#define JEMALLOC_TLS
#endif
CVS commit: xsrc/external/mit/libepoxy/src
Module Name:xsrc Committed By: christos Date: Thu Apr 18 16:41:55 UTC 2019 Modified Files: xsrc/external/mit/libepoxy/src: egl_generated_dispatch.c gl_generated_dispatch.c glx_generated_dispatch.c Log Message: all we are saying is, give lint a chance To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c \ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.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/libepoxy/src/egl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.1 xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.2 --- xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c:1.1 Wed Aug 17 23:26:04 2016 +++ xsrc/external/mit/libepoxy/src/egl_generated_dispatch.c Thu Apr 18 12:41:55 2019 @@ -9,7 +9,7 @@ #include "dispatch_common.h" #include "epoxy/egl.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) Index: xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.2 xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.3 --- xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c:1.2 Fri Aug 19 07:56:56 2016 +++ xsrc/external/mit/libepoxy/src/gl_generated_dispatch.c Thu Apr 18 12:41:55 2019 @@ -31,7 +31,7 @@ #include "dispatch_common.h" #include "epoxy/gl.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline) Index: xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c diff -u xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.2 xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.3 --- xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c:1.2 Fri Aug 19 07:56:57 2016 +++ xsrc/external/mit/libepoxy/src/glx_generated_dispatch.c Thu Apr 18 12:41:55 2019 @@ -9,7 +9,7 @@ #include "dispatch_common.h" #include "epoxy/glx.h" -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__lint__) #define EPOXY_NOINLINE __attribute__((noinline)) #elif defined (_MSC_VER) #define EPOXY_NOINLINE __declspec(noinline)
CVS commit: src/sys/dev/wscons
Module Name:src Committed By: isaki Date: Thu Apr 18 14:01:28 UTC 2019 Modified Files: src/sys/dev/wscons: wsbell.c Log Message: Fix the bell period. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/wscons/wsbell.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/wscons/wsbell.c diff -u src/sys/dev/wscons/wsbell.c:1.10 src/sys/dev/wscons/wsbell.c:1.11 --- src/sys/dev/wscons/wsbell.c:1.10 Thu Apr 18 13:01:38 2019 +++ src/sys/dev/wscons/wsbell.c Thu Apr 18 14:01:28 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: wsbell.c,v 1.10 2019/04/18 13:01:38 isaki Exp $ */ +/* $NetBSD: wsbell.c,v 1.11 2019/04/18 14:01:28 isaki Exp $ */ /*- * Copyright (c) 2017 Nathanial Sloss @@ -107,7 +107,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.10 2019/04/18 13:01:38 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.11 2019/04/18 14:01:28 isaki Exp $"); #if defined(_KERNEL_OPT) #include "wsmux.h" @@ -424,7 +424,11 @@ bell_thread(void *arg) } tone.frequency = vb->pitch; - tone.duration = vb->period; + /* + * period (derived from wskbd) is in msec. + * duration (derived from spkr) is in units of 10msec. + */ + tone.duration = vb->period / 10; vol = vb->volume; mutex_exit(>sc_bellock); @@ -442,7 +446,7 @@ spkr_audio_play(struct wsbell_softc *sc, mutex_enter(>sc_bellock); sc->sc_bell_args.pitch = pitch; - sc->sc_bell_args.period = period / 5; + sc->sc_bell_args.period = period; sc->sc_bell_args.volume = volume; cv_broadcast(>sc_bellcv);
CVS commit: src/sys/dev
Module Name:src
Committed By: isaki
Date: Thu Apr 18 13:01:39 UTC 2019
Modified Files:
src/sys/dev: spkr.c
src/sys/dev/pci: auich.c
src/sys/dev/wscons: wsbell.c
Log Message:
White space and indent fix.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/spkr.c
cvs rdiff -u -r1.153 -r1.154 src/sys/dev/pci/auich.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/wscons/wsbell.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/spkr.c
diff -u src/sys/dev/spkr.c:1.16 src/sys/dev/spkr.c:1.17
--- src/sys/dev/spkr.c:1.16 Mon Sep 3 16:29:30 2018
+++ src/sys/dev/spkr.c Thu Apr 18 13:01:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.16 2018/09/03 16:29:30 riastradh Exp $ */
+/* $NetBSD: spkr.c,v 1.17 2019/04/18 13:01:38 isaki Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.16 2018/09/03 16:29:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.17 2019/04/18 13:01:38 isaki Exp $");
#if defined(_KERNEL_OPT)
#include "wsmux.h"
@@ -123,8 +123,8 @@ static void playstring(struct spkr_softc
#define NUM_MULT 3 /* numerator of dot multiplier */
#define DENOM_MULT 2 /* denominator of dot multiplier */
-/* letter to half-tone: A B C D E F G */
-static const int notetab[8] = {9, 11, 0, 2, 4, 5, 7};
+/* letter to half-tone: A B C D E F G */
+static const int notetab[8] = { 9, 11, 0, 2, 4, 5, 7 };
/*
* This is the American Standard A440 Equal-Tempered scale with frequencies
@@ -211,7 +211,7 @@ playstring(struct spkr_softc *sc, const
#endif /* SPKRDEBUG */
switch (c) {
- case 'A': case 'B': case 'C': case 'D':
+ case 'A': case 'B': case 'C': case 'D':
case 'E': case 'F': case 'G':
/* compute pitch */
pitch = notetab[c - 'A'] + sc->sc_octave * OCTAVE_NOTES;
@@ -516,7 +516,7 @@ spkrioctl(dev_t dev, u_long cmd, void *d
return EINVAL;
switch (cmd) {
- case SPKRTONE:
+ case SPKRTONE:
playonetone(sc, data);
return 0;
case SPKRTUNE:
Index: src/sys/dev/pci/auich.c
diff -u src/sys/dev/pci/auich.c:1.153 src/sys/dev/pci/auich.c:1.154
--- src/sys/dev/pci/auich.c:1.153 Sat Mar 16 12:09:58 2019
+++ src/sys/dev/pci/auich.c Thu Apr 18 13:01:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: auich.c,v 1.153 2019/03/16 12:09:58 isaki Exp $ */
+/* $NetBSD: auich.c,v 1.154 2019/04/18 13:01:38 isaki Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.153 2019/03/16 12:09:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auich.c,v 1.154 2019/04/18 13:01:38 isaki Exp $");
#include
#include
@@ -1040,7 +1040,7 @@ auich_set_params(void *v, int setmode, i
sc->sc_codectype == AC97_CODEC_TYPE_AUDIO) {
control = bus_space_read_4(sc->iot, sc->aud_ioh,
ICH_GCTRL + sc->sc_modem_offset);
-control &= ~sc->sc_pcm246_mask;
+ control &= ~sc->sc_pcm246_mask;
if (p->channels == 4) {
control |= sc->sc_pcm4;
} else if (p->channels == 6) {
Index: src/sys/dev/wscons/wsbell.c
diff -u src/sys/dev/wscons/wsbell.c:1.9 src/sys/dev/wscons/wsbell.c:1.10
--- src/sys/dev/wscons/wsbell.c:1.9 Fri Nov 3 19:49:23 2017
+++ src/sys/dev/wscons/wsbell.c Thu Apr 18 13:01:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wsbell.c,v 1.9 2017/11/03 19:49:23 maya Exp $ */
+/* $NetBSD: wsbell.c,v 1.10 2019/04/18 13:01:38 isaki Exp $ */
/*-
* Copyright (c) 2017 Nathanial Sloss
@@ -107,7 +107,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.9 2017/11/03 19:49:23 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsbell.c,v 1.10 2019/04/18 13:01:38 isaki Exp $");
#if defined(_KERNEL_OPT)
#include "wsmux.h"
@@ -211,7 +211,7 @@ wsbell_match(device_t parent, cfdata_t m
void
wsbell_attach(device_t parent, device_t self, void *aux)
{
-struct wsbell_softc *sc = device_private(self);
+ struct wsbell_softc *sc = device_private(self);
struct wsbelldev_attach_args *ap = aux;
#if NWSMUX > 0
int mux, error;
@@ -400,7 +400,7 @@ getbell:
spkr_audio_play(sc, d->pitch, d->period, d->volume);
#undef d
return 0;
- }
+ }
return (EPASSTHROUGH);
}
@@ -413,16 +413,16 @@ bell_thread(void *arg)
struct vbell_args *vb = >sc_bell_args;
tone_t tone;
u_int vol;
-
+
for (;;) {
mutex_enter(>sc_bellock);
cv_wait_sig(>sc_bellcv, >sc_bellock);
-
+
if (sc->sc_dying == true) {
mutex_exit(>sc_bellock);
kthread_exit(0);
}
-
+
tone.frequency = vb->pitch;
tone.duration = vb->period;
vol = vb->volume;
CVS commit: src/lib/libc/time
Module Name:src Committed By: pgoyette Date: Thu Apr 18 11:20:17 UTC 2019 Modified Files: src/lib/libc/time: tzset.3 Log Message: Note restrictions on return values from tzgetname() and tzgmtoff() To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/tzset.3 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/time/tzset.3 diff -u src/lib/libc/time/tzset.3:1.39 src/lib/libc/time/tzset.3:1.40 --- src/lib/libc/time/tzset.3:1.39 Fri Oct 19 23:05:35 2018 +++ src/lib/libc/time/tzset.3 Thu Apr 18 11:20:17 2019 @@ -1,5 +1,5 @@ -.\" $NetBSD: tzset.3,v 1.39 2018/10/19 23:05:35 christos Exp $ -.Dd October 19, 2018 +.\" $NetBSD: tzset.3,v 1.40 2019/04/18 11:20:17 pgoyette Exp $ +.Dd April 18, 2019 .Dt TZSET 3 .Os .Sh NAME @@ -89,6 +89,12 @@ is set to .Va 1 the call is equivalent to .Va tzname[1] . +The return values for both +.Fn tzgetname +and +.Fn tzgmtoff +correspond to the latest time for which data is available, even if that +refers to a future time. Finally, the .Fn tzgetgmtoff function acts like @@ -424,6 +430,13 @@ The .Fn tzset function conforms to .St -p1003.1-88 . +.Sh BUGS +Neither the +.Fn tzgetname +nor +.Fn tzgmtoff +functions have the ability to specify the point in time for which the +requested data should be returned. .\" @(#)newtzset.3 8.2 .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson.
CVS commit: src/external/mit/xorg/lib/libEGL
Module Name:src
Committed By: maya
Date: Thu Apr 18 10:42:25 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libEGL: Makefile
Log Message:
We use pthread functions, link against pthread.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libEGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libEGL/Makefile
diff -u src/external/mit/xorg/lib/libEGL/Makefile:1.1 src/external/mit/xorg/lib/libEGL/Makefile:1.2
--- src/external/mit/xorg/lib/libEGL/Makefile:1.1 Tue Apr 16 21:21:51 2019
+++ src/external/mit/xorg/lib/libEGL/Makefile Thu Apr 18 10:42:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/04/16 21:21:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/04/18 10:42:25 maya Exp $
.include
@@ -104,7 +104,8 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
xcb-sync ${.CURDIR}/../libxcb/sync \
xcb ${.CURDIR}/../libxcb/libxcb \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
- m ${NETBSDSRCDIR}/lib/libm
+ m ${NETBSDSRCDIR}/lib/libm \
+ pthread ${NETBSDSRCDIR}/lib/libpthread
MKLINT=no
CVS commit: src/external/mit/xorg/lib/libepoxy
Module Name:src
Committed By: mrg
Date: Thu Apr 18 10:10:33 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile
Log Message:
if HAVE_XORG_GLAMOR != no, set define PLATFORM_HAS_EGL=1.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libepoxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.3 src/external/mit/xorg/lib/libepoxy/Makefile:1.4
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.3 Tue Apr 16 21:20:51 2019
+++ src/external/mit/xorg/lib/libepoxy/Makefile Thu Apr 18 10:10:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/04/16 21:20:51 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/18 10:10:33 mrg Exp $
.include
@@ -17,6 +17,7 @@ SRCS= \
SRCS+= \
dispatch_egl.c \
egl_generated_dispatch.c
+CPPFLAGS+= -DPLATFORM_HAS_EGL=1
.endif
INCSDIR=${X11INCDIR}/epoxy
CVS commit: xsrc/external/mit/libepoxy/dist/src
Module Name:xsrc Committed By: mrg Date: Thu Apr 18 10:09:37 UTC 2019 Modified Files: xsrc/external/mit/libepoxy/dist/src: dispatch_common.h Log Message: on NetBSD, don't define PLATFORM_HAS_EGL if it is already defined To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/libepoxy/dist/src/dispatch_common.h 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/libepoxy/dist/src/dispatch_common.h diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.3 xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.4 --- xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.3 Tue Apr 16 21:34:44 2019 +++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.h Thu Apr 18 10:09:37 2019 @@ -39,7 +39,7 @@ #define PLATFORM_HAS_WGL 0 #define EPOXY_IMPORTEXPORT #else -#ifdef __NetBSD__ +#if defined(__NetBSD__) && !defined(PLATFORM_HAS_EGL) # if defined(__amd64__) || defined(__i386__) || defined(__aarch64__) // XXX evbarm32 # define PLATFORM_HAS_EGL 1 # else
CVS commit: src
Module Name:src
Committed By: mrg
Date: Thu Apr 18 10:07:07 UTC 2019
Modified Files:
src/compat/riscv64/rv32: bsd.rv32.mk
src/distrib/sets/lists/comp: ad.riscv
Log Message:
- various updates for GCC 7 riscv definitions: -mabi and -march changed
- add missing LIBGCC_MACHINE_ARCH
- add the new ldscripts for riscv64 MKCOMPAT.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/compat/riscv64/rv32/bsd.rv32.mk
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/ad.riscv
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/riscv64/rv32/bsd.rv32.mk
diff -u src/compat/riscv64/rv32/bsd.rv32.mk:1.2 src/compat/riscv64/rv32/bsd.rv32.mk:1.3
--- src/compat/riscv64/rv32/bsd.rv32.mk:1.2 Wed Jun 24 22:20:25 2015
+++ src/compat/riscv64/rv32/bsd.rv32.mk Thu Apr 18 10:07:07 2019
@@ -1,22 +1,36 @@
-# $NetBSD: bsd.rv32.mk,v 1.2 2015/06/24 22:20:25 matt Exp $
-
+# $NetBSD: bsd.rv32.mk,v 1.3 2019/04/18 10:07:07 mrg Exp $
+# Keep this out of the .ifndef section, otherwise bsd.own.mk overrides this
.if empty(LD:M-m)
LD+= -m elf32lriscv
.endif
-.if !defined(MBLIBDIR)
+
+.ifndef _COMPAT_BSD_RV32_MK_
+_COMPAT_BSD_RV32_MK_=1
+
MLIBDIR= rv32
+LIBGCC_MACHINE_ARCH= riscv32
LIBC_MACHINE_ARCH= riscv32
COMMON_MACHINE_ARCH= riscv32
KVM_MACHINE_ARCH= riscv32
-LDELFSO_MACHINE_ARCH= riscv32
PTHREAD_MACHINE_ARCH= riscv32
BFD_MACHINE_ARCH= riscv32
CSU_MACHINE_ARCH= riscv32
CRYPTO_MACHINE_CPU= riscv32
LDELFSO_MACHINE_CPU= riscv32
+LDELFSO_MACHINE_ARCH= riscv32
GOMP_MACHINE_ARCH= riscv32
XORG_MACHINE_ARCH= riscv32
-.include "${.PARSEDIR}/../../m32.mk"
+.if empty(COPTS:M-mbi)
+_RV32_OPTS= -mabi=ilp32 -march=rv32g
+COPTS+= ${_RV32_OPTS}
+CPUFLAGS+= ${_RV32_OPTS}
+LDADD+= ${_RV32_OPTS}
+LDFLAGS+= ${_RV32_OPTS}
+MKDEPFLAGS+= ${_RV32_OPTS}
+.endif
+
+.include "../../Makefile.compat"
+
.endif
Index: src/distrib/sets/lists/comp/ad.riscv
diff -u src/distrib/sets/lists/comp/ad.riscv:1.13 src/distrib/sets/lists/comp/ad.riscv:1.14
--- src/distrib/sets/lists/comp/ad.riscv:1.13 Wed Apr 17 07:55:33 2019
+++ src/distrib/sets/lists/comp/ad.riscv Thu Apr 18 10:07:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv,v 1.13 2019/04/17 07:55:33 mrg Exp $
+# $NetBSD: ad.riscv,v 1.14 2019/04/18 10:07:07 mrg Exp $
./usr/include/g++/bits/riscv32 comp-c-include arch64,compat
./usr/include/g++/bits/riscv32/c++config.h comp-c-include arch64,gcc,compat
./usr/include/g++/bits/riscv64 comp-c-include arch64,compat
@@ -51,3 +51,81 @@
./usr/include/riscv/types.h comp-c-include
./usr/include/riscv/vmparam.h comp-c-include
./usr/include/riscv/wchar_limits.h comp-c-include
+./usr/libdata/ldscripts/elf32lriscv.x comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xbn comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xc comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xd comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xdc comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xdw comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xn comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xr comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xs comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xsc comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xsw comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xu comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv.xw comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.x comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xbn comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xc comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xd comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xdc comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xdw comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xn comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xr comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xs comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xsc comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xsw comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xu comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32.xw comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32f.x comp-util-bin binutils,arch64,compat
+./usr/libdata/ldscripts/elf32lriscv_ilp32f.xbn
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: mrg Date: Thu Apr 18 10:07:24 UTC 2019 Modified Files: src/external/gpl3/binutils/dist/ld: configure.tgt src/external/gpl3/binutils/dist/ld/emulparams: elf32lriscv.sh elf32lriscv_ilp32.sh elf32lriscv_ilp32f.sh src/external/gpl3/binutils/usr.bin/ld: Makefile src/external/gpl3/binutils/usr.bin/ld/arch/riscv64: defs.mk ldemul-list.h Log Message: - use the same set of emulations for riscv* on netbsd as linux does - for riscv64-*netbsd* hosts and 32 bit target, set LIB_PATH - build the other target emulations for riscv32 on riscv64 - regen riscv64 mknative for ld updates To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/binutils/dist/ld/configure.tgt cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32.sh \ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32f.sh cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/binutils/usr.bin/ld/Makefile cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/usr.bin/ld/arch/riscv64/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/riscv64/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/dist/ld/configure.tgt diff -u src/external/gpl3/binutils/dist/ld/configure.tgt:1.31 src/external/gpl3/binutils/dist/ld/configure.tgt:1.32 --- src/external/gpl3/binutils/dist/ld/configure.tgt:1.31 Fri Dec 28 20:43:25 2018 +++ src/external/gpl3/binutils/dist/ld/configure.tgt Thu Apr 18 10:07:24 2019 @@ -669,14 +669,16 @@ powerpc-*-beos*) targ_emul=aixppc ;; powerpc-*-windiss*) targ_emul=elf32ppcwindiss ;; powerpc-*-lynxos*) targ_emul=ppclynx ;; pru*-*-*) targ_emul=pruelf ;; -riscv32*-*-linux*) targ_emul=elf32lriscv +riscv32*-*-linux* | riscv-*-netbsd* | riscv32*-*-netbsd*) + targ_emul=elf32lriscv targ_extra_emuls="elf32lriscv_ilp32f elf32lriscv_ilp32 elf64lriscv elf64lriscv_lp64f elf64lriscv_lp64" targ_extra_libpath=$targ_extra_emuls ;; riscv-*-* | riscv32*-*-*) targ_emul=elf32lriscv targ_extra_emuls="elf64lriscv" targ_extra_libpath=$targ_extra_emuls ;; -riscv64*-*-linux*) targ_emul=elf64lriscv +riscv64*-*-linux* | riscv64*-*-netbsd*) + targ_emul=elf64lriscv targ_extra_emuls="elf64lriscv_lp64f elf64lriscv_lp64 elf32lriscv elf32lriscv_ilp32f elf32lriscv_ilp32" targ_extra_libpath=$targ_extra_emuls ;; riscv64*-*-*) targ_emul=elf64lriscv Index: src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh:1.4 src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh:1.5 --- src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh:1.4 Wed Nov 7 01:13:55 2018 +++ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv.sh Thu Apr 18 10:07:24 2019 @@ -12,4 +12,13 @@ case "$target" in LIBPATH_SUFFIX="/ilp32d" ;; esac ;; + # NetBSD puts IPL32 libraries in rv32 subdirectory. + # XXX d vs f vs "" + riscv64-*-netbsd*) +case "$EMULATION_NAME" in + *32*) + LIB_PATH='=/usr/lib/rv32' + ;; +esac +;; esac Index: src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32.sh diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32.sh:1.1.1.1 src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32.sh:1.2 --- src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32.sh:1.1.1.1 Tue Nov 6 21:19:03 2018 +++ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32.sh Thu Apr 18 10:07:24 2019 @@ -11,4 +11,13 @@ case "$target" in LIBPATH_SUFFIX="/ilp32" ;; esac ;; + # NetBSD puts IPL32 libraries in rv32 subdirectory. + # XXX d vs f vs "" + riscv64-*-netbsd*) +case "$EMULATION_NAME" in + *32*) + LIB_PATH='=/usr/lib/rv32' + ;; +esac +;; esac Index: src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32f.sh diff -u src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32f.sh:1.1.1.1 src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32f.sh:1.2 --- src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32f.sh:1.1.1.1 Tue Nov 6 21:19:03 2018 +++ src/external/gpl3/binutils/dist/ld/emulparams/elf32lriscv_ilp32f.sh Thu Apr 18 10:07:24 2019 @@ -11,4 +11,13 @@ case "$target" in LIBPATH_SUFFIX="/ilp32f" ;; esac ;; + # NetBSD puts IPL32 libraries in rv32 subdirectory. + # XXX d vs f vs "" + riscv64-*-netbsd*) +case "$EMULATION_NAME" in + *32*) + LIB_PATH='=/usr/lib/rv32' + ;; +esac +;; esac Index: src/external/gpl3/binutils/usr.bin/ld/Makefile diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.30 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.31 ---
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Thu Apr 18 10:06:19 UTC 2019
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/riscv: netbsd.h t-netbsd64
src/external/gpl3/gcc/usr.bin/gcc/arch/riscv64: multilib.h
Log Message:
- undef STARTFILE_PREFIX_SPEC, it is wrong for netbsd
- make LINK_SPEC more like other multi-line string defines
- update multilib stuff for GCC 7 riscv -- -m32/-m64 gone, -mabi and
-march now decide between several options
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/riscv/t-netbsd64
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/usr.bin/gcc/arch/riscv64/multilib.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/gcc/dist/gcc/config/riscv/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.11 src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.12
--- src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h:1.11 Wed Apr 17 10:07:00 2019
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/netbsd.h Thu Apr 18 10:06:19 2019
@@ -48,6 +48,8 @@ Boston, MA 02111-1307, USA. */
#define EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
+#undef STARTFILE_PREFIX_SPEC
+
#define LD_EMUL_SUFFIX \
"%{mabi=lp64d:}" \
"%{mabi=lp64f:_lp64f}" \
@@ -57,13 +59,14 @@ Boston, MA 02111-1307, USA. */
"%{mabi=ilp32:_ilp32}"
#undef LINK_SPEC
-#define LINK_SPEC "\
--melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX " \
-%(netbsd_link_spec)"
+#define LINK_SPEC \
+ "-melf" XLEN_SPEC "lriscv" LD_EMUL_SUFFIX \
+ "%(netbsd_link_spec)"
#undef NETBSD_ENTRY_POINT
#define NETBSD_ENTRY_POINT "_start"
+/* Override netbsd-stdint.h uintptr_t and inptr_t. */
#undef UINTPTR_TYPE
#define UINTPTR_TYPE "long unsigned int"
Index: src/external/gpl3/gcc/dist/gcc/config/riscv/t-netbsd64
diff -u src/external/gpl3/gcc/dist/gcc/config/riscv/t-netbsd64:1.1 src/external/gpl3/gcc/dist/gcc/config/riscv/t-netbsd64:1.2
--- src/external/gpl3/gcc/dist/gcc/config/riscv/t-netbsd64:1.1 Fri Sep 19 17:20:29 2014
+++ src/external/gpl3/gcc/dist/gcc/config/riscv/t-netbsd64 Thu Apr 18 10:06:19 2019
@@ -1,21 +1,3 @@
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is part of GCC.
-#
-# GCC is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# GCC is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GCC; see the file COPYING3. If not see
-#
CVS commit: src/sys/rump/kern/lib/libsysproxy
Module Name:src Committed By: ozaki-r Date: Thu Apr 18 08:31:44 UTC 2019 Modified Files: src/sys/rump/kern/lib/libsysproxy: sysproxy.c Log Message: rump: add missing sanity checks at the end of syscalls To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/rump/kern/lib/libsysproxy/sysproxy.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/rump/kern/lib/libsysproxy/sysproxy.c diff -u src/sys/rump/kern/lib/libsysproxy/sysproxy.c:1.4 src/sys/rump/kern/lib/libsysproxy/sysproxy.c:1.5 --- src/sys/rump/kern/lib/libsysproxy/sysproxy.c:1.4 Tue Jan 26 23:12:17 2016 +++ src/sys/rump/kern/lib/libsysproxy/sysproxy.c Thu Apr 18 08:31:44 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sysproxy.c,v 1.4 2016/01/26 23:12:17 pooka Exp $ */ +/* $NetBSD: sysproxy.c,v 1.5 2019/04/18 08:31:44 ozaki-r Exp $ */ /* * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sysproxy.c,v 1.4 2016/01/26 23:12:17 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sysproxy.c,v 1.5 2019/04/18 08:31:44 ozaki-r Exp $"); #include #include @@ -35,6 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysproxy.c,v #include #include #include +#include #define _RUMP_SYSPROXY #include @@ -73,6 +74,10 @@ hyp_syscall(int num, void *arg, long *re retval[0] = regrv[0]; retval[1] = regrv[1]; + /* Sanity checks (from mi_userret) */ + LOCKDEBUG_BARRIER(NULL, 0); + KASSERT(l->l_nopreempt == 0); + return rv; }
CVS commit: src/tests/net/route
Module Name:src
Committed By: ozaki-r
Date: Thu Apr 18 07:56:54 UTC 2019
Modified Files:
src/tests/net/route: t_change.sh
Log Message:
tests: dump kernel stats on cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/net/route/t_change.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/route/t_change.sh
diff -u src/tests/net/route/t_change.sh:1.12 src/tests/net/route/t_change.sh:1.13
--- src/tests/net/route/t_change.sh:1.12 Mon Dec 18 04:11:46 2017
+++ src/tests/net/route/t_change.sh Thu Apr 18 07:56:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_change.sh,v 1.12 2017/12/18 04:11:46 ozaki-r Exp $
+# $NetBSD: t_change.sh,v 1.13 2019/04/18 07:56:54 ozaki-r Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,6 +32,14 @@ export RUMP_SERVER=unix://commsock
DEBUG=${DEBUG:-false}
+route_cleanup_common()
+{
+
+ $DEBUG && dump_kernel_stats unix://commsock
+ $DEBUG && extract_rump_server_core
+ env RUMP_SERVER=unix://commsock rump.halt
+}
+
atf_test_case route_change_reject2blackhole cleanup
route_change_reject2blackhole_head()
{
@@ -58,7 +66,7 @@ route_change_reject2blackhole_body()
route_change_reject2blackhole_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_test_case route_change_gateway cleanup
@@ -91,7 +99,7 @@ route_change_gateway_body()
route_change_gateway_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_test_case route_change_ifa cleanup
@@ -156,7 +164,7 @@ destination: 192.168.0.0
route_change_ifa_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_test_case route_change_ifp cleanup
@@ -223,7 +231,7 @@ destination: 192.168.0.0
route_change_ifp_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_test_case route_change_ifp_ifa cleanup
@@ -290,7 +298,7 @@ destination: 192.168.0.0
route_change_ifp_ifa_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_test_case route_change_flags cleanup
@@ -326,7 +334,7 @@ route_change_flags_body()
route_change_flags_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_test_case route_change_default_flags cleanup
@@ -361,7 +369,7 @@ route_change_default_flags_body()
route_change_default_flags_cleanup()
{
- env RUMP_SERVER=unix://commsock rump.halt
+ route_cleanup_common
}
atf_init_test_cases()
CVS commit: src/tests/net
Module Name:src
Committed By: ozaki-r
Date: Thu Apr 18 07:56:05 UTC 2019
Modified Files:
src/tests/net: net_common.sh
Log Message:
tests: make utility funtions easy to use for tests that don't use the framework
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/tests/net/net_common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/net_common.sh
diff -u src/tests/net/net_common.sh:1.29 src/tests/net/net_common.sh:1.30
--- src/tests/net/net_common.sh:1.29 Thu Jan 17 02:49:11 2019
+++ src/tests/net/net_common.sh Thu Apr 18 07:56:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: net_common.sh,v 1.29 2019/01/17 02:49:11 knakahara Exp $
+# $NetBSD: net_common.sh,v 1.30 2019/04/18 07:56:04 ozaki-r Exp $
#
# Copyright (c) 2016 Internet Initiative Japan Inc.
# All rights reserved.
@@ -384,29 +384,42 @@ rump_server_halt_servers()
return 0
}
+extract_rump_server_core()
+{
+
+ if [ -f rump_server.core ]; then
+ gdb -ex bt /usr/bin/rump_server rump_server.core
+ strings rump_server.core |grep panic
+ fi
+}
+
+dump_kernel_stats()
+{
+ local sock=$1
+
+ echo "### Dumping $sock"
+ export RUMP_SERVER=$sock
+ rump.ifconfig -av
+ rump.netstat -nr
+ # XXX still need hijacking
+ $HIJACKING rump.netstat -nai
+ rump.arp -na
+ rump.ndp -na
+ $HIJACKING ifmcstat
+ $HIJACKING dmesg
+}
+
rump_server_dump_servers()
{
local backup=$RUMP_SERVER
$DEBUG && cat $_rump_server_socks
for sock in $(cat $_rump_server_socks); do
- echo "### Dumping $sock"
- export RUMP_SERVER=$sock
- rump.ifconfig -av
- rump.netstat -nr
- # XXX still need hijacking
- $HIJACKING rump.netstat -nai
- rump.arp -na
- rump.ndp -na
- $HIJACKING ifmcstat
- $HIJACKING dmesg
+ dump_kernel_stats $sock
done
export RUMP_SERVER=$backup
- if [ -f rump_server.core ]; then
- gdb -ex bt /usr/bin/rump_server rump_server.core
- strings rump_server.core |grep panic
- fi
+ extract_rump_server_core
return 0
}
CVS commit: src/external/gpl3/gcc/dist/gcc/config/riscv
Module Name:src Committed By: mrg Date: Thu Apr 18 06:32:21 UTC 2019 Removed Files: src/external/gpl3/gcc/dist/gcc/config/riscv: riscv-opc.h t-elf t-linux64 Log Message: delete files no longer present in GCC 7 port of riscv. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 \ src/external/gpl3/gcc/dist/gcc/config/riscv/riscv-opc.h cvs rdiff -u -r1.2 -r0 src/external/gpl3/gcc/dist/gcc/config/riscv/t-elf \ src/external/gpl3/gcc/dist/gcc/config/riscv/t-linux64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
