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

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 02:14:59 UTC 2018

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

Log Message:
fix proflib for bozo


To generate a diff of this commit:
cvs rdiff -u -r1.2191 -r1.2192 src/distrib/sets/lists/comp/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2191 src/distrib/sets/lists/comp/mi:1.2192
--- src/distrib/sets/lists/comp/mi:1.2191	Fri May  4 21:09:08 2018
+++ src/distrib/sets/lists/comp/mi	Fri May  4 22:14:59 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2191 2018/05/05 01:09:08 sevan Exp $
+#	$NetBSD: mi,v 1.2192 2018/05/05 02:14:59 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -3290,7 +3290,7 @@
 ./usr/lib/libbluetooth.a			comp-c-lib		compatfile
 ./usr/lib/libbluetooth_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbozohttpd.a			comp-c-lib		compatfile
-./usr/lib/libbozohttpd_p.a			comp-c-lib		compatfile,profile
+./usr/lib/libbozohttpd_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbsdmalloc.a			comp-c-lib		compatfile
 ./usr/lib/libbsdmalloc_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbz2.acomp-c-lib		compatfile



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

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 02:14:59 UTC 2018

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

Log Message:
fix proflib for bozo


To generate a diff of this commit:
cvs rdiff -u -r1.2191 -r1.2192 src/distrib/sets/lists/comp/mi

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



CVS commit: src/sys/compat

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 02:09:41 UTC 2018

Modified Files:
src/sys/compat/osf1: osf1_socket.c
src/sys/compat/svr4: svr4_stream.c

Log Message:
finish ktrace argument removal for do_sys_{send,recv}msg


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/osf1/osf1_socket.c
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/svr4/svr4_stream.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/osf1/osf1_socket.c
diff -u src/sys/compat/osf1/osf1_socket.c:1.22 src/sys/compat/osf1/osf1_socket.c:1.23
--- src/sys/compat/osf1/osf1_socket.c:1.22	Tue Sep 13 03:01:08 2016
+++ src/sys/compat/osf1/osf1_socket.c	Fri May  4 22:09:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_socket.c,v 1.22 2016/09/13 07:01:08 martin Exp $ */
+/* $NetBSD: osf1_socket.c,v 1.23 2018/05/05 02:09:40 christos Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.22 2016/09/13 07:01:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_socket.c,v 1.23 2018/05/05 02:09:40 christos Exp $");
 
 #include 
 #include 
@@ -130,8 +130,7 @@ osf1_sys_sendmsg_xopen(struct lwp *l, co
 bsd_iovec[i].iov_len = osf_iovec.iov_len;
 	}
 
-	error = do_sys_sendmsg(l, SCARG(uap, s), _msghdr, flags, NULL, 0,
-	retval);
+	error = do_sys_sendmsg(l, SCARG(uap, s), _msghdr, flags, retval);
 err:
 	kmem_free(bsd_iovec, iov_len * sizeof(struct iovec));
 	return error;

Index: src/sys/compat/svr4/svr4_stream.c
diff -u src/sys/compat/svr4/svr4_stream.c:1.92 src/sys/compat/svr4/svr4_stream.c:1.93
--- src/sys/compat/svr4/svr4_stream.c:1.92	Sat Sep 16 05:05:29 2017
+++ src/sys/compat/svr4/svr4_stream.c	Fri May  4 22:09:40 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $	 */
+/*	$NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.92 2017/09/16 09:05:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.93 2018/05/05 02:09:40 christos Exp $");
 
 #include 
 #include 
@@ -1540,7 +1540,7 @@ svr4_sys_putmsg(struct lwp *l, const str
 		aiov.iov_base = NETBSD32PTR(dat.buf);
 		aiov.iov_len = dat.len;
 		error = do_sys_sendmsg(l, SCARG(uap, fd), ,
-			   SCARG(uap, flags),  NULL, 0, retval);
+			   SCARG(uap, flags), retval);
 
 		*retval = 0;
 		return error;
@@ -1781,7 +1781,7 @@ svr4_sys_getmsg(struct lwp *l, const str
 		aiov.iov_len = dat.maxlen;
 		msg.msg_flags = 0;
 
-		error = do_sys_recvmsg(l,  SCARG(uap, fd), , NULL, 0,
+		error = do_sys_recvmsg(l,  SCARG(uap, fd), ,
 		, NULL, retval);
 
 		if (error) {



CVS commit: src/sys/compat

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 02:09:41 UTC 2018

Modified Files:
src/sys/compat/osf1: osf1_socket.c
src/sys/compat/svr4: svr4_stream.c

Log Message:
finish ktrace argument removal for do_sys_{send,recv}msg


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/osf1/osf1_socket.c
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/svr4/svr4_stream.c

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



CVS commit: src/sys/dev/i2c

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sat May  5 02:01:34 UTC 2018

Modified Files:
src/sys/dev/i2c: files.i2c

Log Message:
axppmic depends on sysmon_envsys


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/i2c/files.i2c

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/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.90 src/sys/dev/i2c/files.i2c:1.91
--- src/sys/dev/i2c/files.i2c:1.90	Fri May  4 21:09:55 2018
+++ src/sys/dev/i2c/files.i2c	Sat May  5 02:01:34 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i2c,v 1.90 2018/05/04 21:09:55 jmcneill Exp $
+#	$NetBSD: files.i2c,v 1.91 2018/05/05 02:01:34 jmcneill Exp $
 
 obsolete defflag	opt_i2cbus.h		I2C_SCAN
 define	i2cbus { }
@@ -233,7 +233,7 @@ attach	axp22x at iic
 file	dev/i2c/axp22x.c			axp22x
 
 # X-Powers AXP Power Management IC
-device	axppmic { }: sysmon_taskq
+device	axppmic { }: sysmon_envsys, sysmon_taskq
 device	axpreg: axppmic
 attach	axppmic at iic
 attach	axpreg at axppmic



CVS commit: src/sys/dev/i2c

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sat May  5 02:01:34 UTC 2018

Modified Files:
src/sys/dev/i2c: files.i2c

Log Message:
axppmic depends on sysmon_envsys


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/i2c/files.i2c

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



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

2018-05-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Sat May  5 01:09:08 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: mi shl.mi

Log Message:
files with _p.a suffix should be tagged profile, files with _pic.a suffix belong
in the shl.mi list. learnt through broken sun2 build.


To generate a diff of this commit:
cvs rdiff -u -r1.2190 -r1.2191 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.314 -r1.315 src/distrib/sets/lists/comp/shl.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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2190 src/distrib/sets/lists/comp/mi:1.2191
--- src/distrib/sets/lists/comp/mi:1.2190	Fri May  4 19:11:59 2018
+++ src/distrib/sets/lists/comp/mi	Sat May  5 01:09:08 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2190 2018/05/04 19:11:59 christos Exp $
+#	$NetBSD: mi,v 1.2191 2018/05/05 01:09:08 sevan Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -3290,8 +3290,7 @@
 ./usr/lib/libbluetooth.a			comp-c-lib		compatfile
 ./usr/lib/libbluetooth_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbozohttpd.a			comp-c-lib		compatfile
-./usr/lib/libbozohttpd_p.a			comp-c-lib		compatfile
-./usr/lib/libbozohttpd_pic.a			comp-c-lib		compatfile
+./usr/lib/libbozohttpd_p.a			comp-c-lib		compatfile,profile
 ./usr/lib/libbsdmalloc.a			comp-c-lib		compatfile
 ./usr/lib/libbsdmalloc_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbz2.acomp-c-lib		compatfile

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.314 src/distrib/sets/lists/comp/shl.mi:1.315
--- src/distrib/sets/lists/comp/shl.mi:1.314	Mon Apr 16 12:25:18 2018
+++ src/distrib/sets/lists/comp/shl.mi	Sat May  5 01:09:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.314 2018/04/16 12:25:18 christos Exp $
+# $NetBSD: shl.mi,v 1.315 2018/05/05 01:09:08 sevan Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -16,6 +16,7 @@
 ./usr/lib/libbind9_pic.a			comp-bind-piclib	compatfile,picinstall
 ./usr/lib/libblacklist_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libbluetooth_pic.a			comp-c-piclib		compatfile,picinstall
+./usr/lib/libbozohttpd_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libbsdmalloc_pic.a			comp-c-piclib		compatfile,picinstall
 ./usr/lib/libbz2_pic.acomp-c-piclib		compatfile,picinstall
 ./usr/lib/libc++_pic.acomp-c-piclib		compatfile,picinstall,libcxx



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

2018-05-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Sat May  5 01:09:08 UTC 2018

Modified Files:
src/distrib/sets/lists/comp: mi shl.mi

Log Message:
files with _p.a suffix should be tagged profile, files with _pic.a suffix belong
in the shl.mi list. learnt through broken sun2 build.


To generate a diff of this commit:
cvs rdiff -u -r1.2190 -r1.2191 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.314 -r1.315 src/distrib/sets/lists/comp/shl.mi

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



CVS commit: src/sys/dev/i2c

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sat May  5 00:39:59 UTC 2018

Modified Files:
src/sys/dev/i2c: axppmic.c

Log Message:
Add battery sensors.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/axppmic.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/i2c/axppmic.c
diff -u src/sys/dev/i2c/axppmic.c:1.1 src/sys/dev/i2c/axppmic.c:1.2
--- src/sys/dev/i2c/axppmic.c:1.1	Fri May  4 21:09:55 2018
+++ src/sys/dev/i2c/axppmic.c	Sat May  5 00:39:59 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: axppmic.c,v 1.1 2018/05/04 21:09:55 jmcneill Exp $ */
+/* $NetBSD: axppmic.c,v 1.2 2018/05/05 00:39:59 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2018 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.1 2018/05/04 21:09:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 1.2 2018/05/05 00:39:59 jmcneill Exp $");
 
 #include 
 #include 
@@ -44,6 +44,11 @@ __KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 
 
 #include 
 
+#define	AXP_POWER_MODE_REG	0x01
+#define	 AXP_POWER_MODE_BATT_VALID	__BIT(4)
+#define	 AXP_POWER_MODE_BATT_PRESENT	__BIT(5)
+#define	 AXP_POWER_MODE_BATT_CHARGING	__BIT(6)
+
 #define AXP_POWER_DISABLE_REG	0x32
 #define	 AXP_POWER_DISABLE_CTRL	__BIT(7)
 
@@ -51,6 +56,16 @@ __KERNEL_RCSID(0, "$NetBSD: axppmic.c,v 
 #define	 AXP_IRQ2_POKSIRQ	__BIT(1)
 #define AXP_IRQ_STATUS_REG(n)	(0x48 + (n) - 1)
 
+#define	AXP_FUEL_GAUGE_CTRL_REG	0xb8
+#define	 AXP_FUEL_GAUGE_CTRL_EN	__BIT(7)
+#define	AXP_BATT_CAP_REG	0xb9
+#define	 AXP_BATT_CAP_VALID	__BIT(7)
+#define	 AXP_BATT_CAP_PERCENT	__BITS(6,0)
+
+#define	AXP_BATT_CAP_WARN_REG	0xe6
+#define	 AXP_BATT_CAP_WARN_LV1	__BITS(7,4)
+#define	 AXP_BATT_CAP_WARN_LV2	__BITS(3,0)
+
 struct axppmic_ctrl {
 	device_t	c_dev;
 
@@ -160,6 +175,16 @@ struct axppmic_config {
 	const struct axppmic_ctrl *controls;
 	u_int ncontrols;
 	u_int irq_regs;
+	bool has_battery;
+	bool has_fuel_gauge;
+};
+
+enum axppmic_sensor {
+	AXP_SENSOR_BATT_PRESENT,
+	AXP_SENSOR_BATT_CHARGING,
+	AXP_SENSOR_BATT_CHARGE_STATE,
+	AXP_SENSOR_BATT_CAPACITY,
+	AXP_NSENSORS
 };
 
 struct axppmic_softc {
@@ -168,9 +193,13 @@ struct axppmic_softc {
 	i2c_addr_t	sc_addr;
 	int		sc_phandle;
 
+	bool		sc_has_battery;
+	bool		sc_has_fuel_gauge;
+
 	struct sysmon_pswitch sc_smpsw;
 
-	u_int		sc_nirq;
+	struct sysmon_envsys *sc_sme;
+	envsys_data_t	sc_sensor[AXP_NSENSORS];
 };
 
 struct axpreg_softc {
@@ -178,8 +207,6 @@ struct axpreg_softc {
 	i2c_tag_t	sc_i2c;
 	i2c_addr_t	sc_addr;
 	const struct axppmic_ctrl *sc_ctrl;
-
-	u_int		sc_nirq;
 };
 
 struct axpreg_attach_args {
@@ -194,6 +221,8 @@ static const struct axppmic_config axp80
 	.controls = axp803_ctrls,
 	.ncontrols = __arraycount(axp803_ctrls),
 	.irq_regs = 6,
+	.has_battery = true,
+	.has_fuel_gauge = true,
 };
 
 static const struct axppmic_config axp805_config = {
@@ -322,7 +351,7 @@ axppmic_intr(void *priv)
 	uint8_t stat;
 
 	iic_acquire_bus(sc->sc_i2c, flags);
-	if (sc->sc_nirq >= 2 && axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_IRQ_STATUS_REG(2), , flags) == 0) {
+	if (axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_IRQ_STATUS_REG(2), , flags) == 0) {
 		if (stat & AXP_IRQ2_POKSIRQ)
 			sysmon_task_queue_sched(0, axppmic_task_shut, sc);
 
@@ -333,6 +362,126 @@ axppmic_intr(void *priv)
 	return 1;
 }
 
+static void
+axppmic_sensor_refresh(struct sysmon_envsys *sme, envsys_data_t *e)
+{
+	struct axppmic_softc *sc = sme->sme_cookie;
+	const int flags = I2C_F_POLL;
+	uint8_t val, warn_val;
+
+	e->state = ENVSYS_SINVALID;
+
+	iic_acquire_bus(sc->sc_i2c, flags);
+	switch (e->private) {
+	case AXP_SENSOR_BATT_PRESENT:
+		if (axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_POWER_MODE_REG, , flags) == 0) {
+			if (val & AXP_POWER_MODE_BATT_VALID) {
+e->state = ENVSYS_SVALID;
+e->value_cur = !!(val & AXP_POWER_MODE_BATT_PRESENT);
+break;
+			}
+		}
+		break;
+	case AXP_SENSOR_BATT_CHARGING:
+		if (axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_POWER_MODE_REG, , flags) == 0) {
+			e->state = ENVSYS_SVALID;
+			e->value_cur = !!(val & AXP_POWER_MODE_BATT_CHARGING);
+		}
+		break;
+	case AXP_SENSOR_BATT_CHARGE_STATE:
+		if (axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_POWER_MODE_REG, , flags) == 0 &&
+		(val & AXP_POWER_MODE_BATT_VALID) != 0 &&
+		(val & AXP_POWER_MODE_BATT_PRESENT) != 0 &&
+		axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_BATT_CAP_REG, , flags) == 0 &&
+		(val & AXP_BATT_CAP_VALID) != 0 &&
+		axppmic_read(sc->sc_i2c, sc->sc_addr, AXP_BATT_CAP_WARN_REG, _val, flags) == 0) {
+			const u_int warn_thres = __SHIFTOUT(warn_val, AXP_BATT_CAP_WARN_LV1) + 5;
+			const u_int shut_thres = __SHIFTOUT(warn_val, AXP_BATT_CAP_WARN_LV2);
+
+			const u_int batt_val = __SHIFTOUT(val, AXP_BATT_CAP_PERCENT);
+			if (batt_val <= shut_thres) {
+e->state = ENVSYS_SCRITICAL;
+e->value_cur = ENVSYS_BATTERY_CAPACITY_CRITICAL;
+			} else if 

CVS commit: src/sys/dev/i2c

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Sat May  5 00:39:59 UTC 2018

Modified Files:
src/sys/dev/i2c: axppmic.c

Log Message:
Add battery sensors.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/axppmic.c

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



Re: CVS commit: src

2018-05-04 Thread Sevan Janiyan


On 05/04/18 22:42, matthew green wrote:
> nothing off hand, but i remember being "not happy" about it as
> an exposed interface.

ah, is it likely the interface will improve by the time NetBSD 9 lands?

>>> please make it build private copy for bozohttpd(3lua) instead of
>>> installing this for the whole to use.
>>
>> Sure, so create a new directory in src/lib for libbozohttpd, get the
>> library to build with a new Makefile and set LIBISPRIVATE?
> 
> you could do this in the existing subdir i guess, rather than have
> a new one for it.  but it doesn't really matter exactly how.
> 
> thanks!

Doesn't work, Lua libraries are built with -fPIC and LIBISPRIVATE sets
that off in bsd.lib.mk.


Sevan


CVS commit: src/sys/dev/sysmon

2018-05-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat May  5 00:14:28 UTC 2018

Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c

Log Message:
Defend against some table-lookup-not-found errors.


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/sysmon/sysmon_envsys.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/sysmon/sysmon_envsys.c
diff -u src/sys/dev/sysmon/sysmon_envsys.c:1.141 src/sys/dev/sysmon/sysmon_envsys.c:1.142
--- src/sys/dev/sysmon/sysmon_envsys.c:1.141	Mon Sep 11 06:02:09 2017
+++ src/sys/dev/sysmon/sysmon_envsys.c	Sat May  5 00:14:28 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysmon_envsys.c,v 1.141 2017/09/11 06:02:09 pgoyette Exp $	*/
+/*	$NetBSD: sysmon_envsys.c,v 1.142 2018/05/05 00:14:28 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -64,7 +64,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.141 2017/09/11 06:02:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.142 2018/05/05 00:14:28 pgoyette Exp $");
 
 #include 
 #include 
@@ -1706,6 +1706,8 @@ sme_update_sensor_dictionary(prop_object
 	 * update sensor's type.
 	 */
 	sdt = sme_find_table_entry(SME_DESC_UNITS, edata->units);
