CVS commit: [nick-nhusb] src/sys/dev/ic

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Jun 16 05:33:24 UTC 2016

Modified Files:
src/sys/dev/ic [nick-nhusb]: dwc_gmac.c

Log Message:
Fix indent botch that crept in


To generate a diff of this commit:
cvs rdiff -u -r1.28.2.6 -r1.28.2.7 src/sys/dev/ic/dwc_gmac.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.28.2.6 src/sys/dev/ic/dwc_gmac.c:1.28.2.7
--- src/sys/dev/ic/dwc_gmac.c:1.28.2.6	Sun Jun 12 08:35:47 2016
+++ src/sys/dev/ic/dwc_gmac.c	Thu Jun 16 05:33:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.28.2.6 2016/06/12 08:35:47 skrll Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.28.2.7 2016/06/16 05:33:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.28.2.6 2016/06/12 08:35:47 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.28.2.7 2016/06/16 05:33:24 skrll Exp $");
 
 /* #define	DWC_GMAC_DEBUG	1 */
 
@@ -1175,7 +1175,7 @@ dwc_gmac_rx_intr(struct dwc_gmac_softc *
 		error = bus_dmamap_load(sc->sc_dmat, data->rd_map,
 		mtod(mnew, void*), MCLBYTES, NULL,
 		BUS_DMA_READ | BUS_DMA_NOWAIT);
-		if (error != 0) {
+		if (error != 0) {
 			m_freem(mnew);
 			/* try to reload old mbuf */
 			error = bus_dmamap_load(sc->sc_dmat, data->rd_map,

CVS commit: src/distrib/sets/lists/tests

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu Jun 16 04:03:37 UTC 2016

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
Add input/output files for new test case - fix build


To generate a diff of this commit:
cvs rdiff -u -r1.674 -r1.675 src/distrib/sets/lists/tests/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.674 src/distrib/sets/lists/tests/mi:1.675
--- src/distrib/sets/lists/tests/mi:1.674	Thu Apr 21 05:10:15 2016
+++ src/distrib/sets/lists/tests/mi	Thu Jun 16 04:03:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.674 2016/04/21 05:10:15 ozaki-r Exp $
+# $NetBSD: mi,v 1.675 2016/06/16 04:03:37 pgoyette Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -811,6 +811,8 @@
 ./usr/tests/bin/cat/Kyuafile		tests-bin-tests		compattestfile,atf,kyua
 ./usr/tests/bin/cat/d_align.in		tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/cat/d_align.out		tests-bin-tests		compattestfile,atf
+./usr/tests/bin/cat/d_se_output.in	tests-bin-tests		compattestfile,atf
+./usr/tests/bin/cat/d_se_output.out	tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/cat/t_cat		tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/cp			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/cp/Atffile		tests-bin-tests		compattestfile,atf

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jun 16 03:03:33 UTC 2016

Modified Files:
src/sys/net: if.c if_ethersubr.c if_llatbl.c
src/sys/net/npf: npf_ext_log.c
src/sys/netinet6: mld6.c

Log Message:
Use if_get_byindex instead of if_byindex for MP-safe


To generate a diff of this commit:
cvs rdiff -u -r1.339 -r1.340 src/sys/net/if.c
cvs rdiff -u -r1.222 -r1.223 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/net/if_llatbl.c
cvs rdiff -u -r1.8 -r1.9 src/sys/net/npf/npf_ext_log.c
cvs rdiff -u -r1.66 -r1.67 src/sys/netinet6/mld6.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/net/if.c
diff -u src/sys/net/if.c:1.339 src/sys/net/if.c:1.340
--- src/sys/net/if.c:1.339	Thu Jun 16 02:38:40 2016
+++ src/sys/net/if.c	Thu Jun 16 03:03:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.339 2016/06/16 02:38:40 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.340 2016/06/16 03:03:33 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.339 2016/06/16 02:38:40 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.340 2016/06/16 03:03:33 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -3097,28 +3097,38 @@ if_sdl_sysctl(SYSCTLFN_ARGS)
 {
 	struct ifnet *ifp;
 	const struct sockaddr_dl *sdl;
+	struct psref psref;
+	int error = 0;
+	int bound;
 
 	if (namelen != 1)
 		return EINVAL;
 
-	ifp = if_byindex(name[0]);
-	if (ifp == NULL)
-		return ENODEV;
+	bound = curlwp_bind();
+	ifp = if_get_byindex(name[0], );
+	if (ifp == NULL) {
+		error = ENODEV;
+		goto out;
+	}
 
 	sdl = ifp->if_sadl;
 	if (sdl == NULL) {
 		*oldlenp = 0;
-		return 0;
+		goto out;
 	}
 
 	if (oldp == NULL) {
 		*oldlenp = sdl->sdl_alen;
-		return 0;
+		goto out;
 	}
 
 	if (*oldlenp >= sdl->sdl_alen)
 		*oldlenp = sdl->sdl_alen;
-	return sysctl_copyout(l, >sdl_data[sdl->sdl_nlen], oldp, *oldlenp);
+	error = sysctl_copyout(l, >sdl_data[sdl->sdl_nlen], oldp, *oldlenp);
+out:
+	if_put(ifp, );
+	curlwp_bindx(bound);
+	return error;
 }
 
 SYSCTL_SETUP(sysctl_net_sdl_setup, "sysctl net.sdl subtree setup")

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.222 src/sys/net/if_ethersubr.c:1.223
--- src/sys/net/if_ethersubr.c:1.222	Thu Apr 28 00:16:56 2016
+++ src/sys/net/if_ethersubr.c	Thu Jun 16 03:03:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.222 2016/04/28 00:16:56 ozaki-r Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.223 2016/06/16 03:03:33 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.222 2016/04/28 00:16:56 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.223 2016/06/16 03:03:33 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1475,24 +1475,31 @@ ether_multicast_sysctl(SYSCTLFN_ARGS)
 	struct ether_multi_sysctl addr;
 	struct ifnet *ifp;
 	struct ethercom *ec;
-	int error;
+	int error = 0;
 	size_t written;
+	struct psref psref;
+	int bound;
 
 	if (namelen != 1)
 		return EINVAL;
 
-	ifp = if_byindex(name[0]);
-	if (ifp == NULL)
-		return ENODEV;
+	bound = curlwp_bind();
+	ifp = if_get_byindex(name[0], );
+	if (ifp == NULL) {
+		error = ENODEV;
+		goto out;
+	}
 	if (ifp->if_type != IFT_ETHER) {
+		if_put(ifp, );
 		*oldlenp = 0;
-		return 0;
+		goto out;
 	}
 	ec = (struct ethercom *)ifp;
 
 	if (oldp == NULL) {
+		if_put(ifp, );
 		*oldlenp = ec->ec_multicnt * sizeof(addr);
-		return 0;
+		goto out;
 	}
 
 	memset(, 0, sizeof(addr));
@@ -1511,8 +1518,11 @@ ether_multicast_sysctl(SYSCTLFN_ARGS)
 		written += sizeof(addr);
 		oldp = (char *)oldp + sizeof(addr);
 	}
+	if_put(ifp, );
 
 	*oldlenp = written;
+out:
+	curlwp_bindx(bound);
 	return error;
 }
 

Index: src/sys/net/if_llatbl.c
diff -u src/sys/net/if_llatbl.c:1.13 src/sys/net/if_llatbl.c:1.14
--- src/sys/net/if_llatbl.c:1.13	Wed Apr  6 08:45:46 2016
+++ src/sys/net/if_llatbl.c	Thu Jun 16 03:03:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_llatbl.c,v 1.13 2016/04/06 08:45:46 ozaki-r Exp $	*/
+/*	$NetBSD: if_llatbl.c,v 1.14 2016/06/16 03:03:33 ozaki-r Exp $	*/
 /*
  * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
  * Copyright (c) 2004-2008 Qing Li. All rights reserved.
@@ -592,14 +592,18 @@ lla_rt_output(const u_char rtm_type, con
 	struct llentry *lle;
 	u_int laflags;
 	int error;
+	struct psref psref;
+	int bound;
 
 	KASSERTMSG(dl != NULL && dl->sdl_family == AF_LINK, "invalid dl");
 
+	bound = curlwp_bind();
 	if (sdl_index != 0)
-		ifp = if_byindex(sdl_index);
+		ifp = if_get_byindex(sdl_index, );
 	else
-		ifp = if_byindex(dl->sdl_index);
+		ifp = if_get_byindex(dl->sdl_index, );
 	if (ifp == NULL) {
+		curlwp_bindx(bound);
 		log(LOG_INFO, "%s: invalid ifp (sdl_index %d)\n",
 		__func__, sdl_index != 0 ? sdl_index : 

CVS commit: src/sys/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jun 16 02:54:41 UTC 2016

Modified Files:
src/sys/sys: param.h

Log Message:
Bump kernel version for mbuf (pkthdr#rcvif) change


To generate a diff of this commit:
cvs rdiff -u -r1.496 -r1.497 src/sys/sys/param.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/sys/param.h
diff -u src/sys/sys/param.h:1.496 src/sys/sys/param.h:1.497
--- src/sys/sys/param.h:1.496	Sun May 29 18:22:30 2016
+++ src/sys/sys/param.h	Thu Jun 16 02:54:41 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.496 2016/05/29 18:22:30 alnsn Exp $	*/
+/*	$NetBSD: param.h,v 1.497 2016/06/16 02:54:41 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	799003000	/* NetBSD 7.99.30 */
+#define	__NetBSD_Version__	799003100	/* NetBSD 7.99.31 */
 
 #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
 (m) * 100) + (p) * 100) <= __NetBSD_Version__)

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jun 16 02:38:40 UTC 2016

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
src/sys/dist/pf/net: pf_if.c
src/sys/kern: uipc_mbuf.c
src/sys/net: if.c rtsock.c
src/sys/netinet: ip_carp.c
src/sys/netinet6: raw_ip6.c
src/sys/rump/net/lib/libshmif: if_shmem.c
src/sys/rump/net/lib/libvirtif: if_virt.c