+	if (sdt == NULL)
+		return EINVAL;
 
 	DPRINTFOBJ(("%s: sensor #%d units=%d (%s)\n", __func__, edata->sensor,
 	sdt->type, sdt->desc));
@@ -1784,6 +1786,8 @@ sme_update_sensor_dictionary(prop_object
 	if (edata->units == ENVSYS_DRIVE) {
 		sdt = sme_find_table_entry(SME_DESC_DRIVE_STATES,
 	   edata->value_cur);
+		if (sdt == NULL)
+			return EINVAL;
 		error = sme_sensor_upstring(dict, "drive-state", sdt->desc);
 		if (error)
 			return error;
@@ -1796,6 +1800,8 @@ sme_update_sensor_dictionary(prop_object
 	if (edata->units == ENVSYS_BATTERY_CAPACITY) {
 		sdt = sme_find_table_entry(SME_DESC_BATTERY_CAPACITY,
 		edata->value_cur);
+		if (sdt == NULL)
+			return EINVAL;
 		error = sme_sensor_upstring(dict, "battery-capacity",
 	sdt->desc);
 		if (error)



CVS commit: src/sys/dev/sysmon

2018-05-04 Thread Paul Goyette
Module Name:src
Committed By:   pgoyette
Date:   Sat May  5 00:14:28 UTC 2018

Modified Files:
src/sys/dev/sysmon: sysmon_envsys.c

Log Message:
Defend against some table-lookup-not-found errors.


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/sysmon/sysmon_envsys.c

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



CVS commit: src/doc

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 00:13:02 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.1522 -r1.1523 src/doc/3RDPARTY
cvs rdiff -u -r1.2387 -r1.2388 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1522 src/doc/3RDPARTY:1.1523
--- src/doc/3RDPARTY:1.1522	Fri May  4 11:51:53 2018
+++ src/doc/3RDPARTY	Fri May  4 20:13:01 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1522 2018/05/04 15:51:53 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1523 2018/05/05 00:13:01 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -40,8 +40,8 @@
 #
 
 Package:	acpica
-Version:	20180313
-Current Vers:	20180313
+Version:	20180427
+Current Vers:	20180427
 Maintainer:	Intel
 Archive Site:	http://www.acpica.org/downloads/
 Home Page:	http://www.acpica.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2387 src/doc/CHANGES:1.2388
--- src/doc/CHANGES:1.2387	Fri May  4 11:51:53 2018
+++ src/doc/CHANGES	Fri May  4 20:13:02 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2387 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2388 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -152,3 +152,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	dhcpcd: Import 7.0.4. [roy 20180502]
 	tzdata: updated to 2017e [kre 20180504]
 	libc: Update to tzcode2018e. [christos 20180504]
+	acpi(4): Updated ACPICA to 20180427. [christos 20180504]



CVS commit: src/doc

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 00:13:02 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new acpica


To generate a diff of this commit:
cvs rdiff -u -r1.1522 -r1.1523 src/doc/3RDPARTY
cvs rdiff -u -r1.2387 -r1.2388 src/doc/CHANGES

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



CVS commit: src/sys/external/bsd/acpica/dist

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 00:12:16 UTC 2018

Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.h aslload.c
aslutils.c aslxref.c
src/sys/external/bsd/acpica/dist/debugger: dbnames.c dbtest.c
src/sys/external/bsd/acpica/dist/include: acapps.h acpixf.h
src/sys/external/bsd/acpica/dist/resources: rsdump.c
src/sys/external/bsd/acpica/dist/tables: tbinstal.c
src/sys/external/bsd/acpica/dist/utilities: utprint.c

Log Message:
merge acpica 20180427


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/debugger/dbtest.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/include/acapps.h
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/resources/rsdump.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/tables/tbinstal.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/utilities/utprint.c

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



CVS commit: src/sys/external/bsd/acpica/dist

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May  5 00:12:16 UTC 2018

Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.h aslload.c
aslutils.c aslxref.c
src/sys/external/bsd/acpica/dist/debugger: dbnames.c dbtest.c
src/sys/external/bsd/acpica/dist/include: acapps.h acpixf.h
src/sys/external/bsd/acpica/dist/resources: rsdump.c
src/sys/external/bsd/acpica/dist/tables: tbinstal.c
src/sys/external/bsd/acpica/dist/utilities: utprint.c

Log Message:
merge acpica 20180427


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/debugger/dbtest.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/include/acapps.h
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/resources/rsdump.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/tables/tbinstal.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/utilities/utprint.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/external/bsd/acpica/dist/compiler/aslcompiler.h
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.11 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.11	Sat Apr  7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h	Fri May  4 20:12:15 2018
@@ -1079,6 +1079,15 @@ UtDumpBasicOp (
 ACPI_PARSE_OBJECT   *Op,
 UINT32  Level);
 
+void *
+UtGetParentMethod (
+ACPI_NAMESPACE_NODE *Node);
+
+BOOLEAN
+UtNodeIsDescendantOf (
+ACPI_NAMESPACE_NODE *Node1,
+ACPI_NAMESPACE_NODE *Node2);
+
 void
 UtDisplaySupportedTables (
 void);
Index: src/sys/external/bsd/acpica/dist/compiler/aslxref.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.11 src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.11	Sat Apr  7 11:49:50 2018
+++ src/sys/external/bsd/acpica/dist/compiler/aslxref.c	Fri May  4 20:12:15 2018
@@ -89,22 +89,6 @@ XfCheckFieldRange (
 UINT32  FieldBitLength,
 UINT32  AccessBitWidth);
 
-#ifdef __UNDER_DEVELOPMENT
-static ACPI_PARSE_OBJECT *
-XfGetParentMethod (
-ACPI_PARSE_OBJECT   *Op);
-
-static void
-XfCheckIllegalReference (
-ACPI_PARSE_OBJECT   *Op,
-ACPI_NAMESPACE_NODE *Node);
-
-static BOOLEAN
-XfIsObjectParental (
-ACPI_PARSE_OBJECT   *MethodOp1,
-ACPI_PARSE_OBJECT   *MethodOp2);
-#endif
-
 
 /***
  *
@@ -594,7 +578,7 @@ XfNamespaceLocateBegin (
 Gbl_NsLookupCount++;
 
 Status = AcpiNsLookup (WalkState->ScopeInfo, Path, ObjectType,
-ACPI_IMODE_EXECUTE, Flags, WalkState, &(Node));
+ACPI_IMODE_EXECUTE, Flags, WalkState, );
 if (ACPI_FAILURE (Status))
 {
 if (Status == AE_NOT_FOUND)
@@ -652,6 +636,26 @@ XfNamespaceLocateBegin (
 return_ACPI_STATUS (Status);
 }
 
+/* Object was found above, check for an illegal forward reference */
+
+if (Op->Asl.CompileFlags & OP_NOT_FOUND_DURING_LOAD)
+{
+/*
+ * During the load phase, this Op was flagged as a possible
+ * illegal forward reference
+ *
+ * Note: Allow "forward references" from within a method to an
+ * object that is not within any method (module-level code)
+ */
+if (!WalkState->ScopeInfo || (UtGetParentMethod (Node) &&
+!UtNodeIsDescendantOf (WalkState->ScopeInfo->Scope.Node,
+UtGetParentMethod (Node
+{
+AslError (ASL_ERROR, ASL_MSG_ILLEGAL_FORWARD_REF, Op,
+Op->Asl.ExternalName);
+}
+}
+
 /* Check for a reference vs. name declaration */
 
 if (!(OpInfo->Flags & AML_NAMED) &&
@@ -660,13 +664,6 @@ XfNamespaceLocateBegin (
 /* This node has been referenced, mark it for reference check */
 
 Node->Flags |= ANOBJ_IS_REFERENCED;
-
-#ifdef __UNDER_DEVELOPMENT
-
-/* Check for an illegal reference */
-
-XfCheckIllegalReference (Op, Node);
-#endif
 }
 
 /* Attempt to optimize the NamePath */
@@ -1097,178 +1094,3 @@ XfNamespaceLocateEnd (
 
 return_ACPI_STATUS (AE_OK);
 }
-
-
-#ifdef __UNDER_DEVELOPMENT

CVS import: src/sys/external/bsd/acpica/dist

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 23:44:15 UTC 2018

Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv17997

Log Message:

27 April 2018. Summary of changes for version 20180427: 


1) ACPICA kernel-resident subsystem:

Debugger: Added support for Package objects in the "Test Objects" 
command. This command walks the entire namespace and evaluates all named 
data objects (Integers, Strings, Buffers, and now Packages).

Improved error messages for the namespace root node. Originally, the root 
was referred to by the confusing string "\___". This has been replaced by 
"Namespace Root" for clarification.

Fixed a potential infinite loop in the AcpiRsDumpByteList function. Colin 
Ian King .


2) iASL Compiler/Disassembler and Tools: 

iASL: Implemented support to detect and flag illegal forward references. 
For compatibility with other ACPI implementations, these references are 
now illegal at the root level of the DSDT or SSDTs. Forward references 
have always been illegal within control methods. This change should not 
affect existing ASL/AML code because of the fact that these references 
have always been illegal in the other ACPI implementation.

iASL: Added error messages for the case where a table OEM ID and OEM 
TABLE ID strings are longer than the ACPI-defined length. Previously, 
these strings were simply silently truncated.

iASL: Enhanced the -tc option (which creates an AML hex file in C, 
suitable for import into a firmware project):
  1) Create a unique name for the table, to simplify use of multiple 
SSDTs.
  2) Add a protection #ifdef in the file, similar to a .h header file.
With assistance from Sami Mujawar, sami.muja...@arm.com and Evan Lloyd, 
evan.ll...@arm.com

AcpiExec: Added a new option, -df, to disable the local fault handler. 
This is useful during debugging, where it may be desired to drop into a 
debugger on a fault.

Status:

Vendor Tag: intel
Release Tags:   acpica-20180427

U src/sys/external/bsd/acpica/dist/changes.txt
U src/sys/external/bsd/acpica/dist/Makefile
U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat
U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat
U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt
U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt
U src/sys/external/bsd/acpica/dist/generate/release/release.sh
U src/sys/external/bsd/acpica/dist/generate/release/build.sh
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules
U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt
U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile
U src/sys/external/bsd/acpica/dist/common/acfileio.c
U src/sys/external/bsd/acpica/dist/common/acgetline.c
U src/sys/external/bsd/acpica/dist/common/adfile.c
U src/sys/external/bsd/acpica/dist/common/adisasm.c
U src/sys/external/bsd/acpica/dist/common/adwalk.c
U src/sys/external/bsd/acpica/dist/common/ahids.c
U src/sys/external/bsd/acpica/dist/common/ahpredef.c
U src/sys/external/bsd/acpica/dist/common/ahtable.c
U src/sys/external/bsd/acpica/dist/common/ahuuids.c
U src/sys/external/bsd/acpica/dist/common/cmfsize.c
U src/sys/external/bsd/acpica/dist/common/dmextern.c
U src/sys/external/bsd/acpica/dist/common/dmrestag.c
U src/sys/external/bsd/acpica/dist/common/dmswitch.c
U src/sys/external/bsd/acpica/dist/common/dmtable.c
U src/sys/external/bsd/acpica/dist/common/dmtables.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump1.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump2.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump3.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo1.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo2.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo3.c
U src/sys/external/bsd/acpica/dist/common/getopt.c
U 

CVS import: src/sys/external/bsd/acpica/dist

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 23:44:15 UTC 2018

Update of /cvsroot/src/sys/external/bsd/acpica/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv17997

Log Message:

27 April 2018. Summary of changes for version 20180427: 


1) ACPICA kernel-resident subsystem:

Debugger: Added support for Package objects in the "Test Objects" 
command. This command walks the entire namespace and evaluates all named 
data objects (Integers, Strings, Buffers, and now Packages).

Improved error messages for the namespace root node. Originally, the root 
was referred to by the confusing string "\___". This has been replaced by 
"Namespace Root" for clarification.

Fixed a potential infinite loop in the AcpiRsDumpByteList function. Colin 
Ian King .


2) iASL Compiler/Disassembler and Tools: 

iASL: Implemented support to detect and flag illegal forward references. 
For compatibility with other ACPI implementations, these references are 
now illegal at the root level of the DSDT or SSDTs. Forward references 
have always been illegal within control methods. This change should not 
affect existing ASL/AML code because of the fact that these references 
have always been illegal in the other ACPI implementation.

iASL: Added error messages for the case where a table OEM ID and OEM 
TABLE ID strings are longer than the ACPI-defined length. Previously, 
these strings were simply silently truncated.

iASL: Enhanced the -tc option (which creates an AML hex file in C, 
suitable for import into a firmware project):
  1) Create a unique name for the table, to simplify use of multiple 
SSDTs.
  2) Add a protection #ifdef in the file, similar to a .h header file.
With assistance from Sami Mujawar, sami.muja...@arm.com and Evan Lloyd, 
evan.ll...@arm.com

AcpiExec: Added a new option, -df, to disable the local fault handler. 
This is useful during debugging, where it may be desired to drop into a 
debugger on a fault.

Status:

Vendor Tag: intel
Release Tags:   acpica-20180427

U src/sys/external/bsd/acpica/dist/changes.txt
U src/sys/external/bsd/acpica/dist/Makefile
U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat
U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat
U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt
U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt
U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt
U src/sys/external/bsd/acpica/dist/generate/release/release.sh
U src/sys/external/bsd/acpica/dist/generate/release/build.sh
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config
U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules
U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt
U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile
U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile
U src/sys/external/bsd/acpica/dist/common/acfileio.c
U src/sys/external/bsd/acpica/dist/common/acgetline.c
U src/sys/external/bsd/acpica/dist/common/adfile.c
U src/sys/external/bsd/acpica/dist/common/adisasm.c
U src/sys/external/bsd/acpica/dist/common/adwalk.c
U src/sys/external/bsd/acpica/dist/common/ahids.c
U src/sys/external/bsd/acpica/dist/common/ahpredef.c
U src/sys/external/bsd/acpica/dist/common/ahtable.c
U src/sys/external/bsd/acpica/dist/common/ahuuids.c
U src/sys/external/bsd/acpica/dist/common/cmfsize.c
U src/sys/external/bsd/acpica/dist/common/dmextern.c
U src/sys/external/bsd/acpica/dist/common/dmrestag.c
U src/sys/external/bsd/acpica/dist/common/dmswitch.c
U src/sys/external/bsd/acpica/dist/common/dmtable.c
U src/sys/external/bsd/acpica/dist/common/dmtables.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump1.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump2.c
U src/sys/external/bsd/acpica/dist/common/dmtbdump3.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo1.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo2.c
U src/sys/external/bsd/acpica/dist/common/dmtbinfo3.c
U src/sys/external/bsd/acpica/dist/common/getopt.c
U 

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

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 23:04:09 UTC 2018

Modified Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts

Log Message:
Pinebook is not based on Pine64, so do not derive from its dts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts

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/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.4 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.5
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.4	Sat Apr 28 11:49:48 2018
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts	Fri May  4 23:04:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.4 2018/04/28 11:49:48 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.5 2018/05/04 23:04:09 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -26,16 +26,26 @@
  * SUCH DAMAGE.
  */
 
-#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts"
+/dts-v1/;
+
+#include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi"
 #include "sun50i-a64.dtsi"
 
+#include 
 #include 
+#include 
 
 / {
 	model = "Pine64 Pinebook";
 	compatible = "pine64,pinebook", "allwinner,sun50i-a64";
 
+	aliases {
+		serial0 = 
+	};
+
 	chosen {
+		stdout-path = "serial0:115200n8";
+
 		framebuffer@0 {
 			allwinner,pipeline = "mixer0-lcd0";
 		};
@@ -52,6 +62,41 @@
 			linux,can-disable;
 		};
 	};
+
+	reg_vcc3v3: vcc3v3 {
+		regulator-fixed;
+		regulator-name = "vcc3v3";
+		regulator-min-microvolt = <330>;
+		regulator-max-microvolt = <330>;
+	};
+};
+
+ {
+	status = "okay";
+};
+
+ {
+	status = "okay";
+};
+
+_otg {
+	dr_mode = "host";
+	status = "okay";
+
+};
+
+ {
+	status = "okay";
+};
+
+ {
+	pinctrl-names = "default";
+	pinctrl-0 = <_pins>;
+	vmmc-supply = <_vcc3v3>;
+	cd-gpios = < 5 6 GPIO_ACTIVE_LOW>;
+	disable-wp;
+	bus-width = <4>;
+	status = "okay";
 };
 
  {
@@ -63,3 +108,22 @@
 	cap-mmc-hw-reset;
 	status = "okay";
 };