Log Message:
Use curlwp_bind and curlwp_bindx instead of open-coding LP_BOUND


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/compat/common/uipc_syscalls_40.c
cvs rdiff -u -r1.128 -r1.129 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/linux32/common/linux32_socket.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dist/pf/net/pf_if.c
cvs rdiff -u -r1.167 -r1.168 src/sys/kern/uipc_mbuf.c
cvs rdiff -u -r1.338 -r1.339 src/sys/net/if.c
cvs rdiff -u -r1.189 -r1.190 src/sys/net/rtsock.c
cvs rdiff -u -r1.67 -r1.68 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.144 -r1.145 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.67 -r1.68 src/sys/rump/net/lib/libshmif/if_shmem.c
cvs rdiff -u -r1.52 -r1.53 src/sys/rump/net/lib/libvirtif/if_virt.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.9 src/sys/compat/common/uipc_syscalls_40.c:1.10
--- src/sys/compat/common/uipc_syscalls_40.c:1.9	Thu May 12 02:24:16 2016
+++ src/sys/compat/common/uipc_syscalls_40.c	Thu Jun 16 02:38:40 2016
@@ -1,9 +1,9 @@
-/*	$NetBSD: uipc_syscalls_40.c,v 1.9 2016/05/12 02:24:16 ozaki-r Exp $	*/
+/*	$NetBSD: uipc_syscalls_40.c,v 1.10 2016/06/16 02:38:40 ozaki-r Exp $	*/
 
 /* written by Pavel Cahyna, 2006. Public domain. */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.9 2016/05/12 02:24:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_40.c,v 1.10 2016/06/16 02:38:40 ozaki-r Exp $");
 
 /*
  * System call interface to the socket abstraction.
@@ -40,7 +40,7 @@ compat_ifconf(u_long cmd, void *data)
 	const int sz = (int)sizeof(ifr);
 	const bool docopy = ifc->ifc_req != NULL;
 	int s;
-	int bound = curlwp->l_pflag & LP_BOUND;
+	int bound;
 	struct psref psref;
 
 	if (docopy) {
@@ -48,7 +48,7 @@ compat_ifconf(u_long cmd, void *data)
 		ifrp = ifc->ifc_req;
 	}
 
-	curlwp->l_pflag |= LP_BOUND;
+	bound = curlwp_bind();
 	s = pserialize_read_enter();
 	IFNET_READER_FOREACH(ifp) {
 		psref_acquire(, >if_psref, ifnet_psref_class);
@@ -121,7 +121,7 @@ compat_ifconf(u_long cmd, void *data)
 		psref_release(, >if_psref, ifnet_psref_class);
 	}
 	pserialize_read_exit(s);
-	curlwp->l_pflag ^= bound ^ LP_BOUND;
+	curlwp_bindx(bound);
 
 	if (docopy)
 		ifc->ifc_len -= space;
@@ -131,7 +131,7 @@ compat_ifconf(u_long cmd, void *data)
 
 release_exit:
 	psref_release(, >if_psref, ifnet_psref_class);
-	curlwp->l_pflag ^= bound ^ LP_BOUND;
+	curlwp_bindx(bound);
 	return error;
 }
 #endif

Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.128 src/sys/compat/linux/common/linux_socket.c:1.129
--- src/sys/compat/linux/common/linux_socket.c:1.128	Wed Jun 15 06:01:21 2016
+++ src/sys/compat/linux/common/linux_socket.c	Thu Jun 16 02:38:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_socket.c,v 1.128 2016/06/15 06:01:21 ozaki-r Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.129 2016/06/16 02:38:40 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.128 2016/06/15 06:01:21 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.129 2016/06/16 02:38:40 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1124,7 +1124,7 @@ linux_getifconf(struct lwp *l, register_
 	const int sz = (int)sizeof(ifr);
 	bool docopy;
 	int s;
-	int bound = curlwp->l_pflag & LP_BOUND;
+	int bound;
 	struct psref psref;
 
 	error = copyin(data, , sizeof(ifc));
@@ -1137,7 +1137,7 @@ linux_getifconf(struct lwp *l, register_
 		ifrp = ifc.ifc_req;
 	}
 
-	curlwp->l_pflag |= LP_BOUND;
+	bound = curlwp_bind();
 	s = pserialize_read_enter();
 	IFNET_READER_FOREACH(ifp) {
 		psref_acquire(, >if_psref, ifnet_psref_class);
@@ -1172,7 +1172,7 @@ linux_getifconf(struct lwp *l, register_
 		psref_release(, >if_psref, ifnet_psref_class);
 	}
 	pserialize_read_exit(s);
-	curlwp->l_pflag ^= bound ^ LP_BOUND;
+	curlwp_bindx(bound);
 
 	if (docopy)
 		ifc.ifc_len -= space;
@@ -1183,7 +1183,7 @@ linux_getifconf(struct lwp *l, register_
 
 release_exit:
 	psref_release(, >if_psref, ifnet_psref_class);
-	curlwp->l_pflag ^= bound ^ LP_BOUND;
+	curlwp_bindx(bound);
 	return error;
 }
 

Index: src/sys/compat/linux32/common/linux32_socket.c
diff -u 

CVS commit: src/sys/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Jun 16 02:34:33 UTC 2016

Modified Files:
src/sys/sys: lwp.h

Log Message:
Introduce curlwp_bind and curlwp_bindx

The API prevents the current LWP from migrating between CPUs during
the critical section (between curlwp_bind and curlwp_bindx). One use
case of it is psref(9) that has a contract that forbids such migrations.

Proposed at http://mail-index.netbsd.org/tech-kern/2016/06/13/msg020710.html
(check it out if you want to know why the function names are chosen)


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/sys/sys/lwp.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/sys/lwp.h
diff -u src/sys/sys/lwp.h:1.170 src/sys/sys/lwp.h:1.171
--- src/sys/sys/lwp.h:1.170	Tue Mar 31 01:10:02 2015
+++ src/sys/sys/lwp.h	Thu Jun 16 02:34:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lwp.h,v 1.170 2015/03/31 01:10:02 matt Exp $	*/
+/*	$NetBSD: lwp.h,v 1.171 2016/06/16 02:34:33 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010
@@ -521,6 +521,28 @@ KPREEMPT_ENABLE(lwp_t *l)
 #define	DOPREEMPT_ACTIVE	0x01
 #define	DOPREEMPT_COUNTED	0x02
 
+/*
+ * Prevent curlwp from migrating between CPUs beteen curlwp_bind and
+ * curlwp_bindx. One use case is psref(9) that has a contract that
+ * forbids migrations.
+ */
+static inline int
+curlwp_bind(void)
+{
+	int bound;
+
+	bound = curlwp->l_pflag & LP_BOUND;
+	curlwp->l_pflag |= LP_BOUND;
+
+	return bound;
+}
+
+static inline void
+curlwp_bindx(int bound)
+{
+	curlwp->l_pflag ^= bound ^ LP_BOUND;
+}
+
 #endif /* _KERNEL */
 
 /* Flags for _lwp_create(), as per Solaris. */

CVS commit: src/sys/arch/mips

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Thu Jun 16 01:33:35 UTC 2016

Added Files:
src/sys/arch/mips: README.models

Log Message:
Notes on MIPS models and architecture levels and their properties and
handling in NetBSD.

This is very preliminary so far, because I'm trying to get citations
from documentation for everything.

Please add stuff.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/mips/README.models

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/arch/mips/README.models
diff -u /dev/null src/sys/arch/mips/README.models:1.1
--- /dev/null	Thu Jun 16 01:33:35 2016
+++ src/sys/arch/mips/README.models	Thu Jun 16 01:33:35 2016
@@ -0,0 +1,267 @@
+# $NetBSD: README.models,v 1.1 2016/06/16 01:33:35 dholland Exp $
+
+MIPS models and architecture levels
+---
+
+Since this is a complex and confusing topic and there's a shortage of
+information (especially, a shortage of reliable information), I'm
+creating this document as a reference for people doing MIPS stuff on
+NetBSD (and elsewhere).
+
+Citations appear in []. With luck all important facts have citations.
+
+
+
+1. Architecture levels.
+
+These architecture levels exist:
+
+32-bit 64-bit
+
+MIPS-I
+MIPS-II
+   MIPS-III
+   MIPS-IV
+   MIPS-V
+MIPS32 MIPS64
+MIPS32r2   MIPS64r2
+MIPS32r3   MIPS64r3
+MIPS32r4   MIPS64r4
+MIPS32r5   MIPS64r5
+MIPS32r6   MIPS64r6
+
+Note that while MIPS32 is a 32-bit subset of MIPS64, each
+corresponding pair of MIPS32rN and MIPS64rN are comparable in age and
+properties. Later revisions (further down the list) are mostly subsets
+of earlier revisions, although some exceptions exist.
+
+
+
+2. CPU models.
+
+For vintage MIPS these are the standard models as of fall 1996 [idt96
+A-198] and the corresponding architecture levels. (There were many
+additional models put out by licensees or by the MIPS company itself,
+which have model numbers with fewer zeros.)
+
+	R2000		MIPS-I (32-bit)		[idt96 1-5]
+	R3000		MIPS-I (32-bit)		[idt96 1-5]
+	R4000		MIPS-III (64-bit)	[idt96 A-197]
+	R4200		MIPS-III (64-bit)	[idt96 A-197]
+	R4300		MIPS-III (64-bit)	[idt96 A-197]
+	R4400		MIPS-III (64-bit)	[idt96 A-197]
+	R4600		MIPS-III (64-bit)	[idt96 A-197]
+	R5000		MIPS-IV (64-bit)	[idt96 1-5]
+	R6000		MIPS-II ??
+	R8000		MIPS-IV (64-bit)	[idt96 1-5]
+	R1		MIPS-IV (64-bit)	[idt96 1-5]
+
+For later models than this I currently have no information.
+
+
+
+3. CPU models present in various systems.
+
+These are the CPU models found in various systems NetBSD does and
+doesn't support. This table also notes endianness; MIPS chips are
+bi-endian but are wired up one way or the other on motherboards.
+
+   algor (little-endian [buildsh])
+	Algorithmics P-4000i			??
+	Algorithmics P-4032			??
+	Algorithmics P-5064			??
+	Algorithmics P-6032			??
+   arc (little-endian [buildsh])
+	Acer PICA??
+	MIPS Magnum 4000			??
+	NEC Image RISCstation			??
+	NEC Express RISCserver			??
+	NEC RISCserver 2200			??
+	NEC RISCstation 2200			??
+	NEC RISCstation 2250			??
+	NEC Express5800/230 R4400 PCI		presumably R4400 (MIPS-III)
+	NEC Express5800/240 R4400 EISA		presumably R4400 (MIPS-III)
+	DeskStation Tyne			??
+   cobalt (little-endian [buildsh])
+	Qube ... ????
+	RaQ ... ????
+   emips (big-endian [buildsh])
+	... ??	??
+	(see http://research.microsoft.com/en-us/projects/emips/ )
+   evbmips
+	... ??	?? (various-endian)
+   ews4800mips (big-endian [buildsh])
+	EWS4800/350??
+	EWS4800/350F??
+	EWS4800/360AD??
+	EWS4800/360ADII??
+	EWS4800/360SX??
+	EWS4800/360EX??
+	EWS4800/360??
+	... ??	??
+   hpcmips (big-endian [buildsh])
+	see http://wiki.netbsd.org/ports/hpcmips/processor_comparison/
+   mipsco (big-endian [buildsh])
+	Mips Magnum 3000 Workstation		??
+	Mips 3230 Server			??
+	Bull DPX/Prostation M-20		??
+   newsmips (big-endian [buildsh])
+	NWS-3470DR3000 (MIPS-I) [portpage]
+	NWS-3410R3000 (MIPS-I) [portpage]
+	NWS-3460R3000 (MIPS-I) [portpage]
+	NWS-3710R3000 (MIPS-I) [portpage]
+	NWS-3720R3000 (MIPS-I) [portpage]
+	NWS-3800 series??
+	NWS-4000 seriesR4600 (MIPS-III) [portpage]
+	NWS-5000R4[04]00 (MIPS-III) [portpage]
+   playstation2 (little-endian [buildsh])
+	playstation2??
+   pmax (little-endian [buildsh])
+	DECstation/system 2100 and 3100		R2000 (MIPS-I) [portpage]
+	DECsystem 5100R3000 (MIPS-I) [portpage]
+	Personal DECstation 5000/20, /25, /33	R3000 (MIPS-I) [portpage]
+	Personal DECstation 5000/50		R4000 (MIPS-III) [portpage]
+	DECstation/system 5000/120, /125, /133	R3000 

CVS commit: src/tests/bin/cat

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Jun 16 01:04:58 UTC 2016

Modified Files:
src/tests/bin/cat: Makefile t_cat.sh
Added Files:
src/tests/bin/cat: d_se_output.in d_se_output.out

Log Message:
Add a unit test for PR bin/51250 called se_output. se_output checks the output 
of cat
when invoked with '-se', to ensure that a '$' is printed on blank lines.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/cat/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/cat/d_se_output.in \
src/tests/bin/cat/d_se_output.out
cvs rdiff -u -r1.2 -r1.3 src/tests/bin/cat/t_cat.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/bin/cat/Makefile
diff -u src/tests/bin/cat/Makefile:1.1 src/tests/bin/cat/Makefile:1.2
--- src/tests/bin/cat/Makefile:1.1	Tue Mar 27 08:16:33 2012
+++ src/tests/bin/cat/Makefile	Thu Jun 16 01:04:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/27 08:16:33 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/16 01:04:58 sevan Exp $
 
 .include 
 
@@ -8,5 +8,7 @@ TESTS_SH=	t_cat
 FILESDIR=	${TESTSDIR}
 FILES+=		d_align.in
 FILES+=		d_align.out
+FILES+= 	d_se_output.in
+FILES+= 	d_se_output.out
 
 .include 

Index: src/tests/bin/cat/t_cat.sh
diff -u src/tests/bin/cat/t_cat.sh:1.2 src/tests/bin/cat/t_cat.sh:1.3
--- src/tests/bin/cat/t_cat.sh:1.2	Tue Mar 27 17:57:02 2012
+++ src/tests/bin/cat/t_cat.sh	Thu Jun 16 01:04:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_cat.sh,v 1.2 2012/03/27 17:57:02 jruoho Exp $
+# $NetBSD: t_cat.sh,v 1.3 2016/06/16 01:04:58 sevan Exp $
 #
 # Copyright (c) 2012 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -52,8 +52,20 @@ nonexistent_body() {
 		-x "cat /some/name/that/does/not/exist"
 }
 
+atf_test_case se_output
+se_output_head() {
+	atf_set "descr" "Test that cat(1) prints a $ sign " \
+			"on blank lines with options '-se' (PR bin/51250)"
+}
+
+se_output_body() {
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \
+		-x "cat -se $(atf_get_srcdir)/d_se_output.in"
+}
+
 atf_init_test_cases()
 {
 	atf_add_test_case align
 	atf_add_test_case nonexistent
+	atf_add_test_case se_output
 }