+
+ {
+	pinctrl-names = "default";
+	pinctrl-0 = <_pins_a>;
+	status = "okay";
+};
+
+_rsb {
+	status = "okay";
+
+	axp803: pmic@3a3 {
+		compatible = "x-powers,axp803";
+		reg = <0x3a3>;
+		interrupt-parent = <_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+	};
+};
+
+#include "axp803.dtsi"



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

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 23:03:41 UTC 2018

Modified Files:
src/sys/arch/arm/dts: sun50i-a64.dtsi

Log Message:
Upstream dts specifies emac for sun50i-a64 now


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/sun50i-a64.dtsi

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



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

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 23:04:09 UTC 2018

Modified Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts

Log Message:
Pinebook is not based on Pine64, so do not derive from its dts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts

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



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

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 23:03:41 UTC 2018

Modified Files:
src/sys/arch/arm/dts: sun50i-a64.dtsi

Log Message:
Upstream dts specifies emac for sun50i-a64 now


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/dts/sun50i-a64.dtsi

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/dts/sun50i-a64.dtsi
diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.4 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.5
--- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.4	Thu Nov 30 21:36:45 2017
+++ src/sys/arch/arm/dts/sun50i-a64.dtsi	Fri May  4 23:03:41 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64.dtsi,v 1.4 2017/11/30 21:36:45 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64.dtsi,v 1.5 2018/05/04 23:03:41 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill 
@@ -39,39 +39,4 @@
 			status = "disabled";
 		};
 	};
-
-	soc {
-		emac: ethernet@1c3 {
-			compatible = "allwinner,sun50i-a64-emac";
-			reg = <0x01c3 0x104>, <0x01c00030 0x4>;
-			reg-names = "emac", "syscon";
-			interrupts = ;
-			resets = < RST_BUS_EMAC>;
-			reset-names = "ahb";
-			clocks = < CLK_BUS_EMAC>;
-			clock-names = "ahb";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-	};
-};
-
- {
-	rmii_pins: rmii_pins {
-		pins = "PD10", "PD11", "PD13", "PD14",
-		   "PD17", "PD18", "PD19", "PD20",
-		   "PD22", "PD23";
-		function = "emac";
-		drive-strength = <40>;
-	};
-
-	rgmii_pins: rgmii_pins {
-		pins = "PD8", "PD9", "PD10", "PD11",
-		   "PD12", "PD13", "PD15",
-		   "PD16", "PD17", "PD18", "PD19",
-		   "PD20", "PD21", "PD22", "PD23";
-		function = "emac";
-		drive-strength = <40>;
-	};
 };



Re: CVS commit: src/sys/kern

2018-05-04 Thread Joerg Sonnenberger
On Fri, May 04, 2018 at 03:56:59PM -0400, Christos Zoulas wrote:
> Module Name:  src
> Committed By: christos
> Date: Fri May  4 19:56:59 UTC 2018
> 
> Modified Files:
>   src/sys/kern: uipc_sem.c
> 
> Log Message:
> bump the pathname size to NAME_MAX as POSIX wants.

Placing NAME_MAX on the stack is not really desirable, is it?
I don't think POSIX really requires them to be allowed either, but the
spec is a bit unclear...

Joerg


re: CVS commit: src

2018-05-04 Thread matthew green
Sevan Janiyan writes:
> On 05/03/18 23:57, matthew green wrote:
> > not sure i want to publish this library as-is.
> 
> Anything that's screaming out that I could add to my todo list? (I still
> have more to do).

nothing off hand, but i remember being "not happy" about it as
an exposed interface.

> > please make it build private copy for bozohttpd(3lua) instead of
> > installing this for the whole to use.
>
> Sure, so create a new directory in src/lib for libbozohttpd, get the
> library to build with a new Makefile and set LIBISPRIVATE?

you could do this in the existing subdir i guess, rather than have
a new one for it.  but it doesn't really matter exactly how.

thanks!


.mrg.


CVS commit: src/sys

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 21:09:55 UTC 2018

Modified Files:
src/sys/arch/evbarm/conf: GENERIC64 SUNXI
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: axppmic.c
Removed Files:
src/sys/dev/i2c: axp806.c

Log Message:
Rename axp806pmic to axppmic, and add support for AXP803.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/SUNXI
cvs rdiff -u -r1.4 -r0 src/sys/dev/i2c/axp806.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/axppmic.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/i2c/files.i2c

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/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.10 src/sys/arch/evbarm/conf/GENERIC64:1.11
--- src/sys/arch/evbarm/conf/GENERIC64:1.10	Thu May  3 01:17:04 2018
+++ src/sys/arch/evbarm/conf/GENERIC64	Fri May  4 21:09:55 2018
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC64,v 1.10 2018/05/03 01:17:04 jmcneill Exp $
+#	$NetBSD: GENERIC64,v 1.11 2018/05/04 21:09:55 jmcneill Exp $
 #
 #	GENERIC ARM (aarch64) kernel
 #
@@ -209,8 +209,8 @@ titemp*		at iic?
 seeprom*	at iic?
 as3722pmic*	at iic?
 as3722reg*	at as3722pmic?
-axp806pmic*	at iic?			# AXP805/806 Power Management IC
-axp806reg*	at axp806pmic?
+axppmic*	at iic?			# X-Powers AXP Power Management IC
+axpreg*	at 	axppmic?
 max77620pmic*	at iic?
 pcf8563rtc*	at iic?			# PCF8563 RTC
 tcagpio*	at iic?

Index: src/sys/arch/evbarm/conf/SUNXI
diff -u src/sys/arch/evbarm/conf/SUNXI:1.69 src/sys/arch/evbarm/conf/SUNXI:1.70
--- src/sys/arch/evbarm/conf/SUNXI:1.69	Thu May  3 01:17:04 2018
+++ src/sys/arch/evbarm/conf/SUNXI	Fri May  4 21:09:55 2018
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: SUNXI,v 1.69 2018/05/03 01:17:04 jmcneill Exp $
+#	$NetBSD: SUNXI,v 1.70 2018/05/04 21:09:55 jmcneill Exp $
 #
 #	Allwinner sunxi family
 #
@@ -245,8 +245,8 @@ wskbd*		at tcakp? console ?
 axp20x*		at iic?			# AXP209 Power Management IC
 axp20xreg*	at axp20x?
 axp22x*		at iic?			# AXP221 Power Management IC
-axp806pmic* at iic?			# AXP805/806 Power Management IC
-axp806reg*  at axp806pmic?
+axppmic*	at iic?			# X-Powers AXP Power Management IC
+axpreg*		at axppmic?
 sy8106a*	at iic?			# Silergy SY81061 regulator
 pcf8563rtc*	at iic?			# PCF8563 RTC
 seeprom*	at iic?			# AT24Cxx Serial EEPROM

Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.89 src/sys/dev/i2c/files.i2c:1.90
--- src/sys/dev/i2c/files.i2c:1.89	Thu May  3 02:10:17 2018
+++ src/sys/dev/i2c/files.i2c	Fri May  4 21:09:55 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i2c,v 1.89 2018/05/03 02:10:17 jmcneill Exp $
+#	$NetBSD: files.i2c,v 1.90 2018/05/04 21:09:55 jmcneill Exp $
 
 obsolete defflag	opt_i2cbus.h		I2C_SCAN
 define	i2cbus { }
@@ -232,12 +232,12 @@ device	axp22x: sysmon_envsys
 attach	axp22x at iic
 file	dev/i2c/axp22x.c			axp22x
 
-# AXP806 Power Management Unit
-device	axp806pmic { }: sysmon_taskq
-device	axp806reg: axp806pmic
-attach	axp806pmic at iic
-attach	axp806reg at axp806pmic
-file	dev/i2c/axp806.c			axp806pmic	needs-flag
+# X-Powers AXP Power Management IC
+device	axppmic { }: sysmon_taskq
+device	axpreg: axppmic
+attach	axppmic at iic
+attach	axpreg at axppmic
+file	dev/i2c/axppmic.c			axppmic
 
 # AXP809 Power Management Unit
 device	axp809pm

Added files:

Index: src/sys/dev/i2c/axppmic.c
diff -u /dev/null src/sys/dev/i2c/axppmic.c:1.1
--- /dev/null	Fri May  4 21:09:55 2018
+++ src/sys/dev/i2c/axppmic.c	Fri May  4 21:09:55 2018
@@ -0,0 +1,516 @@
+/* $NetBSD: axppmic.c,v 1.1 2018/05/04 21:09:55 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2014-2018 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 

CVS commit: src/sys

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 21:09:55 UTC 2018

Modified Files:
src/sys/arch/evbarm/conf: GENERIC64 SUNXI
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: axppmic.c
Removed Files:
src/sys/dev/i2c: axp806.c

Log Message:
Rename axp806pmic to axppmic, and add support for AXP803.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/evbarm/conf/SUNXI
cvs rdiff -u -r1.4 -r0 src/sys/dev/i2c/axp806.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/axppmic.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/i2c/files.i2c

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



CVS commit: src/sys/dev/i2c

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 20:26:50 UTC 2018

Modified Files:
src/sys/dev/i2c: axp806.c

Log Message:
Fix pasto


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/axp806.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/i2c/axp806.c
diff -u src/sys/dev/i2c/axp806.c:1.3 src/sys/dev/i2c/axp806.c:1.4
--- src/sys/dev/i2c/axp806.c:1.3	Thu May  3 02:10:17 2018
+++ src/sys/dev/i2c/axp806.c	Fri May  4 20:26:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: axp806.c,v 1.3 2018/05/03 02:10:17 jmcneill Exp $ */
+/* $NetBSD: axp806.c,v 1.4 2018/05/04 20:26:50 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2018 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: axp806.c,v 1.3 2018/05/03 02:10:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: axp806.c,v 1.4 2018/05/04 20:26:50 jmcneill Exp $");
 
 #include 
 #include 
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: axp806.c,v 1
 #define	 AXP_POWER_DISABLE_CTRL	__BIT(7)
 #define AXP_WAKEUP_PINFUNC_REG	0x35
 #define AXP_POK_SETTING_REG	0x36
-#define AXP_MODE_SEL_REG	0axp806_power_funcsx3e
+#define AXP_MODE_SEL_REG	0x3e
 #define AXP_SPECIAL_CTRL_REG	0x3f
 #define AXP_IRQ_ENABLE1_REG	0x40
 #define AXP_IRQ_ENABLE2_REG	0x41



CVS commit: src/lib/libedit

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 20:38:27 UTC 2018

Modified Files:
src/lib/libedit: filecomplete.c

Log Message:
fix uninitialized


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/filecomplete.c

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

Modified files:

Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.50 src/lib/libedit/filecomplete.c:1.51
--- src/lib/libedit/filecomplete.c:1.50	Fri May  4 12:39:14 2018
+++ src/lib/libedit/filecomplete.c	Fri May  4 16:38:26 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.c,v 1.50 2018/05/04 16:39:14 abhinav Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.51 2018/05/04 20:38:26 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.50 2018/05/04 16:39:14 abhinav Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.51 2018/05/04 20:38:26 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -552,7 +552,9 @@ find_word_to_complete(const wchar_t * cu
 		default:
 			cursor_at_quote = 0;
 		}
-	}
+	} else
+		cursor_at_quote = 0;
+
 	while (ctemp > buffer
 	&& !wcschr(word_break, ctemp[-1])
 	&& (!special_prefixes || !wcschr(special_prefixes, ctemp[-1])))



CVS commit: src/lib/libedit

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 20:38:27 UTC 2018

Modified Files:
src/lib/libedit: filecomplete.c

Log Message:
fix uninitialized


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/filecomplete.c

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



CVS commit: src/lib/librt

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 20:28:51 UTC 2018

Modified Files:
src/lib/librt: sem_open.3

Log Message:
It is not a bug that we are only allowing /name. Update for newly allowed
length.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librt/sem_open.3

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



CVS commit: src/lib/librt

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 20:28:51 UTC 2018

Modified Files:
src/lib/librt: sem_open.3

Log Message:
It is not a bug that we are only allowing /name. Update for newly allowed
length.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/librt/sem_open.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/librt/sem_open.3
diff -u src/lib/librt/sem_open.3:1.6 src/lib/librt/sem_open.3:1.7
--- src/lib/librt/sem_open.3:1.6	Thu Mar  8 17:12:52 2012
+++ src/lib/librt/sem_open.3	Fri May  4 16:28:51 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: sem_open.3,v 1.6 2012/03/08 22:12:52 wiz Exp $
+.\" $NetBSD: sem_open.3,v 1.7 2018/05/04 20:28:51 christos Exp $
 .\"
 .\" Copyright (C) 2000 Jason Evans .
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\" From: FreeBSD: src/lib/libc/gen/sem_open.3,v 1.12 2004/07/02 16:45:56 ru
 .\"
-.Dd February 29, 2012
+.Dd May 4, 2018
 .Dt SEM_OPEN 3
 .Os
 .Sh NAME
@@ -150,11 +150,15 @@ are set but the semaphore already exists
 .It Bq Er EINTR
 The call was interrupted by a signal.
 .It Bq Er EINVAL
+The 
+.Fa name 
+argument does not begin with a
+.Sq /
+or contains more slashes.
+This is implementation-specific behavior and allowed by
+.St -p1003.1-96 .
+.It Bq Er EINVAL
 The
-.Fn sem_open
-operation is not supported for the given
-.Fa name ;
-or the
 .Fa value
 argument is greater than
 .Dv SEM_VALUE_MAX .
@@ -162,9 +166,11 @@ argument is greater than
 .\".It Bq Er EMFILE
 .\"Too many semaphores are in use by this process.
 .It Bq Er ENAMETOOLONG
-The
+The specified
 .Fa name
-argument is too long.
+is longer than
+.Dv NAME_MAX ,
+or longer than the implementing filesystem will allow.
 .It Bq Er ENFILE
 The system limit on semaphores has been reached.
 .It Bq Er ENOENT
@@ -193,7 +199,9 @@ Permission is denied to unlink the semap
 .It Bq Er ENAMETOOLONG
 The specified
 .Fa name
-is too long.
+is longer than
+.Dv NAME_MAX ,
+or longer than the implementing filesystem will allow.
 .It Bq Er ENOENT
 The named semaphore does not exist.
 .El
@@ -218,11 +226,3 @@ functions conform to
 .Sh HISTORY
 Support for named semaphores first appeared in
 .Nx 2.0 .
-.Sh BUGS
-This implementation places strict requirements on the value of
-.Fa name :
-it must begin with a slash
-.Pq Ql / ,
-contain no other slash characters,
-and be less than 14 characters in length
-not including the terminating null character.



CVS commit: src/sys/dev/i2c

2018-05-04 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Fri May  4 20:26:50 UTC 2018

Modified Files:
src/sys/dev/i2c: axp806.c

Log Message:
Fix pasto


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/axp806.c

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



CVS commit: src/share/mk

2018-05-04 Thread Tohru Nishimura
Module Name:src
Committed By:   nisimura
Date:   Fri May  4 20:25:04 UTC 2018

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
remove duplicated cobalt in MACHINES.mips= line.


To generate a diff of this commit:
cvs rdiff -u -r1.1058 -r1.1059 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.1058 src/share/mk/bsd.own.mk:1.1059
--- src/share/mk/bsd.own.mk:1.1058	Tue Apr 24 23:29:13 2018
+++ src/share/mk/bsd.own.mk	Fri May  4 20:25:04 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1058 2018/04/24 23:29:13 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.1059 2018/05/04 20:25:04 nisimura Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -608,7 +608,7 @@ MACHINES.hppa=		hppa
 MACHINES.m68000=	sun2
 MACHINES.m68k=		amiga atari cesfic hp300 luna68k mac68k \
 			news68k next68k sun3 x68k
-MACHINES.mips=		arc cobalt algor cobalt emips evbmips ews4800mips \
+MACHINES.mips=		algor arc cobalt emips evbmips ews4800mips \
 			hpcmips mipsco newsmips pmax sbmips sgimips
 MACHINES.or1k=		or1k
 MACHINES.powerpc=	amigappc bebox evbppc ibmnws macppc mvmeppc \



CVS commit: src/share/mk

2018-05-04 Thread Tohru Nishimura
Module Name:src
Committed By:   nisimura
Date:   Fri May  4 20:25:04 UTC 2018

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
remove duplicated cobalt in MACHINES.mips= line.


To generate a diff of this commit:
cvs rdiff -u -r1.1058 -r1.1059 src/share/mk/bsd.own.mk

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



CVS commit: src/sys/kern

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 19:56:59 UTC 2018

Modified Files:
src/sys/kern: uipc_sem.c

Log Message:
bump the pathname size to NAME_MAX as POSIX wants.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/uipc_sem.c

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



CVS commit: src/sys/kern

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 19:56:59 UTC 2018

Modified Files:
src/sys/kern: uipc_sem.c

Log Message:
bump the pathname size to NAME_MAX as POSIX wants.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/uipc_sem.c

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

Modified files:

Index: src/sys/kern/uipc_sem.c
diff -u src/sys/kern/uipc_sem.c:1.48 src/sys/kern/uipc_sem.c:1.49
--- src/sys/kern/uipc_sem.c:1.48	Thu Nov 30 15:25:55 2017
+++ src/sys/kern/uipc_sem.c	Fri May  4 15:56:58 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_sem.c,v 1.48 2017/11/30 20:25:55 christos Exp $	*/
+/*	$NetBSD: uipc_sem.c,v 1.49 2018/05/04 19:56:58 christos Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.48 2017/11/30 20:25:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.49 2018/05/04 19:56:58 christos Exp $");
 
 #include 
 #include 
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v
 
 MODULE(MODULE_CLASS_MISC, ksem, NULL);
 
-#define	SEM_MAX_NAMELEN		14
+#define	SEM_MAX_NAMELEN		NAME_MAX
 
 #define	SEM_NSEMS_MAX		256
 #define	KS_UNLINKED		0x01



CVS commit: src/libexec/httpd/lua

2018-05-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Fri May  4 19:45:27 UTC 2018

Modified Files:
src/libexec/httpd/lua: glue.c

Log Message:
Do not try and process empty requests. This resolves a crash when issuing a
carriage return to read_request() in foreground mode.
In the C daemon, a NULL check is performed on bozo_read_request in main.c
before moving on to bozo_process_request & bozo_clean_request. Here,
process_request & clean_request just return instead.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/libexec/httpd/lua/glue.c

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

Modified files:

Index: src/libexec/httpd/lua/glue.c
diff -u src/libexec/httpd/lua/glue.c:1.3 src/libexec/httpd/lua/glue.c:1.4
--- src/libexec/httpd/lua/glue.c:1.3	Tue May  1 23:51:53 2018
+++ src/libexec/httpd/lua/glue.c	Fri May  4 19:45:27 2018
@@ -155,6 +155,9 @@ l_bozo_process_request(lua_State *L)
 	bozo_httpreq_t	*req;
 
 	req = lua_touserdata(L, 1);
+	if (req == NULL) {
+		return 0;
+	}
 	bozo_process_request(req);
 	lua_pushnumber(L, 1);
 	return 1;
@@ -167,6 +170,9 @@ l_bozo_clean_request(lua_State *L)
 	bozo_httpreq_t	*req;
 
 	req = lua_touserdata(L, 1);
+	if (req == NULL) {
+		return 0;
+	}
 	bozo_clean_request(req);
 	lua_pushnumber(L, 1);
 	return 1;



CVS commit: src/libexec/httpd/lua

2018-05-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Fri May  4 19:45:27 UTC 2018

Modified Files:
src/libexec/httpd/lua: glue.c

Log Message:
Do not try and process empty requests. This resolves a crash when issuing a
carriage return to read_request() in foreground mode.
In the C daemon, a NULL check is performed on bozo_read_request in main.c
before moving on to bozo_process_request & bozo_clean_request. Here,
process_request & clean_request just return instead.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/libexec/httpd/lua/glue.c

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



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

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 19:11:59 UTC 2018

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

Log Message:
fix bozo issues:
- sort
- add lintlib


To generate a diff of this commit:
cvs rdiff -u -r1.2189 -r1.2190 src/distrib/sets/lists/comp/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2189 src/distrib/sets/lists/comp/mi:1.2190
--- src/distrib/sets/lists/comp/mi:1.2189	Thu May  3 18:27:59 2018
+++ src/distrib/sets/lists/comp/mi	Fri May  4 15:11:59 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2189 2018/05/03 22:27:59 sevan Exp $
+#	$NetBSD: mi,v 1.2190 2018/05/04 19:11:59 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -3282,9 +3282,6 @@
 ./usr/lib/libatf_p.acomp-obsolete		obsolete
 ./usr/lib/libavl.acomp-zfs-lib		compatfile,zfs
 ./usr/lib/libavl_p.acomp-zfs-proflib	compatfile,profile,zfs
-./usr/lib/libbozohttpd.a			comp-c-lib		compatfile
-./usr/lib/libbozohttpd_p.a			comp-c-lib		compatfile
-./usr/lib/libbozohttpd_pic.a			comp-c-lib		compatfile
 ./usr/lib/libbfd.acomp-obsolete		obsolete
 ./usr/lib/libbind9.acomp-bind-lib		compatfile
 ./usr/lib/libbind9_p.acomp-bind-proflib	compatfile,profile
@@ -3292,6 +3289,9 @@
 ./usr/lib/libblacklist_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbluetooth.a			comp-c-lib		compatfile
 ./usr/lib/libbluetooth_p.a			comp-c-proflib		compatfile,profile
+./usr/lib/libbozohttpd.a			comp-c-lib		compatfile
+./usr/lib/libbozohttpd_p.a			comp-c-lib		compatfile
+./usr/lib/libbozohttpd_pic.a			comp-c-lib		compatfile
 ./usr/lib/libbsdmalloc.a			comp-c-lib		compatfile
 ./usr/lib/libbsdmalloc_p.a			comp-c-proflib		compatfile,profile
 ./usr/lib/libbz2.acomp-c-lib		compatfile
@@ -3797,6 +3797,7 @@
 ./usr/libdata/lint/llib-lbind9.ln		comp-bind-lintlib	lint
 ./usr/libdata/lint/llib-lblacklist.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lbluetooth.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lbozohttpd.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lbsdmalloc.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lbz2.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lc.ln			comp-c-lintlib		lint



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

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 19:11:59 UTC 2018

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

Log Message:
fix bozo issues:
- sort
- add lintlib


To generate a diff of this commit:
cvs rdiff -u -r1.2189 -r1.2190 src/distrib/sets/lists/comp/mi

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



CVS commit: src/libexec/httpd

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 18:07:23 UTC 2018

Modified Files:
src/libexec/httpd: bozohttpd.h

Log Message:
fix the rest of the compilers.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/libexec/httpd/bozohttpd.h

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

Modified files:

Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.48 src/libexec/httpd/bozohttpd.h:1.49
--- src/libexec/httpd/bozohttpd.h:1.48	Fri May  4 14:06:44 2018
+++ src/libexec/httpd/bozohttpd.h	Fri May  4 14:07:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.h,v 1.48 2018/05/04 18:06:44 christos Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.49 2018/05/04 18:07:23 christos Exp $	*/
 
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -210,6 +210,9 @@ typedef struct bozoprefs_t {
 #if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__lint__)
 #define BOZO_PRINTFLIKE(x,y) __attribute__((__format__(__printf__, x,y)))
 #define BOZO_DEAD __attribute__((__noreturn__))
+#else
+#define BOZO_PRINTFLIKE(x,y)
+#define BOZO_DEAD
 #endif
 
 #ifndef NO_DEBUG



CVS commit: src/libexec/httpd

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 18:07:23 UTC 2018

Modified Files:
src/libexec/httpd: bozohttpd.h

Log Message:
fix the rest of the compilers.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/libexec/httpd/bozohttpd.h

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



CVS commit: src/libexec/httpd

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 18:06:44 UTC 2018

Modified Files:
src/libexec/httpd: bozohttpd.h

Log Message:
fix lint


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/libexec/httpd/bozohttpd.h

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

Modified files:

Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.47 src/libexec/httpd/bozohttpd.h:1.48
--- src/libexec/httpd/bozohttpd.h:1.47	Tue Jan 31 09:36:09 2017
+++ src/libexec/httpd/bozohttpd.h	Fri May  4 14:06:44 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.h,v 1.47 2017/01/31 14:36:09 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.48 2018/05/04 18:06:44 christos Exp $	*/
 
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -207,7 +207,7 @@ typedef struct bozoprefs_t {
 
 #define	strornull(x)	((x) ? (x) : "")
 
-#if defined(__GNUC__) && __GNUC__ >= 3
+#if (defined(__GNUC__) && __GNUC__ >= 3) || defined(__lint__)
 #define BOZO_PRINTFLIKE(x,y) __attribute__((__format__(__printf__, x,y)))
 #define BOZO_DEAD __attribute__((__noreturn__))
 #endif



CVS commit: src/libexec/httpd

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 18:06:44 UTC 2018

Modified Files:
src/libexec/httpd: bozohttpd.h

Log Message:
fix lint


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/libexec/httpd/bozohttpd.h

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



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

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:20:34 UTC 2018

Modified Files:
src/sys/arch/macppc/dev: snapper.c

Log Message:
use obio_space_map() to map DMA registers, now this works on both G5 and
32bit hardware


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/macppc/dev/snapper.c

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



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

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:20:34 UTC 2018

Modified Files:
src/sys/arch/macppc/dev: snapper.c

Log Message:
use obio_space_map() to map DMA registers, now this works on both G5 and
32bit hardware


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/macppc/dev/snapper.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/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.46 src/sys/arch/macppc/dev/snapper.c:1.47
--- src/sys/arch/macppc/dev/snapper.c:1.46	Thu Mar 29 18:34:32 2018
+++ src/sys/arch/macppc/dev/snapper.c	Fri May  4 17:20:34 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: snapper.c,v 1.46 2018/03/29 18:34:32 macallan Exp $	*/
+/*	$NetBSD: snapper.c,v 1.47 2018/05/04 17:20:34 macallan Exp $	*/
 /*	Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp	*/
 /*	Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp		*/
 
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.46 2018/03/29 18:34:32 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.47 2018/05/04 17:20:34 macallan Exp $");
 
 #include 
 #include 
@@ -788,10 +788,8 @@ snapper_attach(device_t parent, device_t
 #endif
 
 	bus_space_map(sc->sc_tag, reg[0], reg[1], 0, >sc_bsh);
-	bus_space_map(sc->sc_tag, reg[2], reg[3],
-	BUS_SPACE_MAP_LINEAR, >sc_odmah);
-	bus_space_map(sc->sc_tag, reg[4], reg[5],
-	BUS_SPACE_MAP_LINEAR, >sc_idmah);
+	obio_space_map(reg[2], reg[3], >sc_odmah);
+	obio_space_map(reg[4], reg[5], >sc_idmah);
 
 	sc->sc_odma = bus_space_vaddr(sc->sc_tag, sc->sc_odmah);
 	sc->sc_idma = bus_space_vaddr(sc->sc_tag, sc->sc_idmah);



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

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:17:48 UTC 2018

Modified Files:
src/sys/arch/macppc/dev: obio.c obiovar.h

Log Message:
map 64KB register space on G5, provide function to bus_space_subregion()
from this area so we don't run into mapping conflicts on G5
Not really relevant on 32bit where we BAT-map everything


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/macppc/dev/obio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/dev/obiovar.h

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

Modified files:

Index: src/sys/arch/macppc/dev/obio.c
diff -u src/sys/arch/macppc/dev/obio.c:1.44 src/sys/arch/macppc/dev/obio.c:1.45
--- src/sys/arch/macppc/dev/obio.c:1.44	Thu Mar 29 06:28:12 2018
+++ src/sys/arch/macppc/dev/obio.c	Fri May  4 17:17:48 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: obio.c,v 1.44 2018/03/29 06:28:12 macallan Exp $	*/
+/*	$NetBSD: obio.c,v 1.45 2018/05/04 17:17:48 macallan Exp $	*/
 
 /*-
  * Copyright (C) 1998	Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.44 2018/03/29 06:28:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.45 2018/05/04 17:17:48 macallan Exp $");
 
 #include 
 #include 
@@ -162,7 +162,7 @@ obio_attach(device_t parent, device_t se
 	case PCI_PRODUCT_APPLE_K2:
 	case PCI_PRODUCT_APPLE_SHASTA:
 		node = OF_finddevice("mac-io");
-		map_size = 0x8000;
+		map_size = 0x1;
 		break;
 
 	default:
@@ -337,6 +337,15 @@ uint8_t obio_read_1(int offset)
 	return bus_space_read_1(obio0->sc_tag, obio0->sc_bh, offset);
 }
 
+int
+obio_space_map(bus_addr_t addr, bus_size_t size, bus_space_handle_t *bh)
+{
+	if (obio0 == NULL)
+		return 0xff;
+	return bus_space_subregion(obio0->sc_tag, obio0->sc_bh,
+	addr & 0xf, size, bh);
+}
+	
 #ifdef OBIO_SPEED_CONTROL
 
 static void

Index: src/sys/arch/macppc/dev/obiovar.h
diff -u src/sys/arch/macppc/dev/obiovar.h:1.2 src/sys/arch/macppc/dev/obiovar.h:1.3
--- src/sys/arch/macppc/dev/obiovar.h:1.2	Fri Sep 26 03:40:26 2008
+++ src/sys/arch/macppc/dev/obiovar.h	Fri May  4 17:17:48 2018
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: obiovar.h,v 1.2 2008/09/26 03:40:26 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obiovar.h,v 1.3 2018/05/04 17:17:48 macallan Exp $");
 
 #ifndef OBIOVAR_H
 #define OBIOVAR_H
@@ -41,6 +41,7 @@ void obio_write_4(int, uint32_t);
 void obio_write_1(int, uint8_t);
 uint32_t obio_read_4(int);
 uint8_t obio_read_1(int);
+int obio_space_map(bus_addr_t, bus_size_t, bus_space_handle_t *);
 
 /* some common offsets */
 #define HEATHROW_FCR	0x38



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

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:17:48 UTC 2018

Modified Files:
src/sys/arch/macppc/dev: obio.c obiovar.h

Log Message:
map 64KB register space on G5, provide function to bus_space_subregion()
from this area so we don't run into mapping conflicts on G5
Not really relevant on 32bit where we BAT-map everything


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/macppc/dev/obio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/dev/obiovar.h

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



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

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:15:23 UTC 2018

Modified Files:
src/sys/arch/macppc/dev: deq.c

Log Message:
don't cut off upper bits in the i2c address, ki2c knows how to deal with
them now


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/dev/deq.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/dev/deq.c
diff -u src/sys/arch/macppc/dev/deq.c:1.12 src/sys/arch/macppc/dev/deq.c:1.13
--- src/sys/arch/macppc/dev/deq.c:1.12	Wed Sep 27 22:31:53 2017
+++ src/sys/arch/macppc/dev/deq.c	Fri May  4 17:15:23 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: deq.c,v 1.12 2017/09/27 22:31:53 macallan Exp $	*/
+/*	$NetBSD: deq.c,v 1.13 2018/05/04 17:15:23 macallan Exp $	*/
 
 /*-
  * Copyright (C) 2005 Michael Lorenz
@@ -32,7 +32,7 @@
  */
  
 #include 
-__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.12 2017/09/27 22:31:53 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: deq.c,v 1.13 2018/05/04 17:15:23 macallan Exp $");
 
 #include 
 #include 
@@ -87,7 +87,7 @@ deq_attach(device_t parent, device_t sel
 	sc->sc_dev = self;
 	sc->sc_node = ia->ia_cookie;
 	sc->sc_parent = parent;
-	sc->sc_address = (ia->ia_addr & 0x7f);
+	sc->sc_address = ia->ia_addr;
 	sc->sc_i2c = ia->ia_tag;
 	if (OF_getprop(sc->sc_node, "compatible", name, 256) <= 0) {
 		/* deq has no 'compatible' on my iBook G4 */



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

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:15:23 UTC 2018

Modified Files:
src/sys/arch/macppc/dev: deq.c

Log Message:
don't cut off upper bits in the i2c address, ki2c knows how to deal with
them now


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/dev/deq.c

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



CVS commit: src/sys/arch/powerpc/powerpc

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:13:08 UTC 2018

Modified Files:
src/sys/arch/powerpc/powerpc: locore_subr.S

Log Message:
when spinning up secondary CPUs, put them in bridge mode if the primary cpu is


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/powerpc/locore_subr.S

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/powerpc/powerpc/locore_subr.S
diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.55 src/sys/arch/powerpc/powerpc/locore_subr.S:1.56
--- src/sys/arch/powerpc/powerpc/locore_subr.S:1.55	Tue Feb 28 17:35:29 2017
+++ src/sys/arch/powerpc/powerpc/locore_subr.S	Fri May  4 17:13:08 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_subr.S,v 1.55 2017/02/28 17:35:29 chs Exp $	*/
+/*	$NetBSD: locore_subr.S,v 1.56 2018/05/04 17:13:08 macallan Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -526,6 +526,18 @@ _ENTRY(cpu_lwp_bootstrap)
 ENTRY(cpu_spinup_trampoline)
 	li	%r0,0
 	mtmsr	%r0
+
+	lis	%r5,oeacpufeat@ha
+	lwz	%r5,oeacpufeat@l(%r5)
+	andi.	%r5,%r5,OEACPU_64_BRIDGE
+	beq	6f
+	sync
+	slbia
+	sync
+	isync
+	clrldi	%r0,%r0,32
+	mtmsrd	%r0
+6:
 	isync
 
 	lis	%r4,_C_LABEL(cpu_hatch_stack)@ha



CVS commit: src/sys/arch/powerpc/powerpc

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:13:08 UTC 2018

Modified Files:
src/sys/arch/powerpc/powerpc: locore_subr.S

Log Message:
when spinning up secondary CPUs, put them in bridge mode if the primary cpu is


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/powerpc/locore_subr.S

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



CVS commit: src/sys/arch/powerpc

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:01:29 UTC 2018

Modified Files:
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/oea: cpu_subr.c

Log Message:
save & restore HID4 and HID5, zero SPR_HIOR on 970


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/powerpc/oea/cpu_subr.c

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

Modified files:

Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.104 src/sys/arch/powerpc/include/cpu.h:1.105
--- src/sys/arch/powerpc/include/cpu.h:1.104	Thu Mar 22 15:18:05 2018
+++ src/sys/arch/powerpc/include/cpu.h	Fri May  4 17:01:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.104 2018/03/22 15:18:05 macallan Exp $	*/
+/*	$NetBSD: cpu.h,v 1.105 2018/05/04 17:01:29 macallan Exp $	*/
 
 /*
  * Copyright (C) 1999 Wolfgang Solfrank.
@@ -164,6 +164,8 @@ struct cpu_hatch_data {
 	uint32_t hatch_tbl;
 #if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
 	uint64_t hatch_hid0;
+	uint64_t hatch_hid4;
+	uint64_t hatch_hid5;
 #else
 	uint32_t hatch_hid0;
 #endif

Index: src/sys/arch/powerpc/oea/cpu_subr.c
diff -u src/sys/arch/powerpc/oea/cpu_subr.c:1.92 src/sys/arch/powerpc/oea/cpu_subr.c:1.93
--- src/sys/arch/powerpc/oea/cpu_subr.c:1.92	Thu Mar 29 16:19:46 2018
+++ src/sys/arch/powerpc/oea/cpu_subr.c	Fri May  4 17:01:29 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_subr.c,v 1.92 2018/03/29 16:19:46 macallan Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.93 2018/05/04 17:01:29 macallan Exp $	*/
 
 /*-
  * Copyright (c) 2001 Matt Thomas.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.92 2018/03/29 16:19:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.93 2018/05/04 17:01:29 macallan Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_ppccache.h"
@@ -1315,6 +1315,11 @@ cpu_spinup(device_t self, struct cpu_inf
 	/* copy special registers */
 
 	h->hatch_hid0 = mfspr(SPR_HID0);
+#if defined(PPC_OEA64_BRIDGE) || defined (_ARCH_PPC64)
+	h->hatch_hid4 = mfspr(SPR_HID4);
+	h->hatch_hid5 = mfspr(SPR_HID5);
+	printf("HIDs: %016llx %016llx\n", h->hatch_hid4, h->hatch_hid5);
+#endif
 
 	__asm volatile ("mfsdr1 %0" : "=r"(h->hatch_sdr1));
 	for (i = 0; i < 16; i++) {
@@ -1432,7 +1437,11 @@ cpu_hatch(void)
 
 #ifdef PPC_OEA64_BRIDGE
 	if ((oeacpufeat & OEACPU_64_BRIDGE) != 0) {
+
 		mtspr64(SPR_HID0, h->hatch_hid0);
+		mtspr64(SPR_HID4, h->hatch_hid4);
+		mtspr64(SPR_HID5, h->hatch_hid5);
+		mtspr64(SPR_HIOR, 0);
 	} else
 #endif
 		mtspr(SPR_HID0, h->hatch_hid0);



CVS commit: src/sys/arch/powerpc

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 17:01:29 UTC 2018

Modified Files:
src/sys/arch/powerpc/include: cpu.h
src/sys/arch/powerpc/oea: cpu_subr.c

Log Message:
save & restore HID4 and HID5, zero SPR_HIOR on 970


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/powerpc/include/cpu.h
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/powerpc/oea/cpu_subr.c

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



CVS commit: src/sys/arch/powerpc/include/oea

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 16:57:14 UTC 2018

Modified Files:
src/sys/arch/powerpc/include/oea: spr.h

Log Message:
add Hardware Interrupt Offset Register found on 970


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/oea/spr.h

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



CVS commit: src/sys/arch/powerpc/include/oea

2018-05-04 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Fri May  4 16:57:14 UTC 2018

Modified Files:
src/sys/arch/powerpc/include/oea: spr.h

Log Message:
add Hardware Interrupt Offset Register found on 970


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/include/oea/spr.h

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

Modified files:

Index: src/sys/arch/powerpc/include/oea/spr.h
diff -u src/sys/arch/powerpc/include/oea/spr.h:1.4 src/sys/arch/powerpc/include/oea/spr.h:1.5
--- src/sys/arch/powerpc/include/oea/spr.h:1.4	Fri Feb 16 18:04:06 2018
+++ src/sys/arch/powerpc/include/oea/spr.h	Fri May  4 16:57:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: spr.h,v 1.4 2018/02/16 18:04:06 macallan Exp $	*/
+/*	$NetBSD: spr.h,v 1.5 2018/05/04 16:57:14 macallan Exp $	*/
 
 #ifndef _POWERPC_OEA_SPR_H_
 #define	_POWERPC_OEA_SPR_H_
@@ -85,6 +85,7 @@
 #define   MPCe300c1		  0x8083
 #define   MPCe300c2		  0x8084
 #define   MPCe300c3		  0x8085
+#define SPR_HIOR		0x137	/*  HW Interrupt Offset (970) */
 
 #define	SPR_IBAT0U		0x210	/* ..68 Instruction BAT Reg 0 Upper */
 #define	SPR_IBAT0L		0x211	/* ..6. Instruction BAT Reg 0 Lower */



CVS commit: src/lib/libedit

2018-05-04 Thread Abhinav Upadhyay
Module Name:src
Committed By:   abhinav
Date:   Fri May  4 16:39:15 UTC 2018

Modified Files:
src/lib/libedit: filecomplete.c
src/lib/libedit/TEST: test_filecompletion.c

Log Message:
Handle filename autocompletion when the cursor is at a backslash or quote 
character

For example, handle following case:
$ touch 'foo bar'
$ ls foo\ --> $ ls foo\ bar

Also add test cases for this.

Thanks to Christos for review


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libedit/TEST/test_filecompletion.c

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

Modified files:

Index: src/lib/libedit/filecomplete.c
diff -u src/lib/libedit/filecomplete.c:1.49 src/lib/libedit/filecomplete.c:1.50
--- src/lib/libedit/filecomplete.c:1.49	Wed May  2 08:45:03 2018
+++ src/lib/libedit/filecomplete.c	Fri May  4 16:39:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: filecomplete.c,v 1.49 2018/05/02 08:45:03 abhinav Exp $	*/
+/*	$NetBSD: filecomplete.c,v 1.50 2018/05/04 16:39:14 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: filecomplete.c,v 1.49 2018/05/02 08:45:03 abhinav Exp $");
+__RCSID("$NetBSD: filecomplete.c,v 1.50 2018/05/04 16:39:14 abhinav Exp $");
 #endif /* not lint && not SCCSID */
 
 #include 
@@ -528,6 +528,48 @@ fn_display_match_list(EditLine * el, cha
 	}
 }
 
+static wchar_t *
+find_word_to_complete(const wchar_t * cursor, const wchar_t * buffer,
+const wchar_t * word_break, const wchar_t * special_prefixes, size_t * length)
+{
+	/* We now look backwards for the start of a filename/variable word */
+	const wchar_t *ctemp = cursor;
+	int cursor_at_quote;
+	size_t len;
+	wchar_t *temp;
+
+	/* if the cursor is placed at a slash or a quote, we need to find the
+	 * word before it
+	 */
+	if (ctemp > buffer) {
+		switch (ctemp[-1]) {
+		case '\\':
+		case '\'':
+		case '"':
+			cursor_at_quote = 1;
+			ctemp--;
+			break;
+		default:
+			cursor_at_quote = 0;
+		}
+	}
+	while (ctemp > buffer
+	&& !wcschr(word_break, ctemp[-1])
+	&& (!special_prefixes || !wcschr(special_prefixes, ctemp[-1])))
+		ctemp--;
+
+	len = (size_t) (cursor - ctemp - cursor_at_quote);
+	temp = el_malloc((len + 1) * sizeof(*temp));
+	if (temp == NULL)
+		return NULL;
+	(void) wcsncpy(temp, ctemp, len);
+	temp[len] = '\0';
+	if (cursor_at_quote)
+		len++;
+	*length = len;
+	return temp;
+}
+
 /*
  * Complete the word at or before point,
  * 'what_to_do' says what to do with the completion.
@@ -551,7 +593,6 @@ fn_complete(EditLine *el,
 	const LineInfoW *li;
 	wchar_t *temp;
 	char **matches;
-	const wchar_t *ctemp;
 	size_t len;
 	int what_to_do = '\t';
 	int retval = CC_NORM;
@@ -568,20 +609,11 @@ fn_complete(EditLine *el,
 	if (!app_func)
 		app_func = append_char_function;
 
-	/* We now look backwards for the start of a filename/variable word */
 	li = el_wline(el);
-	ctemp = li->cursor;
-	while (ctemp > li->buffer
-	&& !wcschr(word_break, ctemp[-1])
-	&& (!special_prefixes || !wcschr(special_prefixes, ctemp[-1]) ) )
-		ctemp--;
-
-	len = (size_t)(li->cursor - ctemp);
-	temp = el_malloc((len + 1) * sizeof(*temp));
+	temp = find_word_to_complete(li->cursor,
+	li->buffer, word_break, special_prefixes, );
 	if (temp == NULL)
 		goto out;
-	(void)wcsncpy(temp, ctemp, len);
-	temp[len] = '\0';
 
 	/* these can be used by function called in completion_matches() */
 	/* or (*attempted_completion_function)() */

Index: src/lib/libedit/TEST/test_filecompletion.c
diff -u src/lib/libedit/TEST/test_filecompletion.c:1.2 src/lib/libedit/TEST/test_filecompletion.c:1.3
--- src/lib/libedit/TEST/test_filecompletion.c:1.2	Sun Oct 15 19:17:30 2017
+++ src/lib/libedit/TEST/test_filecompletion.c	Fri May  4 16:39:15 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: test_filecompletion.c,v 1.2 2017/10/15 19:17:30 abhinav Exp $	*/
+/*	$NetBSD: test_filecompletion.c,v 1.3 2018/05/04 16:39:15 abhinav Exp $	*/
 
 /*-
  * Copyright (c) 2017 Abhinav Upadhyay 
@@ -449,6 +449,27 @@ static test_input inputs[] = {
 		"dampers",
 		L"ls \"dampers\" "
 	},
+	{
+		/* test completion when cursor at \ */
+		L"ls foo\\",
+		"foo",
+		"foo bar",
+		L"ls foo\\ bar "
+	},
+	{
+		/* test completion when cursor at single quote */
+		L"ls foo'",
+		"foo",
+		"foo bar",
+		L"ls foo\\ bar "
+	},
+	{
+		/* test completion when cursor at double quote */
+		L"ls foo\"",
+		"foo",
+		"foo bar",
+		L"ls foo\\ bar "
+	}
 };
 
 static const wchar_t break_chars[] = L" \t\n\"\\'`@$><=;|&{(";



CVS commit: src/lib/libedit

2018-05-04 Thread Abhinav Upadhyay
Module Name:src
Committed By:   abhinav
Date:   Fri May  4 16:39:15 UTC 2018

Modified Files:
src/lib/libedit: filecomplete.c
src/lib/libedit/TEST: test_filecompletion.c

Log Message:
Handle filename autocompletion when the cursor is at a backslash or quote 
character

For example, handle following case:
$ touch 'foo bar'
$ ls foo\ --> $ ls foo\ bar

Also add test cases for this.

Thanks to Christos for review


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/lib/libedit/filecomplete.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libedit/TEST/test_filecompletion.c

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



CVS commit: [netbsd-8] src/doc

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:26:29 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Tickets #783, #784, #785


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.189 -r1.1.2.190 src/doc/CHANGES-8.0

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

Modified files:

Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.189 src/doc/CHANGES-8.0:1.1.2.190
--- src/doc/CHANGES-8.0:1.1.2.189	Thu Apr 19 15:55:21 2018
+++ src/doc/CHANGES-8.0	Fri May  4 16:26:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.189 2018/04/19 15:55:21 martin Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.190 2018/05/04 16:26:29 martin Exp $
 
 A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
 until the 8.0 release:
@@ -13139,3 +13139,26 @@ sys/dev/pci/nvme_pci.c1.20
 sys/sys/param.h	changed manually
 
 	Welcome to 8.0 RC1
+
+sys/arch/macppc/conf/GENERIC			(patch)
+
+	Disable radeonfb since it still fails on some hardware.
+	macallan, ticket #783]
+
+sys/arch/x86/acpi/acpi_wakeup.c			1.46
+
+	Save and restore xcr0 when doing ACPI sleeps.
+	[maya, ticket #784]
+
+sbin/gpt/gpt.8	1.53-1.57,1.59
+sbin/gpt/gpt.c	1.74
+sbin/gpt/map.c	1.14
+
+	Document the bootme flag.
+	Fix a typo, and make a couple of minor wording improvements.
+	Clarify that alignment is the number of bytes to align to.
+	Explain what suffixes are accepted when specifying a size.
+	Add information about how to boot from gpt.
+	If a new map entry doesn't fit, be more verbose about the sizes.
+	[mrg, ticket #785]
+



CVS commit: [netbsd-8] src/doc

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:26:29 UTC 2018

Modified Files:
src/doc [netbsd-8]: CHANGES-8.0

Log Message:
Tickets #783, #784, #785


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.189 -r1.1.2.190 src/doc/CHANGES-8.0

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



CVS commit: [netbsd-8] src/sbin/gpt

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:24:46 UTC 2018

Modified Files:
src/sbin/gpt [netbsd-8]: gpt.8 gpt.c map.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #785):
sbin/gpt/gpt.c: revision 1.74
sbin/gpt/map.c: revision 1.14
sbin/gpt/gpt.8: revision 1.53
sbin/gpt/gpt.8: revision 1.54
sbin/gpt/gpt.8: revision 1.55
sbin/gpt/gpt.8: revision 1.56
sbin/gpt/gpt.8: revision 1.57
sbin/gpt/gpt.8: revision 1.59

Add note about bootme flag:
The bootme flag is used to indicate which partiotion should be booted
by UEFI boot code.

Fix a typo, and make a couple of minor wording improvements.
I resisted the (very weak) impulse to Americanise some spellings ...

Use Fx/Nx.

clarify that alignment is the number of bytes to align to.

Explain what suffixes are accepted when specifying a size.
Spelling

add information about how to boot from gpt.  mostly taken from the wiki.

if a new map entry doesn't fit, be more verbose about the sizes.


To generate a diff of this commit:
cvs rdiff -u -r1.52.4.1 -r1.52.4.2 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.70.4.1 -r1.70.4.2 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sbin/gpt/map.c

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

Modified files:

Index: src/sbin/gpt/gpt.8
diff -u src/sbin/gpt/gpt.8:1.52.4.1 src/sbin/gpt/gpt.8:1.52.4.2
--- src/sbin/gpt/gpt.8:1.52.4.1	Mon Apr  9 12:54:00 2018
+++ src/sbin/gpt/gpt.8	Fri May  4 16:24:46 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpt.8,v 1.52.4.1 2018/04/09 12:54:00 bouyer Exp $
+.\" $NetBSD: gpt.8,v 1.52.4.2 2018/05/04 16:24:46 martin Exp $
 .\"
 .\" Copyright (c) 2002 Marcel Moolenaar
 .\" All rights reserved.
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.17 2006/06/22 22:22:32 marcel Exp $
 .\"
-.Dd February 15, 2017
+.Dd March 5, 2018
 .Dt GPT 8
 .Os
 .Sh NAME
@@ -132,7 +132,8 @@ The command-specific options can be used
 The
 .Fl a Ar alignment
 option allows the user to specify an alignment for the start and size.
-The alignment may have a suffix to indicate its magnitude.
+The alignment is given in bytes and may have a suffix to indicate its
+magnitude.
 .Nm
 will attempt to align the partition.
 .Pp
@@ -162,6 +163,15 @@ or
 .Sq S
 then size is in sectors, otherwise size is in bytes which must be
 a multiple of the device's sector size.
+Accepted suffix units are
+.Sq b
+to denote bytes,
+.Sq k
+to denote kilobytes,
+.Sq m
+to denote megabytes and
+.Sq g
+to denote gigabytes.
 The minimum size is 1 sector.
 .Pp
 The
@@ -180,15 +190,20 @@ BIOS Boot
 .It Cm efi
 EFI System
 .It Cm fbsd-legacy
-FreeBSD legacy
+.Fx
+legacy
 .It Cm fbsd-swap
-FreeBSD swap
+.Fx
+swap
 .It Cm fbsd-ufs
-FreeBSD UFS/UFS2
+.Fx
+UFS/UFS2
 .It Cm fbsd-vinum
-FreeBSD vinum
+.Fx
+vinum
 .It Cm fbsd-zfs
-FreeBSD ZFS
+.Fx
+ZFS
 .It Cm linux-data
 Linux data
 .It Cm linux-raid
@@ -202,17 +217,23 @@ Windows basic data
 .It Cm windows-reserved
 Windows reserved
 .It Cm ccd
-NetBSD ccd component
+.Nx
+ccd component
 .It Cm cgd
-NetBSD Cryptographic Disk
+.Nx
+Cryptographic Disk
 .It Cm ffs
-NetBSD FFSv1/FFSv2
+.Nx
+FFSv1/FFSv2
 .It Cm lfs
-NetBSD LFS
+.Nx
+LFS
 .It Cm raid
-NetBSD RAIDFrame component
+.Nx
+RAIDFrame component
 .It Cm swap
-NetBSD swap
+.Nx
+swap
 .El
 as aliases for the most commonly used partition types.
 .\"  backup 
@@ -256,8 +277,8 @@ bootstrap code, as installed via
 The
 .Fl L
 option selects the partition by label.
-If there are multiple partitions with the same label, it will use the
-first one found.
+If there are multiple partitions with the same label, the
+first one found will be used.
 .\"  create 
 .It Nm Ic create Oo Fl AfP Oc Oo Fl p Ar partitions Oc
 The
@@ -462,6 +483,15 @@ or
 .Sq S
 then size is in sectors, otherwise size is in bytes which must be
 a multiple of the device's sector size.
+Accepted suffix units are
+.Sq b
+to denote bytes,
+.Sq k
+to denote kilobytes,
+.Sq m
+to denote megabytes and
+.Sq g
+to denote gigabytes.
 The minimum size is 1 sector.
 If the
 .Fl a
@@ -491,6 +521,15 @@ or
 .Sq S
 then size is in sectors, otherwise size is in bytes which must be
 a multiple of the device's sector size.
+Accepted suffix units are
+.Sq b
+to denote bytes,
+.Sq k
+to denote kilobytes,
+.Sq m
+to denote megabytes and
+.Sq g
+to denote gigabytes.
 Using the
 .Fl s
 option allows you to move the backup copy prior to resizing the medium.
@@ -543,14 +582,15 @@ by legacy BIOS boot code.
 See the
 .Ic biosboot
 command for more information.
+The bootme flag is used to indicate which partition should be booted
+by UEFI boot code.
 The other attributes are for compatibility with
 .Fx
-and are not currently used by any
-.Nx
-code.
+and are not currently used by
+.Nx .
 They may be used by
 .Nx
-code in the future.
+in the future.
 .\"  show 
 .It Nm Ic show Oo Fl aglu Oc Oo Fl i Ar index Oc

CVS commit: [netbsd-8] src/sbin/gpt

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:24:46 UTC 2018

Modified Files:
src/sbin/gpt [netbsd-8]: gpt.8 gpt.c map.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #785):
sbin/gpt/gpt.c: revision 1.74
sbin/gpt/map.c: revision 1.14
sbin/gpt/gpt.8: revision 1.53
sbin/gpt/gpt.8: revision 1.54
sbin/gpt/gpt.8: revision 1.55
sbin/gpt/gpt.8: revision 1.56
sbin/gpt/gpt.8: revision 1.57
sbin/gpt/gpt.8: revision 1.59

Add note about bootme flag:
The bootme flag is used to indicate which partiotion should be booted
by UEFI boot code.

Fix a typo, and make a couple of minor wording improvements.
I resisted the (very weak) impulse to Americanise some spellings ...

Use Fx/Nx.

clarify that alignment is the number of bytes to align to.

Explain what suffixes are accepted when specifying a size.
Spelling

add information about how to boot from gpt.  mostly taken from the wiki.

if a new map entry doesn't fit, be more verbose about the sizes.


To generate a diff of this commit:
cvs rdiff -u -r1.52.4.1 -r1.52.4.2 src/sbin/gpt/gpt.8
cvs rdiff -u -r1.70.4.1 -r1.70.4.2 src/sbin/gpt/gpt.c
cvs rdiff -u -r1.13 -r1.13.8.1 src/sbin/gpt/map.c

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



CVS commit: [netbsd-8] src/sys/arch/x86/acpi

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:07:59 UTC 2018

Modified Files:
src/sys/arch/x86/acpi [netbsd-8]: acpi_wakeup.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #784):
sys/arch/x86/acpi/acpi_wakeup.c: revision 1.46
Save and restore xcr0 when doing ACPI sleeps. Should fix PR/49174.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/x86/acpi/acpi_wakeup.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/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.45 src/sys/arch/x86/acpi/acpi_wakeup.c:1.45.8.1
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.45	Thu Oct 20 16:05:04 2016
+++ src/sys/arch/x86/acpi/acpi_wakeup.c	Fri May  4 16:07:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_wakeup.c,v 1.45 2016/10/20 16:05:04 maxv Exp $	*/
+/*	$NetBSD: acpi_wakeup.c,v 1.45.8.1 2018/05/04 16:07:59 martin Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.45 2016/10/20 16:05:04 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.45.8.1 2018/05/04 16:07:59 martin Exp $");
 
 #include 
 #include 
@@ -250,6 +250,7 @@ acpi_md_sleep_enter(int state)
 void
 acpi_cpu_sleep(struct cpu_info *ci)
 {
+	uint64_t xcr0 = 0;
 	int s;
 
 	KASSERT(!CPU_IS_PRIMARY(ci));
@@ -259,12 +260,21 @@ acpi_cpu_sleep(struct cpu_info *ci)
 	fpusave_cpu(true);
 	x86_disable_intr();
 
+	/*
+	 * XXX also need to save the PMCs, the dbregs, and probably a few
+	 * MSRs too.
+	 */
+	if (rcr4() & CR4_OSXSAVE)
+		xcr0 = rdxcr(0);
+
 	if (acpi_md_sleep_prepare(-1))
 		goto out;
 
 	/* Execute Wakeup */
 	cpu_init_msrs(ci, false);
 	fpuinit(ci);
+	if (rcr4() & CR4_OSXSAVE)
+		wrxcr(0, xcr0);
 
 #if NLAPIC > 0
 	lapic_enable();
@@ -285,6 +295,7 @@ out:
 int
 acpi_md_sleep(int state)
 {
+	uint64_t xcr0 = 0;
 	int s, ret = 0;
 #ifdef MULTIPROCESSOR
 	struct cpu_info *ci;
@@ -315,12 +326,21 @@ acpi_md_sleep(int state)
 	}
 #endif
 
+	/*
+	 * XXX also need to save the PMCs, the dbregs, and probably a few
+	 * MSRs too.
+	 */
+	if (rcr4() & CR4_OSXSAVE)
+		xcr0 = rdxcr(0);
+
 	if (acpi_md_sleep_prepare(state))
 		goto out;
 
 	/* Execute Wakeup */
 	cpu_init_msrs(_info_primary, false);
 	fpuinit(_info_primary);
+	if (rcr4() & CR4_OSXSAVE)
+		wrxcr(0, xcr0);
 	i8259_reinit();
 #if NLAPIC > 0
 	lapic_enable();



CVS commit: [netbsd-8] src/sys/arch/x86/acpi

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:07:59 UTC 2018

Modified Files:
src/sys/arch/x86/acpi [netbsd-8]: acpi_wakeup.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #784):
sys/arch/x86/acpi/acpi_wakeup.c: revision 1.46
Save and restore xcr0 when doing ACPI sleeps. Should fix PR/49174.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.8.1 src/sys/arch/x86/acpi/acpi_wakeup.c

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



CVS commit: [netbsd-8] src/sys/arch/macppc/conf

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:03:32 UTC 2018

Modified Files:
src/sys/arch/macppc/conf [netbsd-8]: GENERIC

Log Message:
Apply patch, reqeusted by macallan in ticket #783:

Disable radeonfb since it still fails on some hardware.


To generate a diff of this commit:
cvs rdiff -u -r1.329.2.4 -r1.329.2.5 src/sys/arch/macppc/conf/GENERIC

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



CVS commit: [netbsd-8] src/sys/arch/macppc/conf

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 16:03:32 UTC 2018

Modified Files:
src/sys/arch/macppc/conf [netbsd-8]: GENERIC

Log Message:
Apply patch, reqeusted by macallan in ticket #783:

Disable radeonfb since it still fails on some hardware.


To generate a diff of this commit:
cvs rdiff -u -r1.329.2.4 -r1.329.2.5 src/sys/arch/macppc/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/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.329.2.4 src/sys/arch/macppc/conf/GENERIC:1.329.2.5
--- src/sys/arch/macppc/conf/GENERIC:1.329.2.4	Mon Feb 26 01:08:26 2018
+++ src/sys/arch/macppc/conf/GENERIC	Fri May  4 16:03:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.329.2.4 2018/02/26 01:08:26 snj Exp $
+# $NetBSD: GENERIC,v 1.329.2.5 2018/05/04 16:03:32 martin Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.329.2.4 $"
+#ident 		"GENERIC-$Revision: 1.329.2.5 $"
 
 maxusers	32
 
@@ -294,8 +294,8 @@ r128fb*		at pci? function ?	# ATI Rage 1
 voodoofb*	at pci? function ?	# 3Dfx Voodoo3 
 
 # ATI Radeon. Still has problems on some hardware
-radeonfb*	at pci? function ?
-options 	RADEONFB_ALWAYS_ACCEL_PUTCHAR
+#radeonfb*	at pci? function ?
+#options 	RADEONFB_ALWAYS_ACCEL_PUTCHAR
 
 # generic PCI framebuffer, should work with everything supported by OF
 genfb*		at pci? function ?



CVS commit: src/doc

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 15:51:53 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new tzcode.


To generate a diff of this commit:
cvs rdiff -u -r1.1521 -r1.1522 src/doc/3RDPARTY
cvs rdiff -u -r1.2386 -r1.2387 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1521 src/doc/3RDPARTY:1.1522
--- src/doc/3RDPARTY:1.1521	Fri May  4 07:11:47 2018
+++ src/doc/3RDPARTY	Fri May  4 11:51:53 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1521 2018/05/04 11:11:47 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1522 2018/05/04 15:51:53 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1411,7 +1411,7 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2018c / tzdata2018e
+Version:	tzcode2018e / tzdata2018e
 Current Vers:	tzcode2018e / tzdata2018e
 Maintainer:	Paul Eggert <egg...@cs.ucla.edu>
 Archive Site:	ftp://ftp.iana.org/tz/releases/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2386 src/doc/CHANGES:1.2387
--- src/doc/CHANGES:1.2386	Fri May  4 06:56:23 2018
+++ src/doc/CHANGES	Fri May  4 11:51:53 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2386 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2387 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -151,3 +151,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	arm: Add support for Allwinner H6 SoC. [jmcneill 20180501]
 	dhcpcd: Import 7.0.4. [roy 20180502]
 	tzdata: updated to 2017e [kre 20180504]
+	libc: Update to tzcode2018e. [christos 20180504]



CVS commit: src/doc

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 15:51:53 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new tzcode.


To generate a diff of this commit:
cvs rdiff -u -r1.1521 -r1.1522 src/doc/3RDPARTY
cvs rdiff -u -r1.2386 -r1.2387 src/doc/CHANGES

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



CVS commit: src/lib/libc/time

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 15:51:00 UTC 2018

Modified Files:
src/lib/libc/time: CONTRIBUTING Makefile NEWS asctime.c ctime.3
localtime.c private.h strftime.c theory.html tzset.3 version
zdump.c zic.8 zic.c
Added Files:
src/lib/libc/time: tz-art.html tz-link.html
Removed Files:
src/lib/libc/time: tz-art.htm tz-link.htm

Log Message:
Merge 2018e

  Changes to code

zic now accepts subsecond precision in expressions like
00:19:32.13, which is approximately the legal time of the
Netherlands from 1835 to 1937.  However, because it is
questionable whether the few recorded uses of non-integer offsets
had subsecond precision in practice, there are no plans for tzdata
to use this feature.  (Thanks to Steve Allen for pointing out
the limitations of historical data in this area.)

The code is a bit more portable to MS-Windows.  Installers can
compile with -DRESERVE_STD_EXT_IDS on MS-Windows platforms that
reserve identifiers like 'localtime'.  (Thanks to Manuela
Friedrich).

  Changes to documentation and commentary

theory.html now outlines tzdb's extensions to POSIX's model for
civil time, and has a section "POSIX features no longer needed"
that lists POSIX API components that are now vestigial.
(From suggestions by Steve Summit.)  It also better distinguishes
time zones from tz regions.  (From a suggestion by Guy Harris.)

Commentary is now more consistent about using the phrase "daylight
saving time", to match the C name tm_isdst.  Daylight saving time
need not occur in summer, and need not have a positive offset from
standard time.

Commentary about historical transitions in Uruguay has been expanded
with links to many relevant legal documents.
(Thanks to Tim Parenti.)

Commentary now uses some non-ASCII characters with Unicode value
less than U+0100, as they can be useful and should work even with
older editors such as XEmacs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/time/CONTRIBUTING
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/Makefile
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/time/NEWS
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/time/asctime.c
cvs rdiff -u -r1.58 -r1.59 src/lib/libc/time/ctime.3
cvs rdiff -u -r1.111 -r1.112 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.51 -r1.52 src/lib/libc/time/private.h
cvs rdiff -u -r1.40 -r1.41 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/time/theory.html
cvs rdiff -u -r1.17 -r0 src/lib/libc/time/tz-art.htm
cvs rdiff -u -r0 -r1.1 src/lib/libc/time/tz-art.html \
src/lib/libc/time/tz-link.html
cvs rdiff -u -r1.32 -r0 src/lib/libc/time/tz-link.htm
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/time/tzset.3
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/time/version
cvs rdiff -u -r1.48 -r1.49 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/time/zic.8
cvs rdiff -u -r1.70 -r1.71 src/lib/libc/time/zic.c

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



CVS commit: src/share/mk

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 14:50:40 UTC 2018

Modified Files:
src/share/mk: bsd.hostlib.mk bsd.hostprog.mk

Log Message:
include bsd.hostinit.mk instead of bsd.init.mk


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.79 -r1.80 src/share/mk/bsd.hostprog.mk

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



CVS commit: src/share/mk

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 14:50:40 UTC 2018

Modified Files:
src/share/mk: bsd.hostlib.mk bsd.hostprog.mk

Log Message:
include bsd.hostinit.mk instead of bsd.init.mk


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.79 -r1.80 src/share/mk/bsd.hostprog.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.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.19 src/share/mk/bsd.hostlib.mk:1.20
--- src/share/mk/bsd.hostlib.mk:1.19	Sun Nov 30 20:34:30 2014
+++ src/share/mk/bsd.hostlib.mk	Fri May  4 10:50:40 2018
@@ -1,6 +1,6 @@
-#	$NetBSD: bsd.hostlib.mk,v 1.19 2014/12/01 01:34:30 erh Exp $
+#	$NetBSD: bsd.hostlib.mk,v 1.20 2018/05/04 14:50:40 christos Exp $
 
-.include 
+.include 
 .include 
 
 # Basic targets

Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.79 src/share/mk/bsd.hostprog.mk:1.80
--- src/share/mk/bsd.hostprog.mk:1.79	Sat Nov 25 18:22:41 2017
+++ src/share/mk/bsd.hostprog.mk	Fri May  4 10:50:40 2018
@@ -1,7 +1,7 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.79 2017/11/25 23:22:41 jmcneill Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.80 2018/05/04 14:50:40 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
-.include 
+.include 
 .include 
 
 # Basic targets



CVS commit: src/tools

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 14:50:18 UTC 2018

Modified Files:
src/tools: Makefile.host

Log Message:
revert previous, breaks llvm build and not easy to fix.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tools/Makefile.host

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

Modified files:

Index: src/tools/Makefile.host
diff -u src/tools/Makefile.host:1.33 src/tools/Makefile.host:1.34
--- src/tools/Makefile.host:1.33	Tue May  1 15:59:46 2018
+++ src/tools/Makefile.host	Fri May  4 10:50:18 2018
@@ -1,6 +1,11 @@
-#	$NetBSD: Makefile.host,v 1.33 2018/05/01 19:59:46 christos Exp $
+#	$NetBSD: Makefile.host,v 1.34 2018/05/04 14:50:18 christos Exp $
 
-.include 
+NOINFO= # defined
+NOLINT= # defined
+NOMAN=  # defined
+MKREPRO=no	# Native toolchain might be unable to do it
+
+.include 
 
 .ifndef NOCOMPATLIB
 # Use TOOLDIR copy of libnbcompat and associated *.h files



CVS commit: src/tools

2018-05-04 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May  4 14:50:18 UTC 2018

Modified Files:
src/tools: Makefile.host

Log Message:
revert previous, breaks llvm build and not easy to fix.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tools/Makefile.host

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



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

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 14:23:19 UTC 2018

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

Log Message:
Improve the category of libbozohttpd.0 in distribution sets

It's man-sys-catman, not man-netutil-catman.


To generate a diff of this commit:
cvs rdiff -u -r1.1582 -r1.1583 src/distrib/sets/lists/man/mi

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



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

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 14:23:19 UTC 2018

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

Log Message:
Improve the category of libbozohttpd.0 in distribution sets

It's man-sys-catman, not man-netutil-catman.


To generate a diff of this commit:
cvs rdiff -u -r1.1582 -r1.1583 src/distrib/sets/lists/man/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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1582 src/distrib/sets/lists/man/mi:1.1583
--- src/distrib/sets/lists/man/mi:1.1582	Fri May  4 14:15:41 2018
+++ src/distrib/sets/lists/man/mi	Fri May  4 14:23:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1582 2018/05/04 14:15:41 kamil Exp $
+# $NetBSD: mi,v 1.1583 2018/05/04 14:23:19 kamil Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -659,7 +659,7 @@
 ./usr/share/man/cat3/atari/ahdi_writelabel.0	man-obsolete		obsolete
 ./usr/share/man/cat3/i386			man-obsolete		obsolete
 ./usr/share/man/cat3/i386/keycap.0		man-obsolete		obsolete
-./usr/share/man/cat3/libbozohttpd.0		man-netutil-catman	.cat
+./usr/share/man/cat3/libbozohttpd.0		man-sys-catman		.cat
 ./usr/share/man/cat3/libunbound.0		man-netutil-catman	.cat,unbound
 ./usr/share/man/cat3lua/gpio.0			man-sys-catman		.cat
 ./usr/share/man/cat3lua/gpio.attach.0		man-sys-catman		.cat



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

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 14:15:42 UTC 2018

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

Log Message:
Register a new cat page: libbozohttpd.0

Fix build of the distribution with MKCATPAGES=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.1581 -r1.1582 src/distrib/sets/lists/man/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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1581 src/distrib/sets/lists/man/mi:1.1582
--- src/distrib/sets/lists/man/mi:1.1581	Thu May  3 22:27:59 2018
+++ src/distrib/sets/lists/man/mi	Fri May  4 14:15:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1581 2018/05/03 22:27:59 sevan Exp $
+# $NetBSD: mi,v 1.1582 2018/05/04 14:15:41 kamil Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -659,6 +659,7 @@
 ./usr/share/man/cat3/atari/ahdi_writelabel.0	man-obsolete		obsolete
 ./usr/share/man/cat3/i386			man-obsolete		obsolete
 ./usr/share/man/cat3/i386/keycap.0		man-obsolete		obsolete
+./usr/share/man/cat3/libbozohttpd.0		man-netutil-catman	.cat
 ./usr/share/man/cat3/libunbound.0		man-netutil-catman	.cat,unbound
 ./usr/share/man/cat3lua/gpio.0			man-sys-catman		.cat
 ./usr/share/man/cat3lua/gpio.attach.0		man-sys-catman		.cat



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

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 14:15:42 UTC 2018

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

Log Message:
Register a new cat page: libbozohttpd.0

Fix build of the distribution with MKCATPAGES=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.1581 -r1.1582 src/distrib/sets/lists/man/mi

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



CVS commit: src/tests/usr.bin/c++

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 12:51:18 UTC 2018

Modified Files:
src/tests/usr.bin/c++: t_ubsan_int_add_overflow.sh
t_ubsan_int_divzero.sh t_ubsan_int_neg_overflow.sh
t_ubsan_int_sub_overflow.sh t_ubsan_vla_out_of_bounds.sh

Log Message:
Improve wording for non-native speakers of English

Improve wording in t_ubsan tests in for c++.

No functional change intended.

Follow the changed in cc/ by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh \
src/tests/usr.bin/c++/t_ubsan_int_divzero.sh \
src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh \
src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.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/usr.bin/c++/t_ubsan_int_add_overflow.sh
diff -u src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh:1.1 src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh:1.2
--- src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh	Fri May  4 12:51:18 2018
@@ -156,11 +156,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -e match:"signed integer overflow" ./md32
 
Index: src/tests/usr.bin/c++/t_ubsan_int_divzero.sh
diff -u src/tests/usr.bin/c++/t_ubsan_int_divzero.sh:1.1 src/tests/usr.bin/c++/t_ubsan_int_divzero.sh:1.2
--- src/tests/usr.bin/c++/t_ubsan_int_divzero.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_divzero.sh	Fri May  4 12:51:18 2018
@@ -150,11 +150,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -s signal:8 -e match:"division by zero" ./md32
 
Index: src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh
diff -u src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh:1.1 src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh:1.2
--- src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh	Fri May  4 12:51:18 2018
@@ -156,11 +156,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -e match:"negation of" ./md32
 
Index: src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
diff -u src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh:1.1 src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh:1.2
--- src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh	Fri May  4 12:51:18 2018
@@ -156,11 +156,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -s ignore -e match:"signed integer overflow" ./md32
 

Index: src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
diff -u src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.2 src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.3
--- src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.2	Fri May  4 12:27:58 2018
+++ src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh	Fri May  4 12:51:18 2018
@@ -153,11 +153,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit 

CVS commit: src/tests/usr.bin/c++

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 12:51:18 UTC 2018

Modified Files:
src/tests/usr.bin/c++: t_ubsan_int_add_overflow.sh
t_ubsan_int_divzero.sh t_ubsan_int_neg_overflow.sh
t_ubsan_int_sub_overflow.sh t_ubsan_vla_out_of_bounds.sh

Log Message:
Improve wording for non-native speakers of English

Improve wording in t_ubsan tests in for c++.

No functional change intended.

Follow the changed in cc/ by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/t_ubsan_int_add_overflow.sh \
src/tests/usr.bin/c++/t_ubsan_int_divzero.sh \
src/tests/usr.bin/c++/t_ubsan_int_neg_overflow.sh \
src/tests/usr.bin/c++/t_ubsan_int_sub_overflow.sh
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh

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



Re: CVS commit: src

2018-05-04 Thread Sevan Janiyan


On 05/04/18 13:14, Leonardo Taccari wrote:
> I think that src/distrib/sets/lists/debug/{shl.,}mi needs to be updated
> as well (possible patch that fixes that is attached).

Thanks for the heads up, I had not performed a debug build in my tests.


Sevan


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

2018-05-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Fri May  4 12:44:41 UTC 2018

Modified Files:
src/distrib/sets/lists/debug: mi shl.mi

Log Message:
Unbreak build until the privatisation of libbozohttpd is settled.

heads up & patch thanks to 


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/lists/debug/shl.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/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.246 src/distrib/sets/lists/debug/mi:1.247
--- src/distrib/sets/lists/debug/mi:1.246	Tue Apr  3 18:03:16 2018
+++ src/distrib/sets/lists/debug/mi	Fri May  4 12:44:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.246 2018/04/03 18:03:16 christos Exp $
+# $NetBSD: mi,v 1.247 2018/05/04 12:44:40 sevan Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -34,6 +34,7 @@
 ./usr/lib/libbind9_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libblacklist_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libbluetooth_g.a			comp-c-debuglib		debuglib,compatfile
+./usr/lib/libbozohttpd_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libbsdmalloc_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libbz2_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libc++_g.acomp-c-debuglib		debuglib,compatfile,libcxx

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.196 src/distrib/sets/lists/debug/shl.mi:1.197
--- src/distrib/sets/lists/debug/shl.mi:1.196	Mon Apr 16 12:25:18 2018
+++ src/distrib/sets/lists/debug/shl.mi	Fri May  4 12:44:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.196 2018/04/16 12:25:18 christos Exp $
+# $NetBSD: shl.mi,v 1.197 2018/05/04 12:44:40 sevan Exp $
 ./usr/lib/libbfd_g.a		comp-c-debuglib	debuglib,compatfile,binutils
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
@@ -68,6 +68,7 @@
 ./usr/libdata/debug/usr/lib/libbind9.so.8.5.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libbozohttpd.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libc++.so.1.0.debug			comp-sys-debug	debug,compatfile,libcxx



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

2018-05-04 Thread Sevan Janiyan
Module Name:src
Committed By:   sevan
Date:   Fri May  4 12:44:41 UTC 2018

Modified Files:
src/distrib/sets/lists/debug: mi shl.mi

Log Message:
Unbreak build until the privatisation of libbozohttpd is settled.

heads up & patch thanks to 


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.196 -r1.197 src/distrib/sets/lists/debug/shl.mi

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



CVS commit: src/tests/usr.bin/c++

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 12:27:58 UTC 2018

Modified Files:
src/tests/usr.bin/c++: t_ubsan_vla_out_of_bounds.sh

Log Message:
Explain VLA in c++/t_ubsan_vla_out_of_bounds.sh (ATF test)

VLA - Variable Length Array

Requested by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh

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



CVS commit: src/tests/usr.bin/c++

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 12:27:58 UTC 2018

Modified Files:
src/tests/usr.bin/c++: t_ubsan_vla_out_of_bounds.sh

Log Message:
Explain VLA in c++/t_ubsan_vla_out_of_bounds.sh (ATF test)

VLA - Variable Length Array

Requested by 


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.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/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh
diff -u src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.1 src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.2
--- src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/c++/t_ubsan_vla_out_of_bounds.sh	Fri May  4 12:27:58 2018
@@ -40,28 +40,28 @@ test_target()
 
 atf_test_case vla_out_of_bounds
 vla_out_of_bounds_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds"
 	atf_set "require.progs" "c++"
 }
 
 atf_test_case vla_out_of_bounds_profile
 vla_out_of_bounds_profile_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds with profiling option"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with profiling option"
 	atf_set "require.progs" "c++"
 }
 atf_test_case vla_out_of_bounds_pic
 vla_out_of_bounds_pic_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds with position independent code (PIC) flag"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with position independent code (PIC) flag"
 	atf_set "require.progs" "c++"
 }
 atf_test_case vla_out_of_bounds_pie
 vla_out_of_bounds_pie_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds with position independent execution (PIE) flag"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with position independent execution (PIE) flag"
 	atf_set "require.progs" "c++"
 }
 atf_test_case vla_out_of_bounds32
 vla_out_of_bounds32_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds in NetBSD_32 emulation"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds in NetBSD_32 emulation"
 	atf_set "require.progs" "c++ file diff cat"
 }
 