Added files:

Index: src/tests/bin/cat/d_se_output.in
diff -u /dev/null src/tests/bin/cat/d_se_output.in:1.1
--- /dev/null	Thu Jun 16 01:04:58 2016
+++ src/tests/bin/cat/d_se_output.in	Thu Jun 16 01:04:58 2016
@@ -0,0 +1,3 @@
+
+Of course it runs NetBSD
+
Index: src/tests/bin/cat/d_se_output.out
diff -u /dev/null src/tests/bin/cat/d_se_output.out:1.1
--- /dev/null	Thu Jun 16 01:04:58 2016
+++ src/tests/bin/cat/d_se_output.out	Thu Jun 16 01:04:58 2016
@@ -0,0 +1,3 @@
+$
+Of course it runs NetBSD$
+$

CVS commit: src/bin/cat

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Jun 16 00:52:37 UTC 2016

Modified Files:
src/bin/cat: cat.c

Log Message:
When invoked with -se, print a '$' on blank lines
Obtained from OpenBSD r1.13 of src/bin/cat/cat.c

Closes PR bin/51250
Reviewed by Christos@


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/bin/cat/cat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/cat/cat.c
diff -u src/bin/cat/cat.c:1.56 src/bin/cat/cat.c:1.57
--- src/bin/cat/cat.c:1.56	Thu Jun 16 00:45:37 2016
+++ src/bin/cat/cat.c	Thu Jun 16 00:52:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cat.c,v 1.56 2016/06/16 00:45:37 sevan Exp $	*/
+/* $NetBSD: cat.c,v 1.57 2016/06/16 00:52:37 sevan Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: cat.c,v 1.56 2016/06/16 00:45:37 sevan Exp $");
+__RCSID("$NetBSD: cat.c,v 1.57 2016/06/16 00:52:37 sevan Exp $");
 #endif
 #endif /* not lint */
 
@@ -175,18 +175,16 @@ cook_buf(FILE *fp)
 	line = gobble = 0;
 	for (prev = '\n'; (ch = getc(fp)) != EOF; prev = ch) {
 		if (prev == '\n') {
-			if (ch == '\n') {
-if (sflag) {
-	if (!gobble && nflag && !bflag)
-		(void)fprintf(stdout,
-			"%6d\t\n", ++line);
-	else if (!gobble && putchar(ch) == EOF)
-		break;
+			if (sflag) {
+if (ch == '\n') {
+	if (gobble)
+		continue;
 	gobble = 1;
-	continue;
+} else
+	gobble = 0;
 }
 if (nflag) {
-	if (!bflag) {
+	if (!bflag || ch != '\n') {
 		(void)fprintf(stdout,
 		"%6d\t", ++line);
 		if (ferror(stdout))
@@ -198,13 +196,7 @@ cook_buf(FILE *fp)
 			break;
 	}
 }
-			} else if (nflag) {
-(void)fprintf(stdout, "%6d\t", ++line);
-if (ferror(stdout))
-	break;
 			}
-		}
-		gobble = 0;
 		if (ch == '\n') {
 			if (eflag)
 if (putchar('$') == EOF)

CVS commit: src/bin/cat

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Thu Jun 16 00:45:37 UTC 2016

Modified Files:
src/bin/cat: cat.c

Log Message:
Revert previous change made by me in r1.55


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/bin/cat/cat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/cat/cat.c
diff -u src/bin/cat/cat.c:1.55 src/bin/cat/cat.c:1.56
--- src/bin/cat/cat.c:1.55	Sat Jul 25 16:17:01 2015
+++ src/bin/cat/cat.c	Thu Jun 16 00:45:37 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cat.c,v 1.55 2015/07/25 16:17:01 sevan Exp $	*/
+/* $NetBSD: cat.c,v 1.56 2016/06/16 00:45:37 sevan Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -44,7 +44,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #else
-__RCSID("$NetBSD: cat.c,v 1.55 2015/07/25 16:17:01 sevan Exp $");
+__RCSID("$NetBSD: cat.c,v 1.56 2016/06/16 00:45:37 sevan Exp $");
 #endif
 #endif /* not lint */
 
@@ -113,6 +113,7 @@ main(int argc, char *argv[])
 			vflag = 1;
 			break;
 		default:
+		case '?':
 			(void)fprintf(stderr,
 			"Usage: %s [-beflnstuv] [-B bsize] [-] "
 			"[file ...]\n", getprogname());

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Jun 15 20:34:28 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: main.c verify.h

Log Message:
Update netpgpverify to 20160617

Sync with changes in pkgsrc

+ don't assume a string is NUL-terminated - use fwrite(3) with a specific size


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h

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/netpgp/dist/src/netpgpverify/main.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.6 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.7
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.6	Fri Jan 30 18:58:59 2015
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c	Wed Jun 15 20:34:28 2016
@@ -49,10 +49,11 @@ ptime(int64_t secs)
 static void
 pentry(pgpv_t *pgp, int n, const char *modifiers)
 {
+	size_t	 cc;
 	char	*s;
 
-	pgpv_get_entry(pgp, (unsigned)n, , modifiers);
-	printf("%s", s);
+	cc = pgpv_get_entry(pgp, (unsigned)n, , modifiers);
+	fwrite(s, 1, cc, stdout);
 	free(s);
 }
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.8 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.9
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.8	Wed Jun 15 16:51:46 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Wed Jun 15 20:34:28 2016
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_	20160616
+#define NETPGP_VERIFY_H_	20160617
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160616"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160617"
 
 #include 
 

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Alistair G. Crooks]

Module Name:src
Committed By:   agc
Date:   Wed Jun 15 16:51:46 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile.bsd
Makefile.in verify.h
Added Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: version.asc

Log Message:
Update netpgpverify to 20160616:

+ Bring over change from pkgsrc to add version.asc signature verification
to complement the noversion.asc cleartext signatures

+ Update version to 20160616


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc

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/netpgp/dist/src/netpgpverify/Makefile.bsd
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.5 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.6
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd:1.5	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.bsd	Wed Jun 15 16:51:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bsd,v 1.5 2016/06/14 20:47:08 agc Exp $
+# $NetBSD: Makefile.bsd,v 1.6 2016/06/15 16:51:46 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,5 +43,7 @@ tst:
 	rm -f 1keytest.gpg
 	@echo "testing signing with a subkey"
 	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+	@echo "testing signatures with version"
+	./${PROG} -k pubring.gpg version.asc
 	@echo "testing signatures with no version"
 	./${PROG} -k pubring.gpg noversion.asc

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in:1.9	Tue Jun 14 20:47:08 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile.in	Wed Jun 15 16:51:46 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.9 2016/06/14 20:47:08 agc Exp $
+# $NetBSD: Makefile.in,v 1.10 2016/06/15 16:51:46 agc Exp $
 
 PROG=netpgpverify
 
@@ -43,6 +43,8 @@ tst:
 	rm -f 1keytest.gpg
 	@echo "testing signing with a subkey"
 	./chk.sh -k joyent-pubring.gpg digest-20121220.tgz
+	@echo "testing signatures with version"
+	./${PROG} -k pubring.gpg version.asc
 	@echo "testing signatures with no version"
 	./${PROG} -k pubring.gpg noversion.asc
 

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.7 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.8
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h:1.7	Wed Jun 15 03:37:50 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.h	Wed Jun 15 16:51:46 2016
@@ -23,9 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef NETPGP_VERIFY_H_
-#define NETPGP_VERIFY_H_	20160615
+#define NETPGP_VERIFY_H_	20160616
 
-#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160615"
+#define NETPGPVERIFY_VERSION	"netpgpverify portable 20160616"
 
 #include 
 

Added files:

Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc
diff -u /dev/null src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc:1.1
--- /dev/null	Wed Jun 15 16:51:46 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/version.asc	Wed Jun 15 16:51:46 2016
@@ -0,0 +1,15 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA1
+
+bar
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1
+
+iQEcBAEBAgAGBQJXYOg1AAoJEBto3PzAWWgjN7wIALbMScFoVnkE47+Hj1aLclRL
+9Mb9bKWkPi9iq1SybDEeiK6G9hLXSm2ZbygHNoAwFVlMIxkV2lRKqLfquatW9GH/
+9W2LkKa3wYpHH84Uj2/3Atu7564+IvcvDVkuxp4oHiz4X3i4CvIOf6qPuPHC5fAb
+xmjRLJRh71pJ8zBdtLQV3hnzjuUk5qZvKt109/WARQL5lL5jGIe504TnzHEBSgNa
+Ez1vxN2RngVh4QhDApx05EYfmZnBChXalCCh+noo6gpjUN/xhfq/KkLWrLaRWIL6
+IHBS3MgqDP6ToaJ7R2w1hytCoKlbXGyJGsUn29QBoQBwWGGM3Z5pbFBPcmBx/mg=
+=KXon
+-END PGP SIGNATURE-

CVS commit: src/crypto/external/bsd/netpgp/dist/src/netpgpverify

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Wed Jun 15 15:47:50 UTC 2016

Modified Files:
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c

Log Message:
Mark obuf_printf as printf-like.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.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/netpgp/dist/src/netpgpverify/libverify.c
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.9 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.10
--- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.9	Wed Jun 15 03:37:50 2016
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c	Wed Jun 15 15:47:50 2016
@@ -211,6 +211,7 @@ obuf_add_mem(obuf_t *obuf, const char *s
 }
 
 /* varargs-based printf to string */
+__printflike(2, 3)
 static bool
 obuf_printf(obuf_t *obuf, const char *fmt, ...)
 {

CVS commit: src/external/gpl3/binutils/dist/bfd

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 15 14:47:23 UTC 2016

Modified Files:
src/external/gpl3/binutils/dist/bfd: elf32-hppa.c elf32-i386.c
elf32-m68k.c elf32-sh.c elf32-vax.c elfxx-sparc.c

Log Message:
Harmonize the error messages about dynamic relocations.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/dist/bfd/elf32-hppa.c \
src/external/gpl3/binutils/dist/bfd/elf32-m68k.c \
src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/bfd/elf32-i386.c \
src/external/gpl3/binutils/dist/bfd/elf32-sh.c
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/dist/bfd/elf32-vax.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/gpl3/binutils/dist/bfd/elf32-hppa.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-hppa.c:1.7 src/external/gpl3/binutils/dist/bfd/elf32-hppa.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elf32-hppa.c:1.7	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-hppa.c	Wed Jun 15 10:47:23 2016
@@ -2185,8 +2185,8 @@ readonly_dynrelocs (struct elf_link_hash
 
   if (info->warn_shared_textrel)
 (*_bfd_error_handler)
-  (_("warning: dynamic relocation in readonly section `%s'"),
-  eh->root.root.string);
+  (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+  eh->root.root.string, sec->name);
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */
Index: src/external/gpl3/binutils/dist/bfd/elf32-m68k.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.7 src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elf32-m68k.c:1.7	Fri Apr 22 13:40:36 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-m68k.c	Wed Jun 15 10:47:23 2016
@@ -2816,8 +2816,8 @@ elf_m68k_check_relocs (bfd *abfd,
 		{
 		  if (info->warn_shared_textrel)
 		(*_bfd_error_handler)
-		  (_("warning: dynamic relocation in readonly section `%s'"),
-		  h->root.root.string); 
+		  (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+		  h->root.root.string, sec->name); 
 		  info->flags |= DF_TEXTREL;
 		}
 
@@ -3439,8 +3439,8 @@ elf_m68k_discard_copies (struct elf_link
 	  {
 		if (info->warn_shared_textrel)
 		  (*_bfd_error_handler)
-		(_("warning: dynamic relocation in readonly section `%s'"),
-		h->root.root.string); 
+		(_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+		h->root.root.string, s->name); 
 		info->flags |= DF_TEXTREL;
 		break;
 	  }
Index: src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c
diff -u src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c:1.7 src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c:1.8
--- src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c:1.7	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elfxx-sparc.c	Wed Jun 15 10:47:23 2016
@@ -2516,8 +2516,8 @@ readonly_dynrelocs (struct elf_link_hash
 
   if (info->warn_shared_textrel)
 (*_bfd_error_handler)
-  (_("warning: dynamic relocation in readonly section `%s'"),
-  h->root.root.string);
+  (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+  h->root.root.string, s->name);
 	  info->flags |= DF_TEXTREL;
 
 	  /* Not an error, just cut short the traversal.  */

Index: src/external/gpl3/binutils/dist/bfd/elf32-i386.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-i386.c:1.6 src/external/gpl3/binutils/dist/bfd/elf32-i386.c:1.7
--- src/external/gpl3/binutils/dist/bfd/elf32-i386.c:1.6	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-i386.c	Wed Jun 15 10:47:23 2016
@@ -2718,8 +2718,8 @@ elf_i386_readonly_dynrelocs (struct elf_
 	  struct bfd_link_info *info = (struct bfd_link_info *) inf;
 	  if (info->warn_shared_textrel)
 	(*_bfd_error_handler)
-	  (_("warning: dynamic relocation in readonly section `%s'"),
-	  h->root.root.string); 
+	  (_("warning: dynamic relocation to `%s' in readonly section `%s'"),
+	  h->root.root.string, s->name); 
 	  info->flags |= DF_TEXTREL;
 
 	  if ((info->warn_shared_textrel && bfd_link_pic (info))
Index: src/external/gpl3/binutils/dist/bfd/elf32-sh.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.6 src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.7
--- src/external/gpl3/binutils/dist/bfd/elf32-sh.c:1.6	Fri Jan 29 09:42:44 2016
+++ src/external/gpl3/binutils/dist/bfd/elf32-sh.c	Wed Jun 15 10:47:23 2016
@@ -3304,8 +3304,8 @@ readonly_dynrelocs (struct elf_link_hash
 
   if (info->warn_shared_textrel)
 (*_bfd_error_handler)
-  (_("warning: dynamic relocation in readonly section `%s'"),
-  h->root.root.string);
+   

CVS commit: src/sys/arch/macppc/macppc

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Wed Jun 15 14:32:03 UTC 2016

Modified Files:
src/sys/arch/macppc/macppc: pic_ohare.c

Log Message:
g/c some leftovers from when we had static assignments of edge or level
triggers


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/macppc/pic_ohare.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/macppc/macppc/pic_ohare.c
diff -u src/sys/arch/macppc/macppc/pic_ohare.c:1.12 src/sys/arch/macppc/macppc/pic_ohare.c:1.13
--- src/sys/arch/macppc/macppc/pic_ohare.c:1.12	Sun Apr 21 15:42:11 2013
+++ src/sys/arch/macppc/macppc/pic_ohare.c	Wed Jun 15 14:32:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pic_ohare.c,v 1.12 2013/04/21 15:42:11 kiyohara Exp $ */
+/*	$NetBSD: pic_ohare.c,v 1.13 2016/06/15 14:32:03 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.12 2013/04/21 15:42:11 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.13 2016/06/15 14:32:03 macallan Exp $");
 
 #include "opt_interrupt.h"
 
@@ -68,8 +68,6 @@ static inline void ohare_read_events(str
 #define INT_ENABLE_REG	((uint32_t)pic->pic_cookie + 0x24)
 #define INT_CLEAR_REG	((uint32_t)pic->pic_cookie + 0x28)
 #define INT_LEVEL_REG	((uint32_t)pic->pic_cookie + 0x2c)
-#define INT_LEVEL_MASK_OHARE	0x1ff0
-#define INT_LEVEL_MASK_GC	0x3ff0
 
 int init_ohare(void)
 {
@@ -135,12 +133,12 @@ setup_ohare(uint32_t addr, int is_gc)
 	if (is_gc) {
 	
 		strcpy(pic->pic_name, "gc");
-		ohare->level_mask = 0;
 	} else {
 
 		strcpy(pic->pic_name, "ohare");
-		ohare->level_mask = 0;
 	}
+	ohare->level_mask = 0;
+
 	for (i = 0; i < OHARE_NIRQ; i++)
 		ohare->priority_masks[i] = 0;
 	for (i = 0; i < NIPL; i++)

CVS commit: src/doc

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 14:11:15 UTC 2016

Modified Files:
src/doc: HACKS

Log Message:
Remove dumplfs from the list now that it seems strict-aliasing-safe.


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.173 src/doc/HACKS:1.174
--- src/doc/HACKS:1.173	Wed Jun 15 13:57:26 2016
+++ src/doc/HACKS	Wed Jun 15 14:11:15 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.173 2016/06/15 13:57:26 riastradh Exp $
+# $NetBSD: HACKS,v 1.174 2016/06/15 14:11:15 riastradh Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -253,7 +253,6 @@ file	usr.sbin/bootp/bootptest/Makefile :
 file	usr.sbin/chrtbl/Makefile	: 1.6
 file	usr.sbin/cron/Makefile		: 1.12
 file	usr.sbin/dhcp/Makefile.inc	: 1.20
-file	usr.sbin/dumplfs/Makefile	: 1.11
 file	usr.sbin/hprop/Makefile		: 1.13
 file	usr.sbin/installboot/Makefile	: 1.35
 file	usr.sbin/ipf/ipftest/Makefile	: 1.32

CVS commit: src/usr.sbin/dumplfs

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 14:08:24 UTC 2016

Modified Files:
src/usr.sbin/dumplfs: Makefile

Log Message:
Kill another -fno-strict-aliasing.

Generated code is same with/without.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/dumplfs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/dumplfs/Makefile
diff -u src/usr.sbin/dumplfs/Makefile:1.16 src/usr.sbin/dumplfs/Makefile:1.17
--- src/usr.sbin/dumplfs/Makefile:1.16	Sun Aug 11 03:49:24 2013
+++ src/usr.sbin/dumplfs/Makefile	Wed Jun 15 14:08:24 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2013/08/11 03:49:24 dholland Exp $
+#	$NetBSD: Makefile,v 1.17 2016/06/15 14:08:24 riastradh Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 WARNS?=	3	# XXX -Wsign-compare
@@ -10,8 +10,4 @@ SRCS=	dumplfs.c lfs_cksum.c misc.c
 .PATH:	${NETBSDSRCDIR}/sys/ufs/lfs
 MAN=	dumplfs.8
 
-.if defined(HAVE_LLVM)
-COPTS+=	-fno-strict-aliasing
-.endif
-
 .include 

CVS commit: src/usr.sbin/dumplfs

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 14:07:54 UTC 2016

Modified Files:
src/usr.sbin/dumplfs: dumplfs.c

Log Message:
 for true and false.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.sbin/dumplfs/dumplfs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.61 src/usr.sbin/dumplfs/dumplfs.c:1.62
--- src/usr.sbin/dumplfs/dumplfs.c:1.61	Thu Oct 15 06:24:46 2015
+++ src/usr.sbin/dumplfs/dumplfs.c	Wed Jun 15 14:07:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dumplfs.c,v 1.61 2015/10/15 06:24:46 dholland Exp $	*/
+/*	$NetBSD: dumplfs.c,v 1.62 2016/06/15 14:07:54 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
 #if 0
 static char sccsid[] = "@(#)dumplfs.c	8.5 (Berkeley) 5/24/95";
 #else
-__RCSID("$NetBSD: dumplfs.c,v 1.61 2015/10/15 06:24:46 dholland Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.62 2016/06/15 14:07:54 riastradh Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,6 +56,7 @@ __RCSID("$NetBSD: dumplfs.c,v 1.61 2015/
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 

CVS commit: src/usr.sbin/rtadvd

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 13:57:39 UTC 2016

Modified Files:
src/usr.sbin/rtadvd: dump.c

Log Message:
Omit needless casts.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/rtadvd/dump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/rtadvd/dump.c
diff -u src/usr.sbin/rtadvd/dump.c:1.13 src/usr.sbin/rtadvd/dump.c:1.14
--- src/usr.sbin/rtadvd/dump.c:1.13	Wed Nov 11 07:48:41 2015
+++ src/usr.sbin/rtadvd/dump.c	Wed Jun 15 13:57:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dump.c,v 1.13 2015/11/11 07:48:41 ozaki-r Exp $	*/
+/*	$NetBSD: dump.c,v 1.14 2016/06/15 13:57:39 riastradh Exp $	*/
 /*	$KAME: dump.c,v 1.34 2004/06/14 05:35:59 itojun Exp $	*/
 
 /*
@@ -113,11 +113,11 @@ if_dump(void)
 		if (rai->lastsent.tv_sec) {
 			/* note that ctime() appends CR by itself */
 			fprintf(fp, "  Last RA sent: %s",
-ctime((time_t *)>lastsent.tv_sec));
+ctime(>lastsent.tv_sec));
 		}
 		if (rai->timer) {
 			fprintf(fp, "  Next RA will be sent: %s",
-ctime((time_t *)>timer->tm.tv_sec));
+ctime(>timer->tm.tv_sec));
 		}
 		else
 			fprintf(fp, "  RA timer is stopped");

CVS commit: src

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 13:57:26 UTC 2016

Modified Files:
src/doc: HACKS
src/usr.sbin/rtadvd: Makefile

Log Message:
No more obvious strict aliasing violations here.


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/doc/HACKS
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/rtadvd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.172 src/doc/HACKS:1.173
--- src/doc/HACKS:1.172	Wed Jun 15 13:47:26 2016
+++ src/doc/HACKS	Wed Jun 15 13:57:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.172 2016/06/15 13:47:26 riastradh Exp $
+# $NetBSD: HACKS,v 1.173 2016/06/15 13:57:26 riastradh Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -276,7 +276,6 @@ file	usr.sbin/pppd/pppd/Makefile	: 1.38
 file	usr.sbin/rarpd/Makefile		: 1.10
 file	usr.sbin/rbootd/Makefile	: 1.10
 file	usr.sbin/rpc.pcnfsd/Makefile	: 1.17
-file	usr.sbin/rtadvd/Makefile	: 1.9
 file	usr.sbin/tcpdump/Makefile	: 1.42
 descr
 	GCC 4.1 warns on pointer sign comparision/assignments and lots of

Index: src/usr.sbin/rtadvd/Makefile
diff -u src/usr.sbin/rtadvd/Makefile:1.18 src/usr.sbin/rtadvd/Makefile:1.19
--- src/usr.sbin/rtadvd/Makefile:1.18	Wed Nov 11 07:48:41 2015
+++ src/usr.sbin/rtadvd/Makefile	Wed Jun 15 13:57:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2015/11/11 07:48:41 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.19 2016/06/15 13:57:26 riastradh Exp $
 
 WARNS?=	4
 
@@ -27,7 +27,3 @@ CPPFLAGS+=	-DRUMP_ACTION
 
 
 .include 
-
-.if defined(HAVE_GCC) || defined(HAVE_LLVM)
-COPTS.dump.c=-fno-strict-aliasing
-.endif

CVS commit: src

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 13:47:26 UTC 2016

Modified Files:
src/doc: HACKS
src/usr.sbin/wiconfig: Makefile wiconfig.c

Log Message:
Kill another strict aliasing violation.


To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/doc/HACKS
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/wiconfig/Makefile
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/wiconfig/wiconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.171 src/doc/HACKS:1.172
--- src/doc/HACKS:1.171	Wed Jun 15 13:29:30 2016
+++ src/doc/HACKS	Wed Jun 15 13:47:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.171 2016/06/15 13:29:30 riastradh Exp $
+# $NetBSD: HACKS,v 1.172 2016/06/15 13:47:26 riastradh Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -278,7 +278,6 @@ file	usr.sbin/rbootd/Makefile	: 1.10
 file	usr.sbin/rpc.pcnfsd/Makefile	: 1.17
 file	usr.sbin/rtadvd/Makefile	: 1.9
 file	usr.sbin/tcpdump/Makefile	: 1.42
-file	usr.sbin/wiconfig/Makefile	: 1.3
 descr
 	GCC 4.1 warns on pointer sign comparision/assignments and lots of
 	code does not conform.  For now we use -Wno-pointer-sign and

Index: src/usr.sbin/wiconfig/Makefile
diff -u src/usr.sbin/wiconfig/Makefile:1.6 src/usr.sbin/wiconfig/Makefile:1.7
--- src/usr.sbin/wiconfig/Makefile:1.6	Fri Aug 10 12:10:30 2012
+++ src/usr.sbin/wiconfig/Makefile	Wed Jun 15 13:47:26 2016
@@ -1,10 +1,6 @@
-#	$NetBSD: Makefile,v 1.6 2012/08/10 12:10:30 joerg Exp $
+#	$NetBSD: Makefile,v 1.7 2016/06/15 13:47:26 riastradh Exp $
 
 PROG=	wiconfig
 MAN=	wiconfig.8
 
 .include 
-
-.if defined(HAVE_GCC) || defined(HAVE_LLVM)
-COPTS+=	-fno-strict-aliasing
-.endif

Index: src/usr.sbin/wiconfig/wiconfig.c
diff -u src/usr.sbin/wiconfig/wiconfig.c:1.44 src/usr.sbin/wiconfig/wiconfig.c:1.45
--- src/usr.sbin/wiconfig/wiconfig.c:1.44	Thu Apr 12 11:46:14 2012
+++ src/usr.sbin/wiconfig/wiconfig.c	Wed Jun 15 13:47:26 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: wiconfig.c,v 1.44 2012/04/12 11:46:14 joerg Exp $	*/
+/*	$NetBSD: wiconfig.c,v 1.45 2016/06/15 13:47:26 riastradh Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul .  All rights reserved.
@@ -68,7 +68,7 @@
 #if !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1997, 1998, 1999\
  Bill Paul.  All rights reserved.");
-__RCSID("$NetBSD: wiconfig.c,v 1.44 2012/04/12 11:46:14 joerg Exp $");
+__RCSID("$NetBSD: wiconfig.c,v 1.45 2016/06/15 13:47:26 riastradh Exp $");
 #endif
 
 struct wi_table {
@@ -156,7 +156,8 @@ wi_apscan(char *iface)
 	int			naps, rate;
 	int			retries = 10;
 	int			flags;
-	struct wi_apinfo	*w;
+	struct wi_apinfo	aps[howmany(WI_MAX_DATALEN,
+sizeof(struct wi_apinfo))];
 	int			i, j;
 
 	if (iface == NULL)
@@ -212,15 +213,21 @@ wi_apscan(char *iface)
 		err(1, "ioctl");
 	}
 
-	naps = *(int *)wreq.wi_val;
+	memcpy(, wreq.wi_val, sizeof(int));
 
 	if (naps > 0)
 		printf("\nAP Information\n");
 	else
 		printf("\nNo APs available\n");
 
-	w =  (struct wi_apinfo *)(((char *)_val) + sizeof(int));
-	for ( i = 0; i < naps; i++, w++) {
+	naps = MIN((unsigned)naps,
+	howmany(sizeof(wreq.wi_val) - sizeof(int), sizeof(*aps)));
+	memcpy(aps, (const char *)wreq.wi_val + sizeof(int),
+	(unsigned)naps * sizeof(*aps));
+
+	for (i = 0; i < naps; i++) {
+		const struct wi_apinfo *const w = [i];
+
 		printf("ap[%d]:\n", i);
 		if (w->scanreason) {
 			static const char *scanm[] = {

CVS commit: src/doc

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jun 15 13:29:30 UTC 2016

Modified Files:
src/doc: HACKS

Log Message:
This hack no longer exists since the switch to ipsec-tools in 2005.

Another strict-aliasing problem killed.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.170 src/doc/HACKS:1.171
--- src/doc/HACKS:1.170	Wed Jun 15 05:01:58 2016
+++ src/doc/HACKS	Wed Jun 15 13:29:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.170 2016/06/15 05:01:58 mrg Exp $
+# $NetBSD: HACKS,v 1.171 2016/06/15 13:29:30 riastradh Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -103,20 +103,6 @@ descr
 	symbols should be consistent across all ports.
 kcah
 
-hack	gcc-strict-aliasing
-cdate	6 August 2004
-who	junyoung
-pr	26516
-file	src/usr.sbin/racoon/racoon/Makefile : 1.21
-descr
-	GCC issues a warning "dereferencing type-punned pointer will break
-	strict-aliasing rules" when compiling
-	crypto/dist/kame/racoon/crypto/openssl.c with -O[23s]. Note that this
-	is due to use of type casting in a non-standard way in the code and
-	not a compiler bug. Once a new release of KAME with a proper fix
-	applied is imported this should be backed out.
-kcah
-
 hack	gcc4 wrong uninitialized variable
 mdate	10 May 2006
 who	mrg

CVS commit: src/sys/dev/fdt

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Wed Jun 15 13:13:40 UTC 2016

Modified Files:
src/sys/dev/fdt: fixedregulator.c

Log Message:
If either "regulator-boot-on" or "regulator-always-on" properties are true,
explicitly enable the regulator at attach time. In addition, if the
"startup-delay-us" property is present, delay after enabling the regulator.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/fixedregulator.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/fdt/fixedregulator.c
diff -u src/sys/dev/fdt/fixedregulator.c:1.3 src/sys/dev/fdt/fixedregulator.c:1.4
--- src/sys/dev/fdt/fixedregulator.c:1.3	Tue Dec 22 22:19:07 2015
+++ src/sys/dev/fdt/fixedregulator.c	Wed Jun 15 13:13:40 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fixedregulator.c,v 1.3 2015/12/22 22:19:07 jmcneill Exp $ */
+/* $NetBSD: fixedregulator.c,v 1.4 2016/06/15 13:13:40 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fixedregulator.c,v 1.3 2015/12/22 22:19:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fixedregulator.c,v 1.4 2016/06/15 13:13:40 jmcneill Exp $");
 
 #include 
 #include 
@@ -57,7 +57,9 @@ struct fixedregulator_softc {
 
 	struct fdtbus_gpio_pin *sc_pin;
 	bool		sc_always_on;
+	bool		sc_boot_on;
 	bool		sc_enable_val;
+	uint32_t	sc_delay;
 };
 
 CFATTACH_DECL_NEW(fregulator, sizeof(struct fixedregulator_softc),
@@ -104,13 +106,24 @@ fixedregulator_attach(device_t parent, d
 		gpioflags |= GPIO_PIN_OPENDRAIN;
 
 	sc->sc_always_on = of_getprop_bool(phandle, "regulator-always-on");
+	sc->sc_boot_on = of_getprop_bool(phandle, "regulator-boot-on");
+	sc->sc_enable_val = of_getprop_bool(phandle, "enable-active-high");
+	if (of_getprop_uint32(phandle, "startup-delay-us", >sc_delay) != 0)
+		sc->sc_delay = 0;
+
 	sc->sc_pin = fdtbus_gpio_acquire(phandle, "gpio", gpioflags);
 	if (sc->sc_pin == NULL)
 		sc->sc_always_on = true;
-	sc->sc_enable_val = of_getprop_bool(phandle, "enable-active-high");
 
 	fdtbus_register_regulator_controller(self, phandle,
 	_funcs);
+
+	/*
+	 * If the regulator is flagged as always on or enabled at boot,
+	 * ensure that it is enabled
+	 */
+	if (sc->sc_always_on || sc->sc_boot_on)
+		fixedregulator_enable(self, true);
 }
 
 static int
@@ -130,18 +143,14 @@ fixedregulator_enable(device_t dev, bool
 	struct fixedregulator_softc * const sc = device_private(dev);
 
 	if (enable) {
-		if (sc->sc_always_on) {
-			return 0;
-		} else {
+		if (sc->sc_pin != NULL)
 			fdtbus_gpio_write_raw(sc->sc_pin, sc->sc_enable_val);
-			return 0;
-		}
+		if (sc->sc_delay > 0)
+			delay(sc->sc_delay);
 	} else {
-		if (sc->sc_always_on) {
+		if (sc->sc_always_on)
 			return EIO;
-		} else {
-			fdtbus_gpio_write_raw(sc->sc_pin, !sc->sc_enable_val);
-			return 0;
-		}
+		fdtbus_gpio_write_raw(sc->sc_pin, !sc->sc_enable_val);
 	}
+	return 0;
 }

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 15 12:10:18 UTC 2016

Modified Files:
src/sys/sys: signal.h

Log Message:
Remove SIGPOLL, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=92362
for an explanation why.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/sys/signal.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/sys/signal.h
diff -u src/sys/sys/signal.h:1.69 src/sys/sys/signal.h:1.70
--- src/sys/sys/signal.h:1.69	Fri Jun 10 20:56:38 2016
+++ src/sys/sys/signal.h	Wed Jun 15 08:10:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: signal.h,v 1.69 2016/06/11 00:56:38 christos Exp $	*/
+/*	$NetBSD: signal.h,v 1.70 2016/06/15 12:10:18 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -73,7 +73,6 @@
 #define	SIGTTIN		21	/* to readers pgrp upon background tty read */
 #define	SIGTTOU		22	/* like TTIN for output if (tp->t_local) */
 #define	SIGIO		23	/* input/output possible signal */
-#define	SIGPOLL		SIGIO	/* compatibility */
 #define	SIGXCPU		24	/* exceeded CPU time limit */
 #define	SIGXFSZ		25	/* exceeded file size limit */
 #define	SIGVTALRM	26	/* virtual time alarm */

CVS commit: src/libexec/ld.elf_so

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Jun 15 12:08:47 UTC 2016

Modified Files:
src/libexec/ld.elf_so: Makefile

Log Message:
Turn off GNU_RELRO for now.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/libexec/ld.elf_so/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.131 src/libexec/ld.elf_so/Makefile:1.132
--- src/libexec/ld.elf_so/Makefile:1.131	Tue Jun 14 09:06:41 2016
+++ src/libexec/ld.elf_so/Makefile	Wed Jun 15 08:08:47 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.131 2016/06/14 13:06:41 christos Exp $
+#	$NetBSD: Makefile,v 1.132 2016/06/15 12:08:47 christos Exp $
 #
 # NOTE: when changing ld.so, ensure that ldd still compiles.
 #
@@ -93,7 +93,7 @@ BINDIR=		${SHLINKINSTALLDIR}
 CPPFLAGS+=	-DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
 CPPFLAGS+=	-I${.CURDIR} -I. -D_KERNTYPES
 CPPFLAGS+=	-DRTLD_LOADER
-CPPFLAGS+=	-DGNU_RELRO
+#CPPFLAGS+=	-DGNU_RELRO
 CPPFLAGS+=	-D_RTLD_SOURCE
 CPPFLAGS+=	-DCOMBRELOC
 #CPPFLAGS+=	-DDEBUG

CVS commit: src/sys/arch/arm/imx

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Wed Jun 15 07:26:12 UTC 2016

Modified Files:
src/sys/arch/arm/imx: if_enet.c

Log Message:
fix the tx stall problem. ("watchdog timeout")
TX descriptor should be written out once before writing READY flag.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/if_enet.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/arm/imx/if_enet.c
diff -u src/sys/arch/arm/imx/if_enet.c:1.7 src/sys/arch/arm/imx/if_enet.c:1.8
--- src/sys/arch/arm/imx/if_enet.c:1.7	Fri Jun 10 13:27:11 2016
+++ src/sys/arch/arm/imx/if_enet.c	Wed Jun 15 07:26:11 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_enet.c,v 1.7 2016/06/10 13:27:11 ozaki-r Exp $	*/
+/*	$NetBSD: if_enet.c,v 1.8 2016/06/15 07:26:11 ryo Exp $	*/
 
 /*
  * Copyright (c) 2014 Ryo Shimizu 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.7 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_enet.c,v 1.8 2016/06/15 07:26:11 ryo Exp $");
 
 #include "vlan.h"
 
@@ -1744,9 +1744,10 @@ enet_encap_txring(struct enet_softc *sc,
 		sc->sc_txdesc_ring[idx].tx_databuf = map->dm_segs[i].ds_addr;
 		sc->sc_txdesc_ring[idx].tx_flags2 = flags2;
 		sc->sc_txdesc_ring[idx].tx_flags3 = 0;
+		TXDESC_WRITEOUT(idx);
+
 		sc->sc_txdesc_ring[idx].tx_flags1_len =
 		flags1 | TXFLAGS1_LEN(map->dm_segs[i].ds_len);
-
 		TXDESC_WRITEOUT(idx);
 
 		idx = ENET_TX_NEXTIDX(idx);

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 15 06:01:21 UTC 2016

Modified Files:
src/sys/compat/linux/common: linux_socket.c
src/sys/compat/linux32/common: linux32_socket.c
src/sys/netinet6: nd6_rtr.c scope6.c

Log Message:
Protect if_byindex by pserialize


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux32/common/linux32_socket.c
cvs rdiff -u -r1.111 -r1.112 src/sys/netinet6/nd6_rtr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet6/scope6.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_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.127 src/sys/compat/linux/common/linux_socket.c:1.128
--- src/sys/compat/linux/common/linux_socket.c:1.127	Thu May 12 02:24:16 2016
+++ src/sys/compat/linux/common/linux_socket.c	Wed Jun 15 06:01:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_socket.c,v 1.127 2016/05/12 02:24:16 ozaki-r Exp $	*/
+/*	$NetBSD: linux_socket.c,v 1.128 2016/06/15 06:01:21 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.127 2016/05/12 02:24:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.128 2016/06/15 06:01:21 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -1092,16 +1092,21 @@ linux_getifname(struct lwp *l, register_
 	struct ifnet *ifp;
 	struct linux_ifreq ifr;
 	int error;
+	int s;
 
 	error = copyin(data, , sizeof(ifr));
 	if (error)
 		return error;
 
+	s = pserialize_read_enter();
 	ifp = if_byindex(ifr.ifr_ifru.ifru_ifindex);
-	if (ifp == NULL)
+	if (ifp == NULL) {
+		pserialize_read_exit(s);
 		return ENODEV;
+	}
 
 	strncpy(ifr.ifr_name, ifp->if_xname, sizeof(ifr.ifr_name));
+	pserialize_read_exit(s);
 
 	return copyout(, data, sizeof(ifr));
 }

Index: src/sys/compat/linux32/common/linux32_socket.c
diff -u src/sys/compat/linux32/common/linux32_socket.c:1.21 src/sys/compat/linux32/common/linux32_socket.c:1.22
--- src/sys/compat/linux32/common/linux32_socket.c:1.21	Thu May 12 02:24:16 2016
+++ src/sys/compat/linux32/common/linux32_socket.c	Wed Jun 15 06:01:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_socket.c,v 1.21 2016/05/12 02:24:16 ozaki-r Exp $ */
+/*	$NetBSD: linux32_socket.c,v 1.22 2016/06/15 06:01:21 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.21 2016/05/12 02:24:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.22 2016/06/15 06:01:21 ozaki-r Exp $");
 
 #include 
 #include 
@@ -393,16 +393,21 @@ linux32_getifname(struct lwp *l, registe
 	struct ifnet *ifp;
 	struct linux32_ifreq ifr;
 	int error;
+	int s;
 
 	error = copyin(data, , sizeof(ifr));
 	if (error)
 		return error;
 
+	s = pserialize_read_enter();
 	ifp = if_byindex(ifr.ifr_ifru.ifru_ifindex);
-	if (ifp == NULL)
+	if (ifp == NULL) {
+		pserialize_read_exit(s);
 		return ENODEV;
+	}
 
 	strncpy(ifr.ifr_name, ifp->if_xname, sizeof(ifr.ifr_name));
+	pserialize_read_exit(s);
 
 	return copyout(, data, sizeof(ifr));
 }

Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.111 src/sys/netinet6/nd6_rtr.c:1.112
--- src/sys/netinet6/nd6_rtr.c:1.111	Fri Jun 10 13:31:44 2016
+++ src/sys/netinet6/nd6_rtr.c	Wed Jun 15 06:01:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_rtr.c,v 1.111 2016/06/10 13:31:44 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.112 2016/06/15 06:01:21 ozaki-r Exp $	*/
 /*	$KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.111 2016/06/10 13:31:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.112 2016/06/15 06:01:21 ozaki-r Exp $");
 
 #include 
 #include 
@@ -2123,8 +2123,12 @@ nd6_setdefaultiface(int ifindex)
 {
 	ifnet_t *ifp;
 	int error = 0;
+	int s;
 
-	if ((ifp = if_byindex(ifindex)) == NULL) {
+	s = pserialize_read_enter();
+	ifp = if_byindex(ifindex);
+	if (ifp == NULL) {
+		pserialize_read_exit(s);
 		return EINVAL;
 	}
 	if (nd6_defifindex != ifindex) {
@@ -2138,6 +2142,7 @@ nd6_setdefaultiface(int ifindex)
 		 */
 		scope6_setdefault(nd6_defifp);
 	}
+	pserialize_read_exit(s);
 
 	return (error);
 }

Index: src/sys/netinet6/scope6.c
diff -u src/sys/netinet6/scope6.c:1.13 src/sys/netinet6/scope6.c:1.14
--- src/sys/netinet6/scope6.c:1.13	Thu May 19 03:11:42 2016
+++ src/sys/netinet6/scope6.c	Wed Jun 15 06:01:21 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: scope6.c,v 1.13 2016/05/19 03:11:42 ozaki-r Exp $	*/
+/*	$NetBSD: scope6.c,v 1.14 2016/06/15 06:01:21 ozaki-r Exp $	*/
 /*	$KAME$	*/
 
 /*-
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: scope6.c,v 1.13 2016/05/19 03:11:42 ozaki-r Exp $");