CVS commit: src/tests/usr.bin/cc

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 12:26:53 UTC 2018

Modified Files:
src/tests/usr.bin/cc: t_ubsan_vla_out_of_bounds.sh

Log Message:
Explain VLA in t_ubsan_vla_out_of_bounds.sh (ATF test)

VLA - Variable Length Array

Requested by 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh

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



CVS commit: src/tests/usr.bin/cc

2018-05-04 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Fri May  4 12:26:53 UTC 2018

Modified Files:
src/tests/usr.bin/cc: t_ubsan_vla_out_of_bounds.sh

Log Message:
Explain VLA in t_ubsan_vla_out_of_bounds.sh (ATF test)

VLA - Variable Length Array

Requested by 


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.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/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh
diff -u src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.2 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.3
--- src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.2	Fri May  4 10:44:24 2018
+++ src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh	Fri May  4 12:26:53 2018
@@ -40,28 +40,28 @@ test_target()
 
 atf_test_case vla_out_of_bounds
 vla_out_of_bounds_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds"
 	atf_set "require.progs" "cc"
 }
 
 atf_test_case vla_out_of_bounds_profile
 vla_out_of_bounds_profile_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds with profiling option"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with profiling option"
 	atf_set "require.progs" "cc"
 }
 atf_test_case vla_out_of_bounds_pic
 vla_out_of_bounds_pic_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds with position independent code (PIC) flag"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with position independent code (PIC) flag"
 	atf_set "require.progs" "cc"
 }
 atf_test_case vla_out_of_bounds_pie
 vla_out_of_bounds_pie_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds with position independent execution (PIE) flag"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds with position independent execution (PIE) flag"
 	atf_set "require.progs" "cc"
 }
 atf_test_case vla_out_of_bounds32
 vla_out_of_bounds32_head() {
-	atf_set "descr" "Test Undefined Behavior for vla out of bounds in NetBSD_32 emulation"
+	atf_set "descr" "Test Undefined Behavior for vla (Variable Length Array) out of bounds in NetBSD_32 emulation"
 	atf_set "require.progs" "cc file diff cat"
 }
 



Re: CVS commit: src

2018-05-04 Thread Leonardo Taccari
Hello Sevan,

"Sevan Janiyan" writes:
> Module Name:  src
> Committed By: sevan
> Date: Thu May  3 22:27:59 UTC 2018
>
> Modified Files:
>   src/distrib/sets/lists/base: shl.mi
>   src/distrib/sets/lists/comp: mi
>   src/distrib/sets/lists/man: mi
>   src/lib: Makefile
>
> Log Message:
> Hello libbozohttpd(3)
> Enabling as it is a dependency for bozohttpd(3lua).
> [...]

On amd64 the build fails with:

 | ===  4 extra files in DESTDIR  =
 | Files in DESTDIR but missing from flist.
 | File is obsolete or flist is out of date ?
 | --
 | ./usr/lib/i386/libbozohttpd_g.a
 | ./usr/lib/libbozohttpd_g.a
 | ./usr/libdata/debug/usr/lib/i386/libbozohttpd.so.0.0.debug
 | ./usr/libdata/debug/usr/lib/libbozohttpd.so.0.0.debug

I think that src/distrib/sets/lists/debug/{shl.,}mi needs to be updated
as well (possible patch that fixes that is attached).


Thank you!
Index: distrib/sets/lists/debug/mi
===
RCS file: /cvsroot/src/distrib/sets/lists/debug/mi,v
retrieving revision 1.246
diff -u -p -r1.246 mi
--- distrib/sets/lists/debug/mi	3 Apr 2018 18:03:16 -	1.246
+++ distrib/sets/lists/debug/mi	4 May 2018 12:00:07 -
@@ -34,6 +34,7 @@
 ./usr/lib/libbind9_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libblacklist_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libbluetooth_g.a			comp-c-debuglib		debuglib,compatfile
+./usr/lib/libbozohttpd_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libbsdmalloc_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libbz2_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libc++_g.acomp-c-debuglib		debuglib,compatfile,libcxx
Index: distrib/sets/lists/debug/shl.mi
===
RCS file: /cvsroot/src/distrib/sets/lists/debug/shl.mi,v
retrieving revision 1.196
diff -u -p -r1.196 shl.mi
--- distrib/sets/lists/debug/shl.mi	16 Apr 2018 12:25:18 -	1.196
+++ distrib/sets/lists/debug/shl.mi	4 May 2018 12:00:07 -
@@ -68,6 +68,7 @@
 ./usr/libdata/debug/usr/lib/libbind9.so.8.5.debug		comp-bind-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libbozohttpd.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug			comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libc++.so.1.0.debug			comp-sys-debug	debug,compatfile,libcxx


CVS commit: src/sys/net80211

2018-05-04 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri May  4 11:25:24 UTC 2018

Modified Files:
src/sys/net80211: ieee80211_ioctl.h

Log Message:
Remove duplicate macros. Reported in PR/29786.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/net80211/ieee80211_ioctl.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/net80211/ieee80211_ioctl.h
diff -u src/sys/net80211/ieee80211_ioctl.h:1.23 src/sys/net80211/ieee80211_ioctl.h:1.24
--- src/sys/net80211/ieee80211_ioctl.h:1.23	Fri Apr  8 14:30:47 2016
+++ src/sys/net80211/ieee80211_ioctl.h	Fri May  4 11:25:24 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_ioctl.h,v 1.23 2016/04/08 14:30:47 roy Exp $	*/
+/*	$NetBSD: ieee80211_ioctl.h,v 1.24 2018/05/04 11:25:24 maxv Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -580,10 +580,6 @@ struct ieee80211_auth {
 	int		i_authtype;
 };
 
-#define	IEEE80211_AUTH_NONE	0
-#define	IEEE80211_AUTH_OPEN	1
-#define	IEEE80211_AUTH_SHARED	2
-
 #define	SIOCS80211AUTH		 _IOW('i', 236, struct ieee80211_auth)
 #define	SIOCG80211AUTH		_IOWR('i', 237, struct ieee80211_auth)
 



CVS commit: src/sys/net80211

2018-05-04 Thread Maxime Villard
Module Name:src
Committed By:   maxv
Date:   Fri May  4 11:25:24 UTC 2018

Modified Files:
src/sys/net80211: ieee80211_ioctl.h

Log Message:
Remove duplicate macros. Reported in PR/29786.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/net80211/ieee80211_ioctl.h

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



CVS commit: src/doc

2018-05-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Fri May  4 11:11:47 UTC 2018

Modified Files:
src/doc: 3RDPARTY

Log Message:
gcc-8.1 is out.


To generate a diff of this commit:
cvs rdiff -u -r1.1520 -r1.1521 src/doc/3RDPARTY

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1520 src/doc/3RDPARTY:1.1521
--- src/doc/3RDPARTY:1.1520	Fri May  4 10:56:23 2018
+++ src/doc/3RDPARTY	Fri May  4 11:11:47 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1520 2018/05/04 10:56:23 kre Exp $
+#	$NetBSD: 3RDPARTY,v 1.1521 2018/05/04 11:11:47 wiz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -452,7 +452,7 @@ There is a flex2netbsd script to help ne
 
 Package:	gcc
 Version:	5.5
-Current Vers:	5.5/6.4/7.2
+Current Vers:	5.5/6.4/7.2/8.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gcc/
 Home Page:	http://www.gnu.org/software/gcc/



CVS commit: src/doc

2018-05-04 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Fri May  4 11:11:47 UTC 2018

Modified Files:
src/doc: 3RDPARTY

Log Message:
gcc-8.1 is out.


To generate a diff of this commit:
cvs rdiff -u -r1.1520 -r1.1521 src/doc/3RDPARTY

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



CVS commit: src/doc

2018-05-04 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri May  4 10:56:23 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note update of tzdata to 2018e


To generate a diff of this commit:
cvs rdiff -u -r1.1519 -r1.1520 src/doc/3RDPARTY
cvs rdiff -u -r1.2385 -r1.2386 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1519 src/doc/3RDPARTY:1.1520
--- src/doc/3RDPARTY:1.1519	Thu May  3 20:15:49 2018
+++ src/doc/3RDPARTY	Fri May  4 10:56:23 2018
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1519 2018/05/03 20:15:49 jnemeth Exp $
+#	$NetBSD: 3RDPARTY,v 1.1520 2018/05/04 10:56:23 kre Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1411,8 +1411,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2018c / tzdata2018d
-Current Vers:	tzcode2018d / tzdata2018d
+Version:	tzcode2018c / tzdata2018e
+Current Vers:	tzcode2018e / tzdata2018e
 Maintainer:	Paul Eggert <egg...@cs.ucla.edu>
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2385 src/doc/CHANGES:1.2386
--- src/doc/CHANGES:1.2385	Wed May  2 22:11:49 2018
+++ src/doc/CHANGES	Fri May  4 10:56:23 2018
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2385 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2386 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -150,3 +150,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	netpgp(3lua): Add Lua binding for libnetpgp(3). [sevan 20180429]
 	arm: Add support for Allwinner H6 SoC. [jmcneill 20180501]
 	dhcpcd: Import 7.0.4. [roy 20180502]
+	tzdata: updated to 2017e [kre 20180504]



CVS commit: src/doc

2018-05-04 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri May  4 10:56:23 UTC 2018

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note update of tzdata to 2018e


To generate a diff of this commit:
cvs rdiff -u -r1.1519 -r1.1520 src/doc/3RDPARTY
cvs rdiff -u -r1.2385 -r1.2386 src/doc/CHANGES

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



CVS commit: src/external/public-domain/tz/dist

2018-05-04 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri May  4 10:54:19 UTC 2018

Modified Files:
src/external/public-domain/tz/dist: TZDATA_VERSION

Log Message:
Merge tzdata2018e


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/tz/dist/TZDATA_VERSION

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

Modified files:

Index: src/external/public-domain/tz/dist/TZDATA_VERSION
diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.11 src/external/public-domain/tz/dist/TZDATA_VERSION:1.12
--- src/external/public-domain/tz/dist/TZDATA_VERSION:1.11	Sat Mar 24 01:47:49 2018
+++ src/external/public-domain/tz/dist/TZDATA_VERSION	Fri May  4 10:54:19 2018
@@ -1 +1 @@
-tzdata-2018d
+tzdata-2018e



CVS commit: src/external/public-domain/tz/dist

2018-05-04 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri May  4 10:54:19 UTC 2018

Modified Files:
src/external/public-domain/tz/dist: TZDATA_VERSION

Log Message:
Merge tzdata2018e


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/public-domain/tz/dist/TZDATA_VERSION

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



CVS import: src/external/public-domain/tz/dist

2018-05-04 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri May  4 10:53:30 UTC 2018

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23657

Log Message:
Import tzdata2018e from ftp://ftp.iana.org/tz/releases/tzdata2018e.tar.gz

Summary of changes in tzdata2018e (2018-05-01 23:42:51 -0700):

News for the tz database

Release 2018e - 2018-05-01 23:42:51 -0700

North Korea switches back to +09 on 2018-05-05 (tomorrow!)

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2018E

U src/external/public-domain/tz/dist/leap-seconds.list
U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/theory.html
U src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
U src/external/public-domain/tz/dist/asia
U src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/systemv
U src/external/public-domain/tz/dist/factory
U src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/pacificnew
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/yearistype.sh
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/zoneinfo2tdf.pl
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

No conflicts created by this import



CVS import: src/external/public-domain/tz/dist

2018-05-04 Thread Robert Elz
Module Name:src
Committed By:   kre
Date:   Fri May  4 10:53:30 UTC 2018

Update of /cvsroot/src/external/public-domain/tz/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23657

Log Message:
Import tzdata2018e from ftp://ftp.iana.org/tz/releases/tzdata2018e.tar.gz

Summary of changes in tzdata2018e (2018-05-01 23:42:51 -0700):

News for the tz database

Release 2018e - 2018-05-01 23:42:51 -0700

North Korea switches back to +09 on 2018-05-05 (tomorrow!)

Status:

Vendor Tag: TZDATA
Release Tags:   TZDATA2018E

U src/external/public-domain/tz/dist/leap-seconds.list
U src/external/public-domain/tz/dist/calendars
U src/external/public-domain/tz/dist/CONTRIBUTING
U src/external/public-domain/tz/dist/LICENSE
U src/external/public-domain/tz/dist/Makefile
U src/external/public-domain/tz/dist/NEWS
U src/external/public-domain/tz/dist/README
U src/external/public-domain/tz/dist/theory.html
U src/external/public-domain/tz/dist/version
U src/external/public-domain/tz/dist/africa
U src/external/public-domain/tz/dist/antarctica
U src/external/public-domain/tz/dist/asia
U src/external/public-domain/tz/dist/australasia
U src/external/public-domain/tz/dist/europe
U src/external/public-domain/tz/dist/northamerica
U src/external/public-domain/tz/dist/southamerica
U src/external/public-domain/tz/dist/etcetera
U src/external/public-domain/tz/dist/systemv
U src/external/public-domain/tz/dist/factory
U src/external/public-domain/tz/dist/backward
U src/external/public-domain/tz/dist/pacificnew
U src/external/public-domain/tz/dist/backzone
U src/external/public-domain/tz/dist/iso3166.tab
U src/external/public-domain/tz/dist/checklinks.awk
U src/external/public-domain/tz/dist/zone.tab
U src/external/public-domain/tz/dist/leapseconds
U src/external/public-domain/tz/dist/yearistype.sh
U src/external/public-domain/tz/dist/zone1970.tab
U src/external/public-domain/tz/dist/leapseconds.awk
U src/external/public-domain/tz/dist/checktab.awk
U src/external/public-domain/tz/dist/zoneinfo2tdf.pl
U src/external/public-domain/tz/dist/ziguard.awk
U src/external/public-domain/tz/dist/zishrink.awk

No conflicts created by this import



CVS commit: src/tests/usr.bin/cc

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 10:44:24 UTC 2018

Modified Files:
src/tests/usr.bin/cc: t_ubsan_int_add_overflow.sh
t_ubsan_int_divzero.sh t_ubsan_int_neg_overflow.sh
t_ubsan_int_sub_overflow.sh t_ubsan_vla_out_of_bounds.sh

Log Message:
Use more formal speech in messages


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_int_divzero.sh \
src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.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/usr.bin/cc/t_ubsan_int_add_overflow.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.1 src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.2
--- src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh	Fri May  4 10:44:24 2018
@@ -156,11 +156,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -e match:"signed integer overflow" ./md32
 
Index: src/tests/usr.bin/cc/t_ubsan_int_divzero.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.1 src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.2
--- src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_divzero.sh	Fri May  4 10:44:24 2018
@@ -150,11 +150,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -s signal:8 -e match:"division by zero" ./md32
 
Index: src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.1 src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.2
--- src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh	Fri May  4 10:44:24 2018
@@ -156,11 +156,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -e match:"negation of" ./md32
 
Index: src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh
diff -u src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.1 src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.2
--- src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh	Fri May  4 10:44:24 2018
@@ -156,11 +156,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -s ignore -e match:"signed integer overflow" ./md32
 
Index: src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh
diff -u src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.1 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.2
--- src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.1	Wed May  2 18:46:05 2018
+++ src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh	Fri May  4 10:44:24 2018
@@ -153,11 +153,11 @@ EOF
 	file -b ./md32 > ./ftype32
 	file -b ./md64 > ./ftype64
 	if diff ./ftype32 ./ftype64 >/dev/null; then
-		atf_fail "Generated binz ain't no different"
+		atf_fail "Generated 32bit binaries do not differ from 64bit ones"
 	fi
-	echo "32bit Binz on this platform are:"
+	echo "32bit binaries on this platform are:"
 	cat ./ftype32
-	echo "64bit Binz are on the other hand:"
+	echo "64bit binaries are on the other hand:"
 	cat ./ftype64
 	atf_check -e match:"out 

CVS commit: src/tests/usr.bin/cc

2018-05-04 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Fri May  4 10:44:24 UTC 2018

Modified Files:
src/tests/usr.bin/cc: t_ubsan_int_add_overflow.sh
t_ubsan_int_divzero.sh t_ubsan_int_neg_overflow.sh
t_ubsan_int_sub_overflow.sh t_ubsan_vla_out_of_bounds.sh

Log Message:
Use more formal speech in messages


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_int_divzero.sh \
src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh \
src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh

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



  1   2   >