CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Sat Feb 9 07:55:26 UTC 2019 Modified Files: src/share/man/man4: mue.4 Log Message: Elucidate chip family of supported adapters. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/mue.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/mue.4 diff -u src/share/man/man4/mue.4:1.3 src/share/man/man4/mue.4:1.4 --- src/share/man/man4/mue.4:1.3 Wed Feb 6 12:10:00 2019 +++ src/share/man/man4/mue.4 Sat Feb 9 07:55:26 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mue.4,v 1.3 2019/02/06 12:10:00 rin Exp $ +.\" $NetBSD: mue.4,v 1.4 2019/02/09 07:55:26 rin Exp $ .\" $OpenBSD: mue.4,v 1.2 2018/08/03 06:13:14 jmc Exp $ .\" .\" Copyright (c) 2018 Kevin Lo @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd February 6, 2019 +.Dd February 9, 2019 .Dt MUE 4 .Os .Sh NAME @@ -28,16 +28,20 @@ The .Nm driver supports Microchip LAN7500/LAN7505/LAN7515/LAN7850 USB 2.0 Gigabit -Ethernet devices and LAN7800/LAN7801 USB 3.0 Gigabit Ethernet devices, -including the following: +Ethernet devices including: .Pp .Bl -tag -width Ds -offset indent -compact -.It Raspberry Pi 3 Model B+ -.It Microchip EVB-LAN7800LC .It StarTech USB21000S2 .It Z-TEK ZE582 .El .Pp +and LAN7800/LAN7801 USB 3.0 Gigabit Ethernet devices including: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Microchip EVB-LAN7800LC +.It Raspberry Pi 3 Model B+ (USB 2.0) +.El +.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh SEE ALSO
CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Sat Feb 9 07:54:51 UTC 2019 Modified Files: src/share/man/man4: ure.4 Log Message: Add examples of supported adapters. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/ure.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/ure.4 diff -u src/share/man/man4/ure.4:1.2 src/share/man/man4/ure.4:1.3 --- src/share/man/man4/ure.4:1.2 Wed Feb 6 11:57:17 2019 +++ src/share/man/man4/ure.4 Sat Feb 9 07:54:51 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ure.4,v 1.2 2019/02/06 11:57:17 wiz Exp $ +.\" $NetBSD: ure.4,v 1.3 2019/02/09 07:54:51 rin Exp $ .\" $OpenBSD: ure.4,v 1.5 2017/04/16 20:26:34 jmc Exp $ .\" .\" Copyright (c) 2015 Kevin Lo @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: head/share/man/man4/ure.4 291557 2015-12-01 05:12:13Z kevlo $ .\" -.Dd February 6, 2019 +.Dd February 9, 2019 .Dt URE 4 .Os .Sh NAME @@ -41,8 +41,17 @@ The .Nm driver provides support for USB Ethernet adapters based on the RealTek -RTL8152 USB Fast Ethernet and RTL8153 USB Gigabit Ethernet controller -chips. +RTL8152 USB Fast Ethernet devices including: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Cable Matters 202023 USB 2.0 to 10/100 Fast Ethernet Network Adapter +.El +.Pp +and RTL8153 USB Gigabit Ethernet devices including: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Anker A7611 Aluminum USB 3.0 to Ethernet Adapter +.El .Pp The RTL8152 contains an integrated Fast Ethernet MAC, which supports both 10 and 100Mbps speeds in either full or half duplex.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: rin Date: Sat Feb 9 07:50:47 UTC 2019 Modified Files: src/sys/dev/usb: if_ure.c Log Message: Print chip ID when attached. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/if_ure.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/usb/if_ure.c diff -u src/sys/dev/usb/if_ure.c:1.2 src/sys/dev/usb/if_ure.c:1.3 --- src/sys/dev/usb/if_ure.c:1.2 Wed Feb 6 22:54:41 2019 +++ src/sys/dev/usb/if_ure.c Sat Feb 9 07:50:47 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ure.c,v 1.2 2019/02/06 22:54:41 rin Exp $ */ +/* $NetBSD: if_ure.c,v 1.3 2019/02/09 07:50:47 rin Exp $ */ /* $OpenBSD: if_ure.c,v 1.10 2018/11/02 21:32:30 jcs Exp $ */ /*- * Copyright (c) 2015-2016 Kevin Lo @@ -29,7 +29,7 @@ /* RealTek RTL8152/RTL8153 10/100/Gigabit USB Ethernet device */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.2 2019/02/06 22:54:41 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ure.c,v 1.3 2019/02/09 07:50:47 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1158,8 +1158,10 @@ ure_attach(device_t parent, device_t sel /* fake addr? or just fail? */ break; } - aprint_normal_dev(self, "%sver %04x\n", - sc->ure_chip != 0 ? "" : "unknown", ver); + aprint_normal_dev(self, "RTL%d %sver %04x\n", + (sc->ure_flags & URE_FLAG_8152) ? 8152 : 8153, + (sc->ure_chip != 0) ? "" : "unknown ", + ver); if (sc->ure_flags & URE_FLAG_8152) ure_rtl8152_init(sc);
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: rin
Date: Sat Feb 9 07:48:39 UTC 2019
Modified Files:
src/sys/dev/mii: rlphy.c
Log Message:
Support RTL8152. Tested on ure(4) (RTL8152).
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/mii/rlphy.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/mii/rlphy.c
diff -u src/sys/dev/mii/rlphy.c:1.32 src/sys/dev/mii/rlphy.c:1.33
--- src/sys/dev/mii/rlphy.c:1.32 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/mii/rlphy.c Sat Feb 9 07:48:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rlphy.c,v 1.32 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: rlphy.c,v 1.33 2019/02/09 07:48:39 rin Exp $ */
/* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.32 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.33 2019/02/09 07:48:39 rin Exp $");
#include
#include
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.
struct rlphy_softc {
struct mii_softc sc_mii;
- int sc_rtl8201l;
+ int sc_rtl8201;
};
int rlphymatch(device_t, cfdata_t, void *);
@@ -79,6 +79,8 @@ const struct mii_phy_funcs rlphy_funcs =
static const struct mii_phydesc rlphys[] = {
{ MII_OUI_yyREALTEK, MII_MODEL_yyREALTEK_RTL8201L,
MII_STR_yyREALTEK_RTL8201L },
+ { MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8201E,
+ MII_STR_REALTEK_RTL8201E },
{ MII_OUI_ICPLUS, MII_MODEL_ICPLUS_IP101,
MII_STR_ICPLUS_IP101 },
@@ -122,9 +124,13 @@ rlphyattach(device_t parent, device_t se
aprint_naive("\n");
if (MII_MODEL(ma->mii_id2) == MII_MODEL_yyREALTEK_RTL8201L) {
- rsc->sc_rtl8201l = 1;
+ rsc->sc_rtl8201 = 1;
aprint_normal(": %s, rev. %d\n", MII_STR_yyREALTEK_RTL8201L,
MII_REV(ma->mii_id2));
+ } else if (MII_MODEL(ma->mii_id2) == MII_MODEL_REALTEK_RTL8201E) {
+ rsc->sc_rtl8201 = 1;
+ aprint_normal(": %s, rev. %d\n", MII_STR_REALTEK_RTL8201E,
+ MII_REV(ma->mii_id2));
} else
aprint_normal(": Realtek internal PHY\n");
@@ -279,7 +285,7 @@ rlphy_status(struct mii_softc *sc)
* To determine the link speed, we have to do one
* of two things:
*
- * - If this is a standalone RealTek RTL8201(L) PHY,
+ * - If this is a standalone RealTek RTL8201 PHY,
* we can determine the link speed by testing bit 0
* in the magic, vendor-specific register at offset
* 0x19.
@@ -288,7 +294,7 @@ rlphy_status(struct mii_softc *sc)
* can test the 'SPEED10' bit of the MAC's media status
* register.
*/
- if (rsc->sc_rtl8201l) {
+ if (rsc->sc_rtl8201) {
PHY_READ(sc, 0x0019, ®);
if (reg & 0x01)
mii->mii_media_active |= IFM_100_TX;
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: rin
Date: Sat Feb 9 07:46:08 UTC 2019
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/mii/miidevs_data.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/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.136 src/sys/dev/mii/miidevs.h:1.137
--- src/sys/dev/mii/miidevs.h:1.136 Fri Feb 8 09:16:28 2019
+++ src/sys/dev/mii/miidevs.h Sat Feb 9 07:46:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: miidevs.h,v 1.136 2019/02/08 09:16:28 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.137 2019/02/09 07:46:07 rin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -491,6 +491,8 @@
#define MII_STR_xxREALTEK_RTL8169S "RTL8169S/8110S/8211 1000BASE-T media interface"
#define MII_MODEL_REALTEK_RTL8251 0x
#define MII_STR_REALTEK_RTL8251 "RTL8251 1000BASE-T media interface"
+#define MII_MODEL_REALTEK_RTL8201E 0x0008
+#define MII_STR_REALTEK_RTL8201E "RTL8201E 10/100 media interface"
#define MII_MODEL_REALTEK_RTL8169S 0x0011
#define MII_STR_REALTEK_RTL8169S "RTL8169S/8110S/8211 1000BASE-T media interface"
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.124 src/sys/dev/mii/miidevs_data.h:1.125
--- src/sys/dev/mii/miidevs_data.h:1.124 Fri Feb 8 09:16:28 2019
+++ src/sys/dev/mii/miidevs_data.h Sat Feb 9 07:46:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: miidevs_data.h,v 1.124 2019/02/08 09:16:28 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.125 2019/02/09 07:46:07 rin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -198,6 +198,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_yyREALTEK, MII_MODEL_yyREALTEK_RTL8201L, MII_STR_yyREALTEK_RTL8201L },
{ MII_OUI_xxREALTEK, MII_MODEL_xxREALTEK_RTL8169S, MII_STR_xxREALTEK_RTL8169S },
{ MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8251, MII_STR_REALTEK_RTL8251 },
+ { MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8201E, MII_STR_REALTEK_RTL8201E },
{ MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8169S, MII_STR_REALTEK_RTL8169S },
{ MII_OUI_SEEQ, MII_MODEL_SEEQ_80220, MII_STR_SEEQ_80220 },
{ MII_OUI_SEEQ, MII_MODEL_SEEQ_84220, MII_STR_SEEQ_84220 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: rin Date: Sat Feb 9 07:45:34 UTC 2019 Modified Files: src/sys/dev/mii: miidevs Log Message: Add RTL8201E from OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.133 src/sys/dev/mii/miidevs:1.134 --- src/sys/dev/mii/miidevs:1.133 Fri Feb 8 09:16:11 2019 +++ src/sys/dev/mii/miidevs Sat Feb 9 07:45:34 2019 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.133 2019/02/08 09:16:11 msaitoh Exp $ +$NetBSD: miidevs,v 1.134 2019/02/09 07:45:34 rin Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -323,6 +323,7 @@ model RDC R6040 0x0003 R6040 10/100 me model yyREALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface model REALTEK RTL8251 0x RTL8251 1000BASE-T media interface +model REALTEK RTL8201E 0x0008 RTL8201E 10/100 media interface model REALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface /* Seeq PHYs */
CVS commit: src/external/gpl3/gcc/usr.bin/cpp
Module Name:src
Committed By: mrg
Date: Sat Feb 9 07:32:50 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
Log Message:
make sure Makefile.inc is included before Makefile.driver.
allows removing a depend hack and may also fix dtrace/ctf builds.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10 Fri Feb 1 10:36:33 2019
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Sat Feb 9 07:32:50 2019
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/09 07:32:50 mrg Exp $
+
+.include
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
+.include "../Makefile.driver"
.include "../Makefile.target-defines"
COPTS+= -Wno-stack-protector
@@ -18,11 +21,8 @@ INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/g
LDADD+= -lintl
DPADD+= ${LIBINTL}
-.include
-
ADD_FRONTEND_LIBRARY= no
.include "../Makefile.frontend"
-.include "../Makefile.driver"
${SRCS}: ${GCCARCH}/defs.mk
@@ -33,6 +33,3 @@ COPTS.gcc.c= -Wno-stack-protector
.PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
cpp.info: gcc-vers.texi
-
-# XXX - driver-i386.o isn't built otherwise
-${PROG}: ${OBJS}
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Feb 9 07:20:21 UTC 2019 Modified Files: src/sys/arch/arm/arm: armv6_start.S Log Message: Typo in comment To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/armv6_start.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/arm/arm/armv6_start.S diff -u src/sys/arch/arm/arm/armv6_start.S:1.7 src/sys/arch/arm/arm/armv6_start.S:1.8 --- src/sys/arch/arm/arm/armv6_start.S:1.7 Sat Feb 9 07:19:02 2019 +++ src/sys/arch/arm/arm/armv6_start.S Sat Feb 9 07:20:21 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: armv6_start.S,v 1.7 2019/02/09 07:19:02 skrll Exp $ */ +/* $NetBSD: armv6_start.S,v 1.8 2019/02/09 07:20:21 skrll Exp $ */ /*- * Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc. @@ -634,7 +634,7 @@ armv7_init: .ltorg /* - * Transititions the CPU to using the TTB passed in r0. + * Transitions the CPU to using the TTB passed in r0. * * Uses the following callee saved registers: *
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Feb 9 07:19:02 UTC 2019
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
Log Message:
Print revidr of BP as well as APs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/armv6_start.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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.6 src/sys/arch/arm/arm/armv6_start.S:1.7
--- src/sys/arch/arm/arm/armv6_start.S:1.6 Wed Feb 6 14:12:25 2019
+++ src/sys/arch/arm/arm/armv6_start.S Sat Feb 9 07:19:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.6 2019/02/06 14:12:25 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.7 2019/02/09 07:19:02 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -163,6 +163,9 @@ ENTRY_NP(generic_start)
VPRINTF("\n\rmidr :")
mrc p15, 0, r0, c0, c0, 0 // MIDR
VPRINTX(r0)
+ VPRINTF("\n\rrevidr: ")
+ mrc p15, 0, r0, c0, c0, 6 // REVIDR
+ VPRINTX(r0)
VPRINTF("\n\rmpidr:")
mrc p15, 0, r0, c0, c0, 5 // MPIDR
VPRINTX(r0)
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Feb 9 03:57:04 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile src/tools/gcc: mknative-gcc Removed Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64: gthr-posix.h gthr-single.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32: gthr-posix.h gthr-single.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64: gthr-posix.h gthr-single.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: gthr-posix.h gthr-single.h gthr-tpf.h gthr.h Log Message: - build the gthr*.h files to be installed on the fly, instead of having dozens of copies of the same thing in the tree. - don't fetch any gthr*.h files. - delete ancient gthr-tpf.h that was removed in GCC 4.8 or so. th
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Sat Feb 9 03:35:55 UTC 2019
Modified Files:
src/bin/sh: eval.c histedit.c input.c jobs.c memalloc.c redir.c var.c
Log Message:
INTON / INTOFF audit and cleanup.
No visible differences expected - there is a remote chance that
some internal lossage may no longer occur in interactive shells
that receive SIGINT (untrapped) at inopportune times, but you would
have had to have been very unlucky to have ever suffered from that.
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/bin/sh/eval.c
cvs rdiff -u -r1.53 -r1.54 src/bin/sh/histedit.c
cvs rdiff -u -r1.69 -r1.70 src/bin/sh/input.c
cvs rdiff -u -r1.103 -r1.104 src/bin/sh/jobs.c
cvs rdiff -u -r1.32 -r1.33 src/bin/sh/memalloc.c
cvs rdiff -u -r1.62 -r1.63 src/bin/sh/redir.c
cvs rdiff -u -r1.75 -r1.76 src/bin/sh/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.171 src/bin/sh/eval.c:1.172
--- src/bin/sh/eval.c:1.171 Mon Feb 4 11:16:41 2019
+++ src/bin/sh/eval.c Sat Feb 9 03:35:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.171 2019/02/04 11:16:41 kre Exp $ */
+/* $NetBSD: eval.c,v 1.172 2019/02/09 03:35:55 kre Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.171 2019/02/04 11:16:41 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.172 2019/02/09 03:35:55 kre Exp $");
#endif
#endif /* not lint */
@@ -545,19 +545,19 @@ evalsubshell(union node *n, int flags)
outxc('\n');
flushout(outx);
}
+ INTOFF;
if ((!backgnd && flags & EV_EXIT && !have_traps()) ||
forkshell(jp = makejob(n, 1), n, backgnd?FORK_BG:FORK_FG) == 0) {
- INTON;
if (backgnd)
flags &=~ EV_TESTED;
redirect(n->nredir.redirect, REDIR_KEEP);
- evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */
- } else if (!backgnd) {
- INTOFF;
- exitstatus = waitforjob(jp);
INTON;
- } else
+ evaltree(n->nredir.n, flags | EV_EXIT); /* never returns */
+ } else if (backgnd)
exitstatus = 0;
+ else
+ exitstatus = waitforjob(jp);
+ INTON;
if (!backgnd && xflag && n->nredir.redirect) {
outxstr(expandstr(ps4val(), line_number));
@@ -714,11 +714,9 @@ evalpipe(union node *n)
close(pip[1]);
}
if (n->npipe.backgnd == 0) {
- INTOFF;
exitstatus = waitforjob(jp);
CTRACE(DBG_EVAL, ("evalpipe: job done exit status %d\n",
exitstatus));
- INTON;
} else
exitstatus = 0;
INTON;
Index: src/bin/sh/histedit.c
diff -u src/bin/sh/histedit.c:1.53 src/bin/sh/histedit.c:1.54
--- src/bin/sh/histedit.c:1.53 Fri Jul 13 22:43:44 2018
+++ src/bin/sh/histedit.c Sat Feb 9 03:35:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.c,v 1.53 2018/07/13 22:43:44 kre Exp $ */
+/* $NetBSD: histedit.c,v 1.54 2019/02/09 03:35:55 kre Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
-__RCSID("$NetBSD: histedit.c,v 1.53 2018/07/13 22:43:44 kre Exp $");
+__RCSID("$NetBSD: histedit.c,v 1.54 2019/02/09 03:35:55 kre Exp $");
#endif
#endif /* not lint */
@@ -153,6 +153,7 @@ bad:
INTON;
}
if (el) {
+ INTOFF;
if (Vflag)
el_set(el, EL_EDITOR, "vi");
else if (Eflag)
@@ -160,6 +161,7 @@ bad:
el_set(el, EL_BIND, "^I",
tabcomplete ? "rl-complete" : "ed-insert", NULL);
el_source(el, lookupvar("EDITRC"));
+ INTON;
}
} else {
INTOFF;
@@ -190,17 +192,21 @@ set_prompt_lit(const char *lit_ch)
mbtowc(&wc, NULL, 1); /* state init */
+ INTOFF;
if (mbtowc(&wc, lit_ch, strlen(lit_ch)) <= 0)
el_set(el, EL_PROMPT, getprompt);
else
el_set(el, EL_PROMPT_ESC, getprompt, (int)wc);
+ INTON;
}
void
set_editrc(const char *fname)
{
+ INTOFF;
if (iflag && editing && el)
el_source(el, fname);
+ INTON;
}
void
@@ -213,19 +219,23 @@ sethistsize(const char *hs)
if (hs == NULL || *hs == '\0' || *hs == '-' ||
(histsize = number(hs)) < 0)
histsize = 100;
+ INTOFF;
history(hist, &he, H_SETSIZE, histsize);
history(hist, &he, H_SETUNIQUE, 1);
+ INTON;
}
}
void
setterm(const char *term)
{
+ INTOFF;
if (el != NULL && term != NULL)
if (el_set(el, EL_TERMINAL, term) != 0) {
outfmt(out2, "sh: Can't set terminal type %s\n", term);
outfmt(out2, "sh: Using dumb terminal settings.\n");
}
+ INTON;
}
int
@@ -236,11 +246,14 @@ inputrc(int argc, char **argv)
return 1;
}
if (el != NULL) {
+ INTOFF;
if (el_source(el, argv[1])) {
+ INTON;
out2str("inputrc: failed\n");
return 1;
- } else
- return 0;
+ }
+ INTON;
+ return 0;
} else {
out2str("sh: inputrc ignored, not editing\n");
return 1;
@@ -468,9 +481,10 @@ histcmd(volatile int argc, char ** volat
editcmd = stalloc(cmdlen);
snprintf(editcmd, cmdlen, "%s %s", editor, editfile);
evalstring(editcmd, 0); /* X
CVS commit: src/sys/dev/raidframe
Module Name:src Committed By: christos Date: Sat Feb 9 03:34:00 UTC 2019 Modified Files: src/sys/dev/raidframe: rf_alloclist.c rf_chaindecluster.c rf_compat32.c rf_compat50.c rf_compat80.c rf_copyback.c rf_cvscan.c rf_dagdegrd.c rf_dagdegwr.c rf_dagffwr.c rf_dagutils.c rf_debugMem.c rf_debugMem.h rf_decluster.c rf_declusterPQ.c rf_diskqueue.c rf_disks.c rf_driver.c rf_evenodd.c rf_evenodd_dagfuncs.c rf_fifo.c rf_interdecluster.c rf_map.c rf_netbsdkintf.c rf_paritylog.c rf_paritylogDiskMgr.c rf_paritylogging.c rf_parityloggingdags.c rf_paritymap.c rf_parityscan.c rf_psstatus.c rf_raid0.c rf_raid1.c rf_raid4.c rf_raid5.c rf_raid5_rotatedspare.c rf_reconmap.c rf_reconstruct.c rf_reconutil.c rf_sstf.c rf_stripelocks.c rf_utils.c Log Message: - Change the allocation macros to be more like function calls - Change sizeof(type) -> sizeof(*variable) - Use macros for the long buffer length allocations - Remove "bit polishing" memsets() -- do them only once - Remove unnecessary casts Thanks to oster@ for finding bugs and testing. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/raidframe/rf_alloclist.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/raidframe/rf_chaindecluster.c \ src/sys/dev/raidframe/rf_fifo.c src/sys/dev/raidframe/rf_raid0.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/raidframe/rf_compat32.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/raidframe/rf_compat50.c \ src/sys/dev/raidframe/rf_paritymap.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/raidframe/rf_compat80.c cvs rdiff -u -r1.50 -r1.51 src/sys/dev/raidframe/rf_copyback.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/raidframe/rf_cvscan.c \ src/sys/dev/raidframe/rf_declusterPQ.c src/sys/dev/raidframe/rf_sstf.c \ src/sys/dev/raidframe/rf_utils.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/raidframe/rf_dagdegrd.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_dagdegwr.c cvs rdiff -u -r1.34 -r1.35 src/sys/dev/raidframe/rf_dagffwr.c \ src/sys/dev/raidframe/rf_paritylogging.c \ src/sys/dev/raidframe/rf_parityscan.c src/sys/dev/raidframe/rf_psstatus.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/raidframe/rf_dagutils.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/raidframe/rf_debugMem.c \ src/sys/dev/raidframe/rf_evenodd.c \ src/sys/dev/raidframe/rf_parityloggingdags.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/raidframe/rf_debugMem.h \ src/sys/dev/raidframe/rf_raid5_rotatedspare.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/raidframe/rf_decluster.c cvs rdiff -u -r1.53 -r1.54 src/sys/dev/raidframe/rf_diskqueue.c cvs rdiff -u -r1.90 -r1.91 src/sys/dev/raidframe/rf_disks.c cvs rdiff -u -r1.134 -r1.135 src/sys/dev/raidframe/rf_driver.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/raidframe/rf_evenodd_dagfuncs.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/raidframe/rf_interdecluster.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/raidframe/rf_map.c cvs rdiff -u -r1.373 -r1.374 src/sys/dev/raidframe/rf_netbsdkintf.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/raidframe/rf_paritylog.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/raidframe/rf_paritylogDiskMgr.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/raidframe/rf_raid1.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/raidframe/rf_raid4.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/raidframe/rf_raid5.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/raidframe/rf_reconmap.c \ src/sys/dev/raidframe/rf_reconutil.c cvs rdiff -u -r1.121 -r1.122 src/sys/dev/raidframe/rf_reconstruct.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/raidframe/rf_stripelocks.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/raidframe/rf_alloclist.c diff -u src/sys/dev/raidframe/rf_alloclist.c:1.26 src/sys/dev/raidframe/rf_alloclist.c:1.27 --- src/sys/dev/raidframe/rf_alloclist.c:1.26 Sun Mar 15 13:17:23 2009 +++ src/sys/dev/raidframe/rf_alloclist.c Fri Feb 8 22:33:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rf_alloclist.c,v 1.26 2009/03/15 17:17:23 cegger Exp $ */ +/* $NetBSD: rf_alloclist.c,v 1.27 2019/02/09 03:33:59 christos Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -37,7 +37,7 @@ ***/ #include -__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.26 2009/03/15 17:17:23 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.27 2019/02/09 03:33:59 christos Exp $"); #include @@ -125,6 +125,6 @@ rf_real_MakeAllocList(void) RF_AllocListElem_t *p; p = pool_get(&rf_pools.alloclist, PR_WAITOK); - memset((char *) p, 0, sizeof(RF_AllocListElem_t)); + memset(p, 0, sizeof(*p)); return (p); } Index: src/sys/dev/raidframe/rf_chaindecluster.c diff -u src/sys/dev/raidframe/rf_chaindecluster.c:1.15 src/sys/dev/raidframe/rf_chaindecluster.c:1.16 --- src/sys/dev/raidframe/rf_chaindecluster.c:1.15 Wed Nov 15 20:33:23
CVS commit: src/external/gpl3/gcc/dist/libgcc
Module Name:src Committed By: mrg Date: Sat Feb 9 02:43:11 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libgcc: gthr-posix.h Log Message: fix the previous - it's __NetBSD__, not __NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libgcc/gthr-posix.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libgcc/gthr-posix.h diff -u src/external/gpl3/gcc/dist/libgcc/gthr-posix.h:1.2 src/external/gpl3/gcc/dist/libgcc/gthr-posix.h:1.3 --- src/external/gpl3/gcc/dist/libgcc/gthr-posix.h:1.2 Sat Feb 9 01:27:43 2019 +++ src/external/gpl3/gcc/dist/libgcc/gthr-posix.h Sat Feb 9 02:43:11 2019 @@ -169,7 +169,7 @@ __gthrw(pthread_setschedparam) makes std::call_once() so we do the same. */ -#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) || defined(__NetBSD) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) || defined(__NetBSD__) static volatile int __gthread_active = -1;
CVS commit: src/tests/usr.bin/cc
Module Name:src
Committed By: mrg
Date: Sat Feb 9 02:36:28 UTC 2019
Modified Files:
src/tests/usr.bin/cc: t_hello.sh
Log Message:
fix hello_profile's hello_profile_head function name.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/cc/t_hello.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_hello.sh
diff -u src/tests/usr.bin/cc/t_hello.sh:1.7 src/tests/usr.bin/cc/t_hello.sh:1.8
--- src/tests/usr.bin/cc/t_hello.sh:1.7 Mon Sep 3 21:54:57 2018
+++ src/tests/usr.bin/cc/t_hello.sh Sat Feb 9 02:36:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_hello.sh,v 1.7 2018/09/03 21:54:57 maya Exp $
+# $NetBSD: t_hello.sh,v 1.8 2019/02/09 02:36:28 mrg Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,7 +32,7 @@ hello_head() {
}
atf_test_case hello_profile
-hello_head() {
+hello_profile_head() {
atf_set "descr" "compile and run \"hello world\" with profiling option"
atf_set "require.progs" "cc"
}
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch
Module Name:src Committed By: mrg Date: Sat Feb 9 02:36:57 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch: Makefile Log Message: remove old comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.4 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.5 --- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile:1.4 Sun Jul 15 00:18:13 2018 +++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/arch/Makefile Sat Feb 9 02:36:56 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/07/15 00:18:13 christos Exp $ +# $NetBSD: Makefile,v 1.5 2019/02/09 02:36:56 mrg Exp $ # install multilib c++config.h files @@ -40,7 +40,6 @@ c++config.h: Makefile mkcxxconfig_h.sh CLEANFILES+= c++config.h INCS+= c++config.h -#INCSNAME_c++config.h= cxxconfig.h INCSDIR= /usr/include/g++/bits .include
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: manu
Date: Sat Feb 9 02:22:45 UTC 2019
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
Fix directory filehandle usage with libufse. Fix lookup count
libfuse does not use filehandle the same way for directories and other
objects. As a result, filehandles obtained by OPENDIR should not be
sent on non-directory related operations like READ/WRITE/GETATTR...
While there, fix the lookup count sent to the FORGET operation, which
led to leaked nodes.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/lib/libperfuse/ops.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.85 src/lib/libperfuse/ops.c:1.86
--- src/lib/libperfuse/ops.c:1.85 Fri Nov 16 02:39:02 2018
+++ src/lib/libperfuse/ops.c Sat Feb 9 02:22:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.85 2018/11/16 02:39:02 manu Exp $ */
+/* $NetBSD: ops.c,v 1.86 2019/02/09 02:22:45 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -105,6 +105,9 @@ const int vttoif_tab[9] = {
#define IFTOVT(mode) (iftovt_tab[((mode) & S_IFMT) >> 12])
#define VTTOIF(indx) (vttoif_tab[(int)(indx)])
+#define PN_ISDIR(opc) \
+ (puffs_pn_getvap((struct puffs_node *)opc)->va_type == VDIR)
+
#if 0
static void
print_node(const char *func, puffs_cookie_t opc)
@@ -141,7 +144,7 @@ perfuse_node_close_common(struct puffs_u
pn = (struct puffs_node *)opc;
pnd = PERFUSE_NODE_DATA(pn);
- if (puffs_pn_getvap(pn)->va_type == VDIR) {
+ if (PN_ISDIR(opc)) {
op = FUSE_RELEASEDIR;
mode = FREAD;
} else {
@@ -479,13 +482,14 @@ node_lookup_common(struct puffs_usermoun
fuse_attr_to_vap(ps, &pn->pn_va, &feo->attr);
pn->pn_va.va_gen = (u_long)(feo->generation);
PERFUSE_NODE_DATA(pn)->pnd_fuse_nlookup++;
+ PERFUSE_NODE_DATA(pn)->pnd_puffs_nlookup++;
*pnp = pn;
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags & PDF_FILENAME)
DPRINTF("%s: opc = %p, looked up opc = %p, "
- "nodeid = 0x%"PRIx64" file = \"%s\"\n", __func__,
+ "nodeid = 0x%"PRIx64" file = \"%s\"\n", __func__,
(void *)opc, pn, feo->nodeid, path);
#endif
@@ -533,6 +537,7 @@ node_mk_common(struct puffs_usermount *p
pn = perfuse_new_pn(pu, pcn->pcn_name, opc);
PERFUSE_NODE_DATA(pn)->pnd_nodeid = feo->nodeid;
+ PERFUSE_NODE_DATA(pn)->pnd_fuse_nlookup++;
PERFUSE_NODE_DATA(pn)->pnd_puffs_nlookup++;
perfuse_node_cache(ps, pn);
@@ -1138,6 +1143,7 @@ perfuse_node_lookup(struct puffs_usermou
break;
}
+ PERFUSE_NODE_DATA(pn)->pnd_fuse_nlookup++;
PERFUSE_NODE_DATA(pn)->pnd_puffs_nlookup++;
error = 0;
@@ -1247,6 +1253,7 @@ perfuse_node_create(struct puffs_usermou
pn = perfuse_new_pn(pu, name, opc);
perfuse_new_fh((puffs_cookie_t)pn, foo->fh, FWRITE);
PERFUSE_NODE_DATA(pn)->pnd_nodeid = feo->nodeid;
+ PERFUSE_NODE_DATA(pn)->pnd_fuse_nlookup++;
PERFUSE_NODE_DATA(pn)->pnd_puffs_nlookup++;
perfuse_node_cache(ps, pn);
@@ -1355,11 +1362,9 @@ perfuse_node_open2(struct puffs_usermoun
int op;
struct fuse_open_in *foi;
struct fuse_open_out *foo;
- struct puffs_node *pn;
int error;
ps = puffs_getspecific(pu);
- pn = (struct puffs_node *)opc;
pnd = PERFUSE_NODE_DATA(opc);
error = 0;
@@ -1368,7 +1373,7 @@ perfuse_node_open2(struct puffs_usermoun
node_ref(opc);
- if (puffs_pn_getvap(pn)->va_type == VDIR)
+ if (PN_ISDIR(opc))
op = FUSE_OPENDIR;
else
op = FUSE_OPEN;
@@ -1592,9 +1597,9 @@ perfuse_node_getattr_ttl(struct puffs_us
fgi = GET_INPAYLOAD(ps, pm, fuse_getattr_in);
fgi->getattr_flags = 0;
fgi->dummy = 0;
- fgi->fh = 0;
+ fgi->fh = FUSE_UNKNOWN_FH;
- if (PERFUSE_NODE_DATA(opc)->pnd_flags & PND_OPEN) {
+ if (!PN_ISDIR(opc) && PERFUSE_NODE_DATA(opc)->pnd_flags & PND_OPEN) {
fgi->fh = perfuse_get_fh(opc, FREAD);
fgi->getattr_flags |= FUSE_GETATTR_FH;
}
@@ -1728,7 +1733,7 @@ perfuse_node_setattr_ttl(struct puffs_us
node_ref(opc);
- if (pnd->pnd_flags & PND_WFH)
+ if (!PN_ISDIR(opc) && pnd->pnd_flags & PND_WFH)
fh = perfuse_get_fh(opc, FWRITE);
else
fh = FUSE_UNKNOWN_FH;
@@ -1954,7 +1959,7 @@ perfuse_node_poll(struct puffs_usermount
*/
pm = ps->ps_new_msg(pu, opc, FUSE_POLL, sizeof(*fpi), NULL);
fpi = GET_INPAYLOAD(ps, pm, fuse_poll_in);
- fpi->fh = perfuse_get_fh(opc, FREAD);
+ fpi->fh = PN_ISDIR(opc) ? FUSE_UNKNOWN_FH : perfuse_get_fh(opc, FREAD);
fpi->kh = 0;
fpi->flags = 0;
@@ -2010,7 +2015,7 @@ perfuse_node_fsync(struct puffs_usermoun
node_ref(opc);
- if (puffs_pn_getvap((struct puffs_node *)opc)->va_type == VDIR)
+ if (PN_ISDIR(opc))
op = FUSE_FSYNCDIR;
else /* VREG but also other types such as VLNK */
op = FUSE_FSYNC;
@@ -2513,7 +2518,7 @@ perfuse_node_readdir(struct puffs_usermo
goto out;
}
- fh = perfuse_get_fh(opc, FREAD);
+ fh = perfuse_get_fh(opc, FREAD);
#ifdef PERFUSE_DEBUG
if (perfuse_diagflags & PDF_F
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: mrg Date: Sat Feb 9 02:15:05 UTC 2019 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 Log Message: mark ./usr/include/g++/bits/aarch64/c++config.h and ./usr/include/g++/bits/arm/c++config.h as "libstdcxx" not "gcc=6". To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/comp/ad.aarch64 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/ad.aarch64 diff -u src/distrib/sets/lists/comp/ad.aarch64:1.30 src/distrib/sets/lists/comp/ad.aarch64:1.31 --- src/distrib/sets/lists/comp/ad.aarch64:1.30 Tue Feb 5 13:57:25 2019 +++ src/distrib/sets/lists/comp/ad.aarch64 Sat Feb 9 02:15:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.30 2019/02/05 13:57:25 mrg Exp $ +# $NetBSD: ad.aarch64,v 1.31 2019/02/09 02:15:05 mrg Exp $ ./usr/include/aarch64comp-c-include ./usr/include/aarch64/ansi.h comp-c-include ./usr/include/aarch64/aout_machdep.h comp-c-include @@ -128,9 +128,9 @@ ./usr/include/evbarm64/disklabel.h comp-obsolete obsolete ./usr/include/evbarm64/intr.h comp-obsolete obsolete ./usr/include/g++/bits/aarch64 comp-c-include compat -./usr/include/g++/bits/aarch64/c++config.h comp-c-include gcc=6,compat +./usr/include/g++/bits/aarch64/c++config.h comp-c-include libstdcxx,compat ./usr/include/g++/bits/arm comp-c-include compat -./usr/include/g++/bits/arm/c++config.h comp-c-include gcc=6,compat +./usr/include/g++/bits/arm/c++config.h comp-c-include libstdcxx,compat ./usr/include/gcc-4.8/arm_neon.h comp-c-include gcc=48 ./usr/include/gcc-4.8/mmintrin.h comp-c-include gcc=48 ./usr/include/gcc-4.8/tgmath.h comp-c-include gcc=48
CVS commit: src/etc/mtree
Module Name:src
Committed By: mrg
Date: Sat Feb 9 02:04:19 UTC 2019
Modified Files:
src/etc/mtree: Makefile NetBSD.dist.base
Added Files:
src/etc/mtree: NetBSD.dist.iscsi
Log Message:
move ./usr/include/dev/iscsi into NetBSD.dist.iscsi that is only
included if MKISCSI != no.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/etc/mtree/Makefile
cvs rdiff -u -r1.192 -r1.193 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.iscsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.37 src/etc/mtree/Makefile:1.38
--- src/etc/mtree/Makefile:1.37 Tue Aug 15 10:11:31 2017
+++ src/etc/mtree/Makefile Sat Feb 9 02:04:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/08/15 10:11:31 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2019/02/09 02:04:19 mrg Exp $
.include
@@ -40,6 +40,10 @@ EXTRA_DIST_FILES+= NetBSD.dist.dtrace
EXTRA_DIST_FILES+= NetBSD.dist.extsrc
.endif
+.if ${MKISCSI} != "no"
+EXTRA_DIST_FILES+= NetBSD.dist.iscsi
+.endif
+
NetBSD.dist: NetBSD.dist.tmp
cmp -s NetBSD.dist.tmp NetBSD.dist || { \
echo "Updating NetBSD.dist"; \
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.192 src/etc/mtree/NetBSD.dist.base:1.193
--- src/etc/mtree/NetBSD.dist.base:1.192 Fri Feb 8 08:51:42 2019
+++ src/etc/mtree/NetBSD.dist.base Sat Feb 9 02:04:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.192 2019/02/08 08:51:42 mrg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.193 2019/02/09 02:04:19 mrg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -128,7 +128,6 @@
./usr/include/dev/ieee1394
./usr/include/dev/ir
./usr/include/dev/isa
-./usr/include/dev/iscsi
./usr/include/dev/ofw
./usr/include/dev/pci
./usr/include/dev/pckbc
Added files:
Index: src/etc/mtree/NetBSD.dist.iscsi
diff -u /dev/null src/etc/mtree/NetBSD.dist.iscsi:1.1
--- /dev/null Sat Feb 9 02:04:19 2019
+++ src/etc/mtree/NetBSD.dist.iscsi Sat Feb 9 02:04:19 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.iscsi,v 1.1 2019/02/09 02:04:19 mrg Exp $
+
+./usr/include/dev/iscsi
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Sat Feb 9 01:29:38 UTC 2019 Modified Files: src/external/gpl3/gcc: README.gcc7 Log Message: update switched lists. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/README.gcc7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/README.gcc7 diff -u src/external/gpl3/gcc/README.gcc7:1.10 src/external/gpl3/gcc/README.gcc7:1.11 --- src/external/gpl3/gcc/README.gcc7:1.10 Fri Feb 8 02:04:29 2019 +++ src/external/gpl3/gcc/README.gcc7 Sat Feb 9 01:29:38 2019 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc7,v 1.10 2019/02/08 02:04:29 mrg Exp $ +$NetBSD: README.gcc7,v 1.11 2019/02/09 01:29:38 mrg Exp $ new stuff (from gcc 5): cc1objcplus @@ -22,8 +22,8 @@ switched: has port switched? y (yes), n architecture tools kernels libgcc native-gcc make release runs atf switched - --- -- -- --- -aarch64 y y y y y y ? n -alpha y y y y y y ? n +aarch64 y y y y y y ? y +alpha y y y y y y ? y arm y y y y y y ? n armeb y y y y y ? ? n earmv4 y y y y y y ??? y @@ -40,23 +40,23 @@ earmv7 y ? y y ? ? ? ? earmv7eb y ? y y ? ? ? ? earmv7hf y ? y y ? ? ? ? earmv7hfeb y ? y y ? ? ? ? -hppa y y y y y ? ? n -i386 y y y y y y ? n +hppa y y y y y ? ? y +i386 y y y y y y ? y ia64 y ? ? y n[2] ? ? ? m68000 y y y y y ? ? ? m68k y y y y y[1] ? ? ? -mipseb y y y y y ? ? n -mipsel y y y y y ? ? n -mips64eb y y y y y y ? n -mips64el y y y y y ? ? n +mipseb y y y y y ? ? y +mipsel y y y y y ? ? y +mips64eb y y y y y y ? y +mips64el y y y y y ? ? y powerpc y y y y y y ? n powerpc64 y ? y y n[9] ? ? ? sh3eb y y y y y ? ? n sh3el y y y y y ? ? n -sparc y y y y y y ? n -sparc64 y y y y y y ? n +sparc y y y y y y ? y +sparc64 y y y y y y ? y vax y y y y y ? ? ? -x86_64 y y y y y y y n +x86_64 y y y y y y y y -- or1k riscv32
CVS commit: src/external/gpl3/gcc/dist/libgcc
Module Name:src Committed By: christos Date: Sat Feb 9 01:27:43 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libgcc: gthr-posix.h Log Message: Follow suit with FreeBSD and solaris for the __gthread_active_p() implementation. Fixes the atf call_once unit tests. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 src/external/gpl3/gcc/dist/libgcc/gthr-posix.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libgcc/gthr-posix.h diff -u src/external/gpl3/gcc/dist/libgcc/gthr-posix.h:1.1.1.4 src/external/gpl3/gcc/dist/libgcc/gthr-posix.h:1.2 --- src/external/gpl3/gcc/dist/libgcc/gthr-posix.h:1.1.1.4 Sat Jan 19 05:14:14 2019 +++ src/external/gpl3/gcc/dist/libgcc/gthr-posix.h Fri Feb 8 20:27:43 2019 @@ -164,9 +164,12 @@ __gthrw(pthread_setschedparam) working interface is always exposed. On FreeBSD 6 and later, libc also exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc, - which means the alternate __gthread_active_p below cannot be used there. */ + which means the alternate __gthread_active_p below cannot be used there. + On NetBSD, linking with pthreads but without calling pthread_create() + makes std::call_once() so we do the same. +*/ -#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) +#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__)) || defined(__NetBSD) static volatile int __gthread_active = -1; @@ -209,7 +212,7 @@ __gthread_active_p (void) return __gthread_active_latest_value != 0; } -#else /* neither FreeBSD nor Solaris */ +#else /* neither FreeBSD nor Solaris nor NetBSD */ /* For a program to be multi-threaded the only thing that it certainly must be using is pthread_create. However, there may be other libraries that @@ -251,7 +254,7 @@ __gthread_active_p (void) return __gthread_active_ptr != 0; } -#endif /* FreeBSD or Solaris */ +#endif /* FreeBSD or Solaris or NetBSD */ #else /* not SUPPORTS_WEAK */
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Feb 9 00:59:30 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch ppc64 back to gcc7, it was an accident.
To generate a diff of this commit:
cvs rdiff -u -r1.1102 -r1.1103 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.1102 src/share/mk/bsd.own.mk:1.1103
--- src/share/mk/bsd.own.mk:1.1102 Fri Feb 8 09:35:00 2019
+++ src/share/mk/bsd.own.mk Sat Feb 9 00:59:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1102 2019/02/08 09:35:00 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1103 2019/02/09 00:59:30 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,7 +63,7 @@ TOOLCHAIN_MISSING?= no
${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "i386" || \
${MACHINE_CPU} == "mips" || \
-${MACHINE_CPU} == "powerpc" || \
+${MACHINE_ARCH} == "powerpc" || \
${MACHINE_CPU} == "sparc" || \
${MACHINE_CPU} == "sparc64" || \
${MACHINE_CPU} == "x86_64"
CVS commit: src/external/gpl3/gcc/lib/libgomp
Module Name:src
Committed By: mrg
Date: Sat Feb 9 00:49:00 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libgomp: Makefile
Log Message:
put config/posix first in the path so that the right lock.c is used.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/gcc/lib/libgomp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.23 src/external/gpl3/gcc/lib/libgomp/Makefile:1.24
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.23 Mon Feb 4 03:01:52 2019
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Sat Feb 9 00:48:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/02/04 03:01:52 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2019/02/09 00:48:59 mrg Exp $
# build GCC's libgomp, so that -fopenmp works.
@@ -57,5 +57,5 @@ COPTS.oacc-mem.c+= -Wno-pointer-arith
COPTS.lock.c+= -Wno-error=incompatible-pointer-types
COPTS.target.c+= -Wno-error=pointer-arith
-
-.PATH: ${ARCHDIR} ${DIST}/libgomp ${DIST}/libgomp/config/posix
+.PATH: ${DIST}/libgomp/config/posix
+.PATH: ${ARCHDIR} ${DIST}/libgomp
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Sat Feb 9 00:15:28 UTC 2019 Added Files: src/etc/mtree: NetBSD.dist.i386 Log Message: create i386 specific include directories. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/etc/mtree/NetBSD.dist.i386 diff -u /dev/null src/etc/mtree/NetBSD.dist.i386:1.1 --- /dev/null Sat Feb 9 00:15:28 2019 +++ src/etc/mtree/NetBSD.dist.i386 Sat Feb 9 00:15:28 2019 @@ -0,0 +1,5 @@ +# $NetBSD: NetBSD.dist.i386,v 1.1 2019/02/09 00:15:28 mrg Exp $ + +./usr/include/i386 +./usr/include/x86 +./usr/include/xen
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: mrg Date: Sat Feb 9 00:14:43 UTC 2019 Modified Files: src/distrib/sets/lists/tests: mi Log Message: add new t_libgomp test. To generate a diff of this commit: cvs rdiff -u -r1.805 -r1.806 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.805 src/distrib/sets/lists/tests/mi:1.806 --- src/distrib/sets/lists/tests/mi:1.805 Sun Feb 3 03:20:23 2019 +++ src/distrib/sets/lists/tests/mi Sat Feb 9 00:14:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.805 2019/02/03 03:20:23 thorpej Exp $ +# $NetBSD: mi,v 1.806 2019/02/09 00:14:43 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3698,6 +3698,7 @@ ./usr/tests/usr.bin/cc/t_asan_poison tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cc/t_asan_uaf tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cc/t_hello tests-usr.bin-tests compattestfile,atf +./usr/tests/usr.bin/cc/t_libgomp tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cc/t_ubsan_int_add_overflow tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cc/t_ubsan_int_divzero tests-usr.bin-tests compattestfile,atf ./usr/tests/usr.bin/cc/t_ubsan_int_neg_overflow tests-usr.bin-tests compattestfile,atf
CVS commit: src/tests/usr.bin/cc
Module Name:src
Committed By: mrg
Date: Sat Feb 9 00:12:14 UTC 2019
Modified Files:
src/tests/usr.bin/cc: Makefile
Added Files:
src/tests/usr.bin/cc: t_libgomp.sh
Log Message:
add very simple test that you can link -fopenmp.
currently fails, but should work soon...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/cc/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/cc/t_libgomp.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/Makefile
diff -u src/tests/usr.bin/cc/Makefile:1.6 src/tests/usr.bin/cc/Makefile:1.7
--- src/tests/usr.bin/cc/Makefile:1.6 Tue Jan 29 19:59:10 2019
+++ src/tests/usr.bin/cc/Makefile Sat Feb 9 00:12:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/01/29 19:59:10 mgorny Exp $
+# $NetBSD: Makefile,v 1.7 2019/02/09 00:12:14 mrg Exp $
.include
@@ -23,6 +23,7 @@ TESTS_SH= #
TESTS_SH+= $(ASAN_TESTS)
TESTS_SH+= $(UBSAN_TESTS)
TESTS_SH+= t_hello
+TESTS_SH+= t_libgomp
.for test in ${ASAN_TESTS}
TESTS_SH_SRC_${test}= asan_common.subr ${test}.sh
Added files:
Index: src/tests/usr.bin/cc/t_libgomp.sh
diff -u /dev/null src/tests/usr.bin/cc/t_libgomp.sh:1.1
--- /dev/null Sat Feb 9 00:12:14 2019
+++ src/tests/usr.bin/cc/t_libgomp.sh Sat Feb 9 00:12:14 2019
@@ -0,0 +1,50 @@
+# $NetBSD: t_libgomp.sh,v 1.1 2019/02/09 00:12:14 mrg Exp $
+#
+# Copyright (c) 2019 Matthew R. Green
+# 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.
+# 3. The name of the author may not be used to endorse or promote products
+#derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+
+atf_test_case libgomp
+libgomp_head() {
+ atf_set "descr" "compile and hello world with -fopenmp"
+ atf_set "require.progs" "cc"
+}
+
+libgomp_body() {
+ cat > hello.c << EOF
+#include
+#include
+int main(void) {printf("hello world\n");exit(0);}
+EOF
+ atf_check -s exit:0 -o ignore -e ignore cc -fopenmp -o hellogomp hello.c
+ atf_check -s exit:0 -o inline:"hello world\n" ./hellogomp
+}
+
+atf_init_test_cases()
+{
+
+ atf_add_test_case libgomp
+}
CVS commit: src/tests/usr.bin/cc
Module Name:src Committed By: mrg Date: Sat Feb 9 00:13:19 UTC 2019 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: add $NetBSD$ tags. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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 cvs rdiff -u -r1.5 -r1.6 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.4 src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.5 --- src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh:1.4 Tue Jan 29 19:59:10 2019 +++ src/tests/usr.bin/cc/t_ubsan_int_add_overflow.sh Sat Feb 9 00:13:19 2019 @@ -1,3 +1,5 @@ +# $NetBSD: t_ubsan_int_add_overflow.sh,v 1.5 2019/02/09 00:13:19 mrg Exp $ +# # Copyright (c) 2018, 2019 The NetBSD Foundation, Inc. # All rights reserved. # Index: src/tests/usr.bin/cc/t_ubsan_int_divzero.sh diff -u src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.4 src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.5 --- src/tests/usr.bin/cc/t_ubsan_int_divzero.sh:1.4 Tue Jan 29 19:59:10 2019 +++ src/tests/usr.bin/cc/t_ubsan_int_divzero.sh Sat Feb 9 00:13:19 2019 @@ -1,3 +1,5 @@ +# $NetBSD: t_ubsan_int_divzero.sh,v 1.5 2019/02/09 00:13:19 mrg Exp $ +# # Copyright (c) 2018, 2019 The NetBSD Foundation, Inc. # All rights reserved. # 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.4 src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.5 --- src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh:1.4 Tue Jan 29 19:59:10 2019 +++ src/tests/usr.bin/cc/t_ubsan_int_neg_overflow.sh Sat Feb 9 00:13:19 2019 @@ -1,3 +1,5 @@ +# $NetBSD: t_ubsan_int_neg_overflow.sh,v 1.5 2019/02/09 00:13:19 mrg Exp $ +# # Copyright (c) 2018, 2019 The NetBSD Foundation, Inc. # All rights reserved. # 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.4 src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.5 --- src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh:1.4 Tue Jan 29 19:59:10 2019 +++ src/tests/usr.bin/cc/t_ubsan_int_sub_overflow.sh Sat Feb 9 00:13:19 2019 @@ -1,3 +1,5 @@ +# $NetBSD: t_ubsan_int_sub_overflow.sh,v 1.5 2019/02/09 00:13:19 mrg Exp $ +# # Copyright (c) 2018, 2019 The NetBSD Foundation, Inc. # All rights reserved. # 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.5 src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.6 --- src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh:1.5 Tue Jan 29 19:59:10 2019 +++ src/tests/usr.bin/cc/t_ubsan_vla_out_of_bounds.sh Sat Feb 9 00:13:19 2019 @@ -1,3 +1,5 @@ +# $NetBSD: t_ubsan_vla_out_of_bounds.sh,v 1.6 2019/02/09 00:13:19 mrg Exp $ +# # Copyright (c) 2018, 2019 The NetBSD Foundation, Inc. # All rights reserved. #
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Fri Feb 8 23:27:14 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.x86_64 Log Message: add missing ./usr/include/xen To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/etc/mtree/NetBSD.dist.x86_64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.x86_64 diff -u src/etc/mtree/NetBSD.dist.x86_64:1.11 src/etc/mtree/NetBSD.dist.x86_64:1.12 --- src/etc/mtree/NetBSD.dist.x86_64:1.11 Mon Feb 4 04:45:48 2019 +++ src/etc/mtree/NetBSD.dist.x86_64 Fri Feb 8 23:27:14 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.x86_64,v 1.11 2019/02/04 04:45:48 mrg Exp $ +# $NetBSD: NetBSD.dist.x86_64,v 1.12 2019/02/08 23:27:14 mrg Exp $ ./usr/include/amd64 ./usr/include/dev/nvmm @@ -7,3 +7,4 @@ ./usr/include/g++/bits/x86_64 ./usr/include/i386 ./usr/include/x86 +./usr/include/xen
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Fri Feb 8 22:06:12 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
define CAN_SANITIZE_UB properly: libasan and libtsan need to not
have it set, libubsan needs to have it set.
fixes almost all the new atf failures from GCC 7 switch.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/lib/libubsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.27 src/external/gpl3/gcc/lib/libasan/Makefile:1.28
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.27 Wed Feb 6 04:00:43 2019
+++ src/external/gpl3/gcc/lib/libasan/Makefile Fri Feb 8 22:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2019/02/08 22:06:12 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
NOSANITIZER= # defined
@@ -42,6 +42,7 @@ ASAN_SRCS= \
LIB= asan
SRCS+= ${ASAN_SRCS} lsan_common.cc lsan_common_linux.cc
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
+CPPFLAGS+=-DCAN_SANITIZE_UB=0
.if ${MACHINE_ARCH} == "vax"
COPTS.asan_allocator.cc += -O1
Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.8 src/external/gpl3/gcc/lib/libtsan/Makefile:1.9
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.8 Wed Feb 6 04:00:43 2019
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Fri Feb 8 22:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/02/08 22:06:12 mrg Exp $
.include
@@ -51,5 +51,6 @@ TSAN_SRCS+= tsan_rtl_unimpl.cc
LIB= tsan
SRCS+= ${TSAN_SRCS}
+CPPFLAGS+=-DCAN_SANITIZE_UB=0
.include
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.10 src/external/gpl3/gcc/lib/libubsan/Makefile:1.11
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.10 Wed Feb 6 04:00:43 2019
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Fri Feb 8 22:06:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/08 22:06:12 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
LIBISCXX = yes
@@ -31,5 +31,6 @@ COPTS.ubsan_handlers_cxx.cc+= -Wno-error
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
+CPPFLAGS+=-DCAN_SANITIZE_UB=1
.include
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Fri Feb 8 20:34:23 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: Improve comment for next_stick_init() - no functional changes To generate a diff of this commit: cvs rdiff -u -r1.418 -r1.419 src/sys/arch/sparc64/sparc64/locore.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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.418 src/sys/arch/sparc64/sparc64/locore.s:1.419 --- src/sys/arch/sparc64/sparc64/locore.s:1.418 Fri Feb 8 20:14:51 2019 +++ src/sys/arch/sparc64/sparc64/locore.s Fri Feb 8 20:34:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.418 2019/02/08 20:14:51 palle Exp $ */ +/* $NetBSD: locore.s,v 1.419 2019/02/08 20:34:23 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -7513,6 +7513,9 @@ Lstick_ovflw: * Sets the %stick_cmpr register to the value retrieved from %stick so * next_stick() does not spend too much time in the function when called * for the first time. + * This has been observed on (at least) a SPARC-T5 (sun4v) system where + * the %stick_cmpr ends up being less than the %stick value and then + * the stickitr() interrupt is never triggered. */ ENTRY(next_stick_init) rd STICK, %o0
CVS commit: src/external/mpl/dhcp/dist/bind
Module Name:src Committed By: christos Date: Fri Feb 8 20:29:06 UTC 2019 Removed Files: src/external/mpl/dhcp/dist/bind: Makefile.in bind.tar.gz version.tmp Log Message: Remove the copy of bind?!?! used for its libraries... To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/mpl/dhcp/dist/bind/Makefile.in \ src/external/mpl/dhcp/dist/bind/bind.tar.gz \ src/external/mpl/dhcp/dist/bind/version.tmp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64
Module Name:src Committed By: palle Date: Fri Feb 8 20:14:51 UTC 2019 Modified Files: src/sys/arch/sparc64/include: cpu.h src/sys/arch/sparc64/sparc64: clock.c locore.s Log Message: sun4v: initialize %stickcmpr properly when establishing interrupt - fixes issue seen on newer sun4v/SPARC-T5 system where the interrupt never fires. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/sys/arch/sparc64/include/cpu.h cvs rdiff -u -r1.120 -r1.121 src/sys/arch/sparc64/sparc64/clock.c cvs rdiff -u -r1.417 -r1.418 src/sys/arch/sparc64/sparc64/locore.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/sparc64/include/cpu.h diff -u src/sys/arch/sparc64/include/cpu.h:1.125 src/sys/arch/sparc64/include/cpu.h:1.126 --- src/sys/arch/sparc64/include/cpu.h:1.125 Wed Aug 22 01:05:23 2018 +++ src/sys/arch/sparc64/include/cpu.h Fri Feb 8 20:14:50 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.125 2018/08/22 01:05:23 msaitoh Exp $ */ +/* $NetBSD: cpu.h,v 1.126 2019/02/08 20:14:50 palle Exp $ */ /* * Copyright (c) 1992, 1993 @@ -434,6 +434,7 @@ void switchtoctx_us(int); void switchtoctx_usiii(int); void next_tick(long); void next_stick(long); +void next_stick_init(void); /* trap.c */ void cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t); int rwindow_save(struct lwp *); Index: src/sys/arch/sparc64/sparc64/clock.c diff -u src/sys/arch/sparc64/sparc64/clock.c:1.120 src/sys/arch/sparc64/sparc64/clock.c:1.121 --- src/sys/arch/sparc64/sparc64/clock.c:1.120 Thu Jul 7 06:55:38 2016 +++ src/sys/arch/sparc64/sparc64/clock.c Fri Feb 8 20:14:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.120 2016/07/07 06:55:38 msaitoh Exp $ */ +/* $NetBSD: clock.c,v 1.121 2019/02/08 20:14:51 palle Exp $ */ /* * Copyright (c) 1992, 1993 @@ -55,7 +55,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.120 2016/07/07 06:55:38 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.121 2019/02/08 20:14:51 palle Exp $"); #include "opt_multiprocessor.h" @@ -406,6 +406,7 @@ stickintr_establish(int pil, int (*fun)( ci->ci_tick_increment = ci->ci_system_clockrate[0] / hz; s = intr_disable(); + next_stick_init(); next_stick(ci->ci_tick_increment); intr_restore(s); } Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.417 src/sys/arch/sparc64/sparc64/locore.s:1.418 --- src/sys/arch/sparc64/sparc64/locore.s:1.417 Fri Feb 8 19:45:24 2019 +++ src/sys/arch/sparc64/sparc64/locore.s Fri Feb 8 20:14:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.417 2019/02/08 19:45:24 palle Exp $ */ +/* $NetBSD: locore.s,v 1.418 2019/02/08 20:14:51 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -7507,6 +7507,21 @@ Lstick_ovflw: retl wr %o2, STICK_CMPR +/* + * next_stick_init() + * + * Sets the %stick_cmpr register to the value retrieved from %stick so + * next_stick() does not spend too much time in the function when called + * for the first time. + */ +ENTRY(next_stick_init) + rd STICK, %o0 + mov 1, %o1 ! Mask off high bits of the register + sllx %o1, 63, %o1 + andn %o0, %o1, %o0 + retl + wr %o0, STICK_CMPR + ENTRY(setjmp) save %sp, -CC64FSZ, %sp ! Need a frame to return to. flushw
CVS commit: src/sys/arch/sparc64/include
Module Name:src Committed By: palle Date: Fri Feb 8 20:09:24 UTC 2019 Modified Files: src/sys/arch/sparc64/include: psl.h Log Message: Introduce getstickcmpr() function To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc64/include/psl.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/sparc64/include/psl.h diff -u src/sys/arch/sparc64/include/psl.h:1.57 src/sys/arch/sparc64/include/psl.h:1.58 --- src/sys/arch/sparc64/include/psl.h:1.57 Wed May 18 07:59:30 2016 +++ src/sys/arch/sparc64/include/psl.h Fri Feb 8 20:09:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.57 2016/05/18 07:59:30 nakayama Exp $ */ +/* $NetBSD: psl.h,v 1.58 2019/02/08 20:09:24 palle Exp $ */ /* * Copyright (c) 1992, 1993 @@ -383,6 +383,9 @@ SPARC64_RDCONST64_DEF(rdpr, ver, %ver) SPARC64_RDASR64_DEF(stick, STICK) /* getstick() */ SPARC64_WRASR64_DEF(stick, STICK) /* setstick() */ +/* System Tick Compare Register (ASR 25) */ +SPARC64_RDASR64_DEF(stickcmpr, STICK_CMPR) /* getstickcmpr() */ + /* Some simple macros to check the cpu type. */ #define GETVER_CPU_MASK() ((getver() & VER_MASK) >> VER_MASK_SHIFT) #define GETVER_CPU_IMPL() ((getver() & VER_IMPL) >> VER_IMPL_SHIFT)
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Fri Feb 8 19:55:40 UTC 2019 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: sun4v: update the TODO file noting (at least) some progess with sun4v To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sparc64/doc/TODO 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/sparc64/doc/TODO diff -u src/sys/arch/sparc64/doc/TODO:1.28 src/sys/arch/sparc64/doc/TODO:1.29 --- src/sys/arch/sparc64/doc/TODO:1.28 Mon Dec 17 20:13:46 2018 +++ src/sys/arch/sparc64/doc/TODO Fri Feb 8 19:55:40 2019 @@ -1,4 +1,4 @@ - /* $NetBSD: TODO,v 1.28 2018/12/17 20:13:46 palle Exp $ */ + /* $NetBSD: TODO,v 1.29 2019/02/08 19:55:40 palle Exp $ */ Things to be done: @@ -11,14 +11,9 @@ sun4u: - GENERIC.UP kernel hangs on v445 (missing interrupt?) sun4v: - - current status: The kernel boots and starts the init process (pid 1) - which spawns /sbin/sh (pid 2). This is forked as a new /sbin/sh (pid 3) - which crashes, probably due to MMU DPROT issues. - Looks like the user process tries to write to the stack as part of a save - instruction since cansave is zero. This causes a DMMU PROT trap (0x6c) which - calls sun4v_tl0_dtsb_prot which calls sun4v_datatrap which calls TRAP_SETUP(). - This macro has code that does a save instruction, again to the user stack, - which again causes a MMU DPROT trap... + - current status: The kernel boots and starts the init process. + The following processes seem to crash on and on so more debugging to be done... + - 64-bit kernel support - 32-bit kernel support - libkvm
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Fri Feb 8 19:45:24 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: introduce macros for handling spill traps from userlevevel @ traplevel 1 (from OpenBSD) - spill traps at level 1 from userspace now works better To generate a diff of this commit: cvs rdiff -u -r1.416 -r1.417 src/sys/arch/sparc64/sparc64/locore.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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.416 src/sys/arch/sparc64/sparc64/locore.s:1.417 --- src/sys/arch/sparc64/sparc64/locore.s:1.416 Fri Feb 8 19:26:25 2019 +++ src/sys/arch/sparc64/sparc64/locore.s Fri Feb 8 19:45:24 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.416 2019/02/08 19:26:25 palle Exp $ */ +/* $NetBSD: locore.s,v 1.417 2019/02/08 19:45:24 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -227,6 +227,18 @@ LDPTR [\reg + %lo(CPUINFO_VA + CI_TSB_DMMU)], \reg .endm + .macro sun4v_tl1_uspill_normal + ba,a,pt %xcc, pcbspill_normals + nop + .align 128 + .endm + + .macro sun4v_tl1_uspill_other + ba,a,pt %xcc, pcbspill_others + nop + .align 128 + .endm + #endif #if 1 @@ -1155,17 +1167,17 @@ _C_LABEL(trapbase_sun4v): sun4v_trap_entry 56 ! 0x034-0x06b VTRAP(T_FDMMU_PROT, sun4v_tl1_dtsb_prot) ! 0x06c sun4v_trap_entry 19 ! 0x06d-0x07f - SPILL64(uspill8_sun4vt1,ASI_AIUS) ! 0x080 spill_0_normal -- save user windows - SPILL32(uspill4_sun4vt1,ASI_AIUS) ! 0x084 spill_1_normal - SPILLBOTH(uspill8_sun4vt1,uspill4_sun4vt1,ASI_AIUS) ! 0x088 spill_2_normal + sun4v_tl1_uspill_normal ! 0x080 spill_0_normal -- save user windows + sun4v_tl1_uspill_normal ! 0x084 spill_1_normal + sun4v_tl1_uspill_normal ! 0x088 spill_2_normal sun4v_trap_entry_spill_fill_fail 1 ! 0x08c spill_3_normal SPILL64(kspill8_sun4vt1,ASI_N)! 0x090 spill_4_normal -- save supervisor windows SPILL32(kspill4_sun4vt1,ASI_N)! 0x094 spill_5_normal SPILLBOTH(kspill8_sun4vt1,kspill4_sun4vt1,ASI_N) ! 0x098 spill_6_normal sun4v_trap_entry_spill_fill_fail 1 ! 0x09c spill_7_normal - SPILL64(uspillk8_sun4vt1,ASI_AIUS) ! 0x0a0 spill_0_other -- save user windows in nucleus mode - SPILL32(uspillk4_sun4vt1,ASI_AIUS) ! 0x0a4 spill_1_other - SPILLBOTH(uspillk8_sun4vt1,uspillk4_sun4vt1,ASI_AIUS) ! 0x0a8 spill_2_other + sun4v_tl1_uspill_other ! 0x0a0 spill_0_other -- save user windows in nucleus mode + sun4v_tl1_uspill_other ! 0x0a4 spill_1_other + sun4v_tl1_uspill_other ! 0x0a8 spill_2_other sun4v_trap_entry_spill_fill_fail 1 ! 0x0ac spill_3_other sun4v_trap_entry_spill_fill_fail 1 ! 0x0b0 spill_4_other sun4v_trap_entry_spill_fill_fail 1 ! 0x0b4 spill_5_other
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Fri Feb 8 19:26:25 UTC 2019 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: add comment documenting the contents of the %g2 register - no functional changes To generate a diff of this commit: cvs rdiff -u -r1.415 -r1.416 src/sys/arch/sparc64/sparc64/locore.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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.415 src/sys/arch/sparc64/sparc64/locore.s:1.416 --- src/sys/arch/sparc64/sparc64/locore.s:1.415 Sun Nov 4 20:02:07 2018 +++ src/sys/arch/sparc64/sparc64/locore.s Fri Feb 8 19:26:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.415 2018/11/04 20:02:07 palle Exp $ */ +/* $NetBSD: locore.s,v 1.416 2019/02/08 19:26:25 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -3034,7 +3034,7 @@ sun4v_tl0_dtsb_prot: # btst SUN4V_TLB_REAL_W|SUN4V_TLB_W, %g4 ! Is it a ref fault? mov 1, %g2 - sllx %g2, 61, %g2 + sllx %g2, 61, %g2 ! %g2 is now SUN4V_TLB_REAL_W or %g2, SUN4V_TLB_W, %g2 btst %g2, %g4 bz,pn %xcc, sun4v_datatrap ! No -- really fault @@ -3263,7 +3263,7 @@ sun4v_tl1_dtsb_prot: # btst SUN4V_TLB_REAL_W|SUN4V_TLB_W, %g4 ! Is it a ref fault? mov 1, %g2 - sllx %g2, 61, %g2 + sllx %g2, 61, %g2 ! %g2 is now SUN4V_TLB_REAL_W or %g2, SUN4V_TLB_W, %g2 btst %g2, %g4 bz,pn %xcc, sun4v_tl1_ptbl_miss ! No -- really fault
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 8 16:05:46 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1183 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-8.1 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.1 diff -u src/doc/CHANGES-8.1:1.1.2.102 src/doc/CHANGES-8.1:1.1.2.103 --- src/doc/CHANGES-8.1:1.1.2.102 Thu Feb 7 06:15:54 2019 +++ src/doc/CHANGES-8.1 Fri Feb 8 16:05:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.102 2019/02/07 06:15:54 msaitoh Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.103 2019/02/08 16:05:46 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2425,3 +2425,10 @@ share/man/man4/axen.41.7 Andrius V in Pr kern/53461: add D-Link DUB-1312 [martin, ticket #1182] + +sys/dev/raidframe/rf_disks.c 1.90 + + PR/53956: raidframe fails to create new raid set on disks. + [christos, ticket #1183] + +
CVS commit: [netbsd-8] src/sys/dev/raidframe
Module Name:src
Committed By: martin
Date: Fri Feb 8 16:03:04 UTC 2019
Modified Files:
src/sys/dev/raidframe [netbsd-8]: rf_disks.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1183):
sys/dev/raidframe/rf_disks.c: revision 1.90
PR/53956: Havard Eidnes: raidframe fails to create raid set on disks.
The test to check if force was reversed when the code was factored out.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.89.8.1 src/sys/dev/raidframe/rf_disks.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/raidframe/rf_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.89 src/sys/dev/raidframe/rf_disks.c:1.89.8.1
--- src/sys/dev/raidframe/rf_disks.c:1.89 Fri Jan 13 13:01:13 2017
+++ src/sys/dev/raidframe/rf_disks.c Fri Feb 8 16:03:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.89 2017/01/13 13:01:13 christos Exp $ */
+/* $NetBSD: rf_disks.c,v 1.89.8.1 2019/02/08 16:03:04 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,7 +60,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.89 2017/01/13 13:01:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.89.8.1 2019/02/08 16:03:04 martin Exp $");
#include
@@ -705,7 +705,7 @@ rf_handle_hosed(RF_Raid_t *raidPtr, RF_C
int again)
{
printf("Hosed component: %s\n", &cfgPtr->devnames[0][hosed_column][0]);
- if (!cfgPtr->force)
+ if (cfgPtr->force)
return;
/* we'll fail this component, as if there are
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: christos
Date: Fri Feb 8 13:37:46 UTC 2019
Modified Files:
src/sys/dev/raidframe: rf_disks.c
Log Message:
PR/53956: Havard Eidnes: raidframe fails to create raid set on disks.
The test to check if force was reversed when the code was factored out.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/raidframe/rf_disks.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/raidframe/rf_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.89 src/sys/dev/raidframe/rf_disks.c:1.90
--- src/sys/dev/raidframe/rf_disks.c:1.89 Fri Jan 13 08:01:13 2017
+++ src/sys/dev/raidframe/rf_disks.c Fri Feb 8 08:37:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.89 2017/01/13 13:01:13 christos Exp $ */
+/* $NetBSD: rf_disks.c,v 1.90 2019/02/08 13:37:46 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -60,7 +60,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.89 2017/01/13 13:01:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.90 2019/02/08 13:37:46 christos Exp $");
#include
@@ -705,7 +705,7 @@ rf_handle_hosed(RF_Raid_t *raidPtr, RF_C
int again)
{
printf("Hosed component: %s\n", &cfgPtr->devnames[0][hosed_column][0]);
- if (!cfgPtr->force)
+ if (cfgPtr->force)
return;
/* we'll fail this component, as if there are
CVS commit: src
Module Name:src Committed By: mrg Date: Fri Feb 8 09:57:01 UTC 2019 Modified Files: src: UPDATING Log Message: add a quick note about gcc 7 likely causing update build failures. To generate a diff of this commit: cvs rdiff -u -r1.298 -r1.299 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.298 src/UPDATING:1.299 --- src/UPDATING:1.298 Mon Sep 24 13:18:35 2018 +++ src/UPDATING Fri Feb 8 09:57:01 2019 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.298 2018/09/24 13:18:35 martin Exp $ +$NetBSD: UPDATING,v 1.299 2019/02/08 09:57:01 mrg Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -19,6 +19,9 @@ See also: BUILDING, build.sh, Makefile. Recent changes: ^^^ +20190207: + GCC 7 switched for many ports. Update builds are likely to fail. + 20180924: A newer OpenSSL version has been imported. If you are doing update builds, make sure to remove all old obj dirs, like:
CVS commit: src/external/gpl3/gcc/dist/gcc/config/ia64
Module Name:src Committed By: mrg Date: Fri Feb 8 09:42:13 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config/ia64: netbsd.h Log Message: IA64_NO_LIBGCC_TFMODE is no more. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h diff -u src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h:1.6 src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h:1.7 --- src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h:1.6 Fri Aug 19 05:11:09 2016 +++ src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h Fri Feb 8 09:42:13 2019 @@ -47,6 +47,3 @@ Boston, MA 02111-1307, USA. */ /* Attempt to enable execute permissions on the stack. */ #define TRANSFER_FROM_TRAMPOLINE NETBSD_ENABLE_EXECUTE_STACK #endif - -/* Don't have TFmode support (yet?). */ -#define IA64_NO_LIBGCC_TFMODE
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Fri Feb 8 09:39:14 UTC 2019 Modified Files: src/doc: CHANGES Log Message: note GCC 6.5 and 7.4 imports. To generate a diff of this commit: cvs rdiff -u -r1.2499 -r1.2500 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/CHANGES diff -u src/doc/CHANGES:1.2499 src/doc/CHANGES:1.2500 --- src/doc/CHANGES:1.2499 Thu Feb 7 21:40:40 2019 +++ src/doc/CHANGES Fri Feb 8 09:39:14 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2499 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2500 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -254,6 +254,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: kernel: Add NVMM, the NetBSD virtualization driver, with initial support for x86. [maxv 20181107] aarch64: Add support for kASan. [maxv 20181108] + gcc: Import GCC 6.5. [mrg 20181103] aarch64: Add support for ARM Server Base System Architecture (SBSA). The SBSA is a hardware system architecture for servers based on 64-bit ARM processors. The Server Base Boot Requirements (SBBR) @@ -283,7 +284,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: threadpool(9): Added threadpool(9) API. [thorpej 20181224] systat(1): Extend vmstat display for better insight about bufcache. [sevan 20181226] - arm: Support kernel crash dumps on 64 bit platforms. [mrg 20181227] + aarch64: Support kernel crash dumps on arm64 platforms. [mrg 20181227] kernel: Remove M_ALIGN, MH_ALIGN, M_COPY_PKTHDR and M_MOVE_PKTHDR. [maxv 20181228] cgdroot: Support mounting boot partition from a wedge labelled cgd.conf. @@ -312,6 +313,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: NETMAP algorithm for static NAT, lock-free lookup for 'ipset' tables, lock-free state lookup, incremental state G/C, etc). [rmind 20190119] + gcc: Import GCC 7.4. [mrg 20190119] dhcpcd: Import dhcpcd-7.1.0. [roy 20190122] kernel: Remove the satlink driver. [maxv 20190127] kernel: Merged [pgoyette-compat] branch - for details, see
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri Feb 8 09:35:00 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch aarch64, alpha, i386, mips, powerpc, sparc, sparc64,
and x86_64 to GCC 7.
To generate a diff of this commit:
cvs rdiff -u -r1.1101 -r1.1102 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.1101 src/share/mk/bsd.own.mk:1.1102
--- src/share/mk/bsd.own.mk:1.1101 Wed Feb 6 11:05:30 2019
+++ src/share/mk/bsd.own.mk Fri Feb 8 09:35:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1101 2019/02/06 11:05:30 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1102 2019/02/08 09:35:00 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -58,7 +58,19 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
+.if \
+${MACHINE_CPU} == "alpha" || \
+${MACHINE_CPU} == "aarch64" || \
+${MACHINE_CPU} == "i386" || \
+${MACHINE_CPU} == "mips" || \
+${MACHINE_CPU} == "powerpc" || \
+${MACHINE_CPU} == "sparc" || \
+${MACHINE_CPU} == "sparc64" || \
+${MACHINE_CPU} == "x86_64"
+HAVE_GCC?= 7
+.else
HAVE_GCC?= 6
+.endif
#
# Platforms that can't run a modern GCC natively
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Feb 8 09:17:13 UTC 2019
Modified Files:
src/sys/dev/mii: makphy.c
Log Message:
- Add 88E1240.
- Rename E1116R_29 to E1318S
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/mii/makphy.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/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.52 src/sys/dev/mii/makphy.c:1.53
--- src/sys/dev/mii/makphy.c:1.52 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/mii/makphy.c Fri Feb 8 09:17:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.52 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: makphy.c,v 1.53 2019/02/08 09:17:12 msaitoh Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.52 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.53 2019/02/08 09:17:12 msaitoh Exp $");
#include
#include
@@ -128,8 +128,8 @@ static const struct mii_phydesc makphys[
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R,
MII_STR_xxMARVELL_E1116R },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29,
- MII_STR_xxMARVELL_E1116R_29 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1318S,
+ MII_STR_xxMARVELL_E1318S },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1118,
MII_STR_xxMARVELL_E1118 },
@@ -143,6 +143,9 @@ static const struct mii_phydesc makphys[
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1149R,
MII_STR_xxMARVELL_E1149R },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1240,
+ MII_STR_xxMARVELL_E1240 },
+
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1512,
MII_STR_xxMARVELL_E1512 },
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: msaitoh
Date: Fri Feb 8 09:16:28 UTC 2019
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/mii/miidevs_data.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/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.135 src/sys/dev/mii/miidevs.h:1.136
--- src/sys/dev/mii/miidevs.h:1.135 Fri Dec 28 05:04:55 2018
+++ src/sys/dev/mii/miidevs.h Fri Feb 8 09:16:28 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.135 2018/12/28 05:04:55 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.136 2019/02/08 09:16:28 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.132 2018/12/28 05:04:35 msaitoh Exp
+ * NetBSD: miidevs,v 1.133 2019/02/08 09:16:11 msaitoh Exp
*/
/*-
@@ -412,6 +412,8 @@
#define MII_STR_xxMARVELL_E1116 "Marvell 88E1116 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1118 0x0022
#define MII_STR_xxMARVELL_E1118 "Marvell 88E1118 Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E1240 0x0023
+#define MII_STR_xxMARVELL_E1240 "Marvell 88E1240 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1116R 0x0024
#define MII_STR_xxMARVELL_E1116R "Marvell 88E1116R Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1149R 0x0025
@@ -420,8 +422,8 @@
#define MII_STR_xxMARVELL_E3016 "Marvell 88E3016 10/100 Fast Ethernet PHY"
#define MII_MODEL_xxMARVELL_PHYG65G 0x0027
#define MII_STR_xxMARVELL_PHYG65G "Marvell PHYG65G Gigabit PHY"
-#define MII_MODEL_xxMARVELL_E1116R_29 0x0029
-#define MII_STR_xxMARVELL_E1116R_29 "Marvell 88E1116R Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E1318S 0x0029
+#define MII_STR_xxMARVELL_E1318S "Marvell 88E1318S Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1543 0x002a
#define MII_STR_xxMARVELL_E1543 "Marvell 88E154[358] Alaska Quad Port Gb PHY"
#define MII_MODEL_MARVELL_E1000_0 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.123 src/sys/dev/mii/miidevs_data.h:1.124
--- src/sys/dev/mii/miidevs_data.h:1.123 Fri Dec 28 05:04:55 2018
+++ src/sys/dev/mii/miidevs_data.h Fri Feb 8 09:16:28 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.123 2018/12/28 05:04:55 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.124 2019/02/08 09:16:28 msaitoh Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.132 2018/12/28 05:04:35 msaitoh Exp
+ * NetBSD: miidevs,v 1.133 2019/02/08 09:16:11 msaitoh Exp
*/
/*-
@@ -165,11 +165,12 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1340M, MII_STR_xxMARVELL_E1340M },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1118, MII_STR_xxMARVELL_E1118 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1240, MII_STR_xxMARVELL_E1240 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1149R, MII_STR_xxMARVELL_E1149R },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E3016, MII_STR_xxMARVELL_E3016 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_PHYG65G, MII_STR_xxMARVELL_PHYG65G },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29, MII_STR_xxMARVELL_E1116R_29 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1318S, MII_STR_xxMARVELL_E1318S },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1543, MII_STR_xxMARVELL_E1543 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_0, MII_STR_MARVELL_E1000_0 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1011, MII_STR_MARVELL_E1011 },
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Fri Feb 8 09:16:11 UTC 2019 Modified Files: src/sys/dev/mii: miidevs Log Message: - Add Marvell 88E1240. - Marvell model 0x0029 is not 88E1116R but E1318S. To generate a diff of this commit: cvs rdiff -u -r1.132 -r1.133 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.132 src/sys/dev/mii/miidevs:1.133 --- src/sys/dev/mii/miidevs:1.132 Fri Dec 28 05:04:35 2018 +++ src/sys/dev/mii/miidevs Fri Feb 8 09:16:11 2019 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.132 2018/12/28 05:04:35 msaitoh Exp $ +$NetBSD: miidevs,v 1.133 2019/02/08 09:16:11 msaitoh Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -277,11 +277,12 @@ model xxMARVELL E1512 0x001d Marvell 88 model xxMARVELL E1340M 0x001f Marvell 88E1340 Gigabit PHY model xxMARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model xxMARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY +model xxMARVELL E1240 0x0023 Marvell 88E1240 Gigabit PHY model xxMARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY model xxMARVELL E1149R 0x0025 Marvell 88E1149R Quad Gigabit PHY model xxMARVELL E3016 0x0026 Marvell 88E3016 10/100 Fast Ethernet PHY model xxMARVELL PHYG65G 0x0027 Marvell PHYG65G Gigabit PHY -model xxMARVELL E1116R_29 0x0029 Marvell 88E1116R Gigabit PHY +model xxMARVELL E1318S 0x0029 Marvell 88E1318S Gigabit PHY model xxMARVELL E1543 0x002a Marvell 88E154[358] Alaska Quad Port Gb PHY model MARVELL E1000_0 0x Marvell 88E1000 Gigabit PHY model MARVELL E1011 0x0002 Marvell 88E1011 Gigabit PHY
CVS commit: src/usr.sbin/memswitch
Module Name:src
Committed By: isaki
Date: Fri Feb 8 08:55:35 UTC 2019
Modified Files:
src/usr.sbin/memswitch: Makefile memswitch.c
Log Message:
Rewrite modify_single() to make compilable on gcc7.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/memswitch/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/memswitch/memswitch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/memswitch/Makefile
diff -u src/usr.sbin/memswitch/Makefile:1.2 src/usr.sbin/memswitch/Makefile:1.3
--- src/usr.sbin/memswitch/Makefile:1.2 Thu Feb 7 06:01:04 2019
+++ src/usr.sbin/memswitch/Makefile Fri Feb 8 08:55:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/07 06:01:04 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/02/08 08:55:35 isaki Exp $
.if ${MACHINE} == "x68k"
PROG= memswitch
@@ -8,11 +8,4 @@ SRCS= memswitch.c properties.c methods.c
MAN= memswitch.8
MANSUBDIR= /x68k
-.include
-
-# XXX Not sure how to fix this problem
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
-COPTS.memswitch.c+= -Wno-error=stringop-overflow
-.endif
-
.include
Index: src/usr.sbin/memswitch/memswitch.c
diff -u src/usr.sbin/memswitch/memswitch.c:1.16 src/usr.sbin/memswitch/memswitch.c:1.17
--- src/usr.sbin/memswitch/memswitch.c:1.16 Fri Feb 8 08:41:11 2019
+++ src/usr.sbin/memswitch/memswitch.c Fri Feb 8 08:55:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: memswitch.c,v 1.16 2019/02/08 08:41:11 isaki Exp $ */
+/* $NetBSD: memswitch.c,v 1.17 2019/02/08 08:55:35 isaki Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -196,41 +196,37 @@ show_all(void)
void
modify_single(const char *expr)
{
- int i, l, n;
- char *class = NULL, *node = NULL;
+ int i;
+ char *buf;
+ char *p;
+ const char *class;
+ const char *node;
const char *value;
char valuestr[MAXVALUELEN];
- l = 0;
- n = strlen(expr);
- for (i = 0; i < n; i++) {
- if (expr[i] == '.') {
- l = i + 1;
- class = alloca(l);
- if (class == 0)
-err(1, "alloca");
- strncpy(class, expr, i);
- class[i] = 0;
+ buf = strdup(expr);
+ if (buf == NULL)
+ err(EXIT_FAILURE, "strdup failed");
+
+ p = buf;
+ for (class = p; *p; p++) {
+ if (*p == '.') {
+ *p++ = '\0';
break;
}
}
- if (i >= n)
- errx(1, "Invalid expression: %s", expr);
- for ( ; i < n; i++) {
- if (expr[i] == '=') {
- node = alloca(i - l + 1);
- if (node == 0)
-err(1, "alloca");
- strncpy(node, &(expr[l]), i - l);
- node[i - l] = 0;
+ for (node = p; *p; p++) {
+ if (*p == '=') {
+ *p++ = '\0';
break;
}
}
- if (i >= n)
- errx(1, "Invalid expression: %s", expr);
- value = &(expr[++i]);
+ value = p;
+
+ if (class[0] == '\0' || node[0] == '\0' || value[0] == '\0')
+ errx(1, "Invalid expression: %s", expr);
for (i = 0; i < number_of_props; i++) {
if (strcmp(properties[i].class, class) == 0 &&
@@ -248,7 +244,7 @@ modify_single(const char *expr)
errx(1, "No such property: %s.%s", class, node);
}
- return;
+ free(buf);
}
void
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Fri Feb 8 08:51:42 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: add final missing directory from /usr/include: ./usr/include/netmpls To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.191 src/etc/mtree/NetBSD.dist.base:1.192 --- src/etc/mtree/NetBSD.dist.base:1.191 Fri Feb 8 08:22:09 2019 +++ src/etc/mtree/NetBSD.dist.base Fri Feb 8 08:51:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.191 2019/02/08 08:22:09 mrg Exp $ +# $NetBSD: NetBSD.dist.base,v 1.192 2019/02/08 08:51:42 mrg Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -219,13 +219,14 @@ ./usr/include/msdosfs ./usr/include/net ./usr/include/net/agr +./usr/include/net80211 ./usr/include/netatalk ./usr/include/netbt ./usr/include/netcan ./usr/include/netinet -./usr/include/net80211 ./usr/include/netinet6 ./usr/include/netipsec +./usr/include/netmpls ./usr/include/netpgp ./usr/include/netsmb ./usr/include/nfs
CVS commit: src/sys/arch
Module Name:src
Committed By: mrg
Date: Fri Feb 8 08:47:35 UTC 2019
Modified Files:
src/sys/arch/acorn32/mainbus: fd.c
src/sys/arch/arc/jazz: fd.c
src/sys/arch/atari/dev: hdfd.c
src/sys/arch/sparc/dev: fd.c
src/sys/arch/sparc64/dev: fdc.c
src/sys/arch/sun3/dev: fd.c
src/sys/arch/x68k/dev: fd.c
Log Message:
make *fd*.c's fd_dev_to_type() always a static inline. some
have it as a const, and have code to copy the defaults to
modify them before using them, but that probably requires a
real test to feel confident in changing.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/acorn32/mainbus/fd.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arc/jazz/fd.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.158 -r1.159 src/sys/arch/sparc/dev/fd.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/dev/fdc.c
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/x68k/dev/fd.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/acorn32/mainbus/fd.c
diff -u src/sys/arch/acorn32/mainbus/fd.c:1.59 src/sys/arch/acorn32/mainbus/fd.c:1.60
--- src/sys/arch/acorn32/mainbus/fd.c:1.59 Mon Sep 3 16:29:22 2018
+++ src/sys/arch/acorn32/mainbus/fd.c Fri Feb 8 08:47:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.59 2018/09/03 16:29:22 riastradh Exp $ */
+/* $NetBSD: fd.c,v 1.60 2019/02/08 08:47:35 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.59 2018/09/03 16:29:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.60 2019/02/08 08:47:35 mrg Exp $");
#include "opt_ddb.h"
@@ -313,7 +313,7 @@ void fdcpseudointr(void *arg);
int fdcintr(void *);
void fdcretry(struct fdc_softc *fdc);
void fdfinish(struct fd_softc *fd, struct buf *bp);
-inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
int fdformat(dev_t, struct ne7_fd_formb *, struct lwp *);
int
@@ -554,7 +554,7 @@ fd_nvtotype(const char *fdc, int nvramin
}
}
-inline struct fd_type *
+static struct fd_type *
fd_dev_to_type(struct fd_softc *fd, dev_t dev)
{
int type = FDTYPE(dev);
Index: src/sys/arch/arc/jazz/fd.c
diff -u src/sys/arch/arc/jazz/fd.c:1.48 src/sys/arch/arc/jazz/fd.c:1.49
--- src/sys/arch/arc/jazz/fd.c:1.48 Mon Sep 3 16:29:23 2018
+++ src/sys/arch/arc/jazz/fd.c Fri Feb 8 08:47:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.48 2018/09/03 16:29:23 riastradh Exp $ */
+/* $NetBSD: fd.c,v 1.49 2019/02/08 08:47:35 mrg Exp $ */
/* $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $ */
/* NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp */
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.48 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.49 2019/02/08 08:47:35 mrg Exp $");
#include
#include
@@ -232,7 +232,7 @@ static void fdctimeout(void *);
static void fdcpseudointr(void *);
static void fdcretry(struct fdc_softc *);
static void fdfinish(struct fd_softc *, struct buf *);
-static inline const struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static const struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
static void fd_mountroot_hook(device_t);
/*
@@ -419,7 +419,7 @@ fd_nvtotype(char *fdc, int nvraminfo, in
}
#endif
-static inline const struct fd_type *
+static const struct fd_type *
fd_dev_to_type(struct fd_softc *fd, dev_t dev)
{
int type = FDTYPE(dev);
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.83 src/sys/arch/atari/dev/hdfd.c:1.84
--- src/sys/arch/atari/dev/hdfd.c:1.83 Mon Sep 3 16:29:24 2018
+++ src/sys/arch/atari/dev/hdfd.c Fri Feb 8 08:47:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.83 2018/09/03 16:29:24 riastradh Exp $ */
+/* $NetBSD: hdfd.c,v 1.84 2019/02/08 08:47:35 mrg Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.83 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.84 2019/02/08 08:47:35 mrg Exp $");
#include "opt_ddb.h"
@@ -335,7 +335,7 @@ int fdformat(dev_t, struct ne7_fd_formb
static void fdgetdisklabel(struct fd_softc *, dev_t);
static void fdgetdefaultlabel(struct fd_softc *, struct disklabel *, int);
-inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
int
fdcprobe(device_t parent, cfdata_t cf, void *aux)
@@ -592,7 +592,7 @@ fdc_ctrl_intr(struct clockframe frame)
}
}
-inline struct fd_type *
+static struct fd_type *
fd_dev_to_type(struct fd_softc *fd, dev_t dev)
{
int type = FDTYPE(dev);
Index: src/sys/arch/sparc/dev/fd.c
diff -u src/sys/arch/sparc/dev/fd.c:
CVS commit: src/usr.sbin/memswitch
Module Name:src Committed By: isaki Date: Fri Feb 8 08:41:11 UTC 2019 Modified Files: src/usr.sbin/memswitch: memswitch.c Log Message: Make compilable even SRAMDEBUG. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/memswitch/memswitch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/memswitch/memswitch.c diff -u src/usr.sbin/memswitch/memswitch.c:1.15 src/usr.sbin/memswitch/memswitch.c:1.16 --- src/usr.sbin/memswitch/memswitch.c:1.15 Fri Jan 26 09:38:26 2018 +++ src/usr.sbin/memswitch/memswitch.c Fri Feb 8 08:41:11 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: memswitch.c,v 1.15 2018/01/26 09:38:26 christos Exp $ */ +/* $NetBSD: memswitch.c,v 1.16 2019/02/08 08:41:11 isaki Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -48,6 +48,7 @@ * SRAMDEBUG -- works on other (faster) platforms; * store in a regular file instead of actual non-volatile static RAM. */ +#include #define PATH_RAMFILE "/tmp/sramfile" #endif
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Fri Feb 8 08:22:09 UTC 2019 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: add two more missing subdirs: ./usr/include/dev/pud ./usr/include/dev/putter To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.190 src/etc/mtree/NetBSD.dist.base:1.191 --- src/etc/mtree/NetBSD.dist.base:1.190 Fri Feb 8 06:08:20 2019 +++ src/etc/mtree/NetBSD.dist.base Fri Feb 8 08:22:09 2019 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.190 2019/02/08 06:08:20 mrg Exp $ +# $NetBSD: NetBSD.dist.base,v 1.191 2019/02/08 08:22:09 mrg Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -133,6 +133,8 @@ ./usr/include/dev/pci ./usr/include/dev/pckbc ./usr/include/dev/pcmcia +./usr/include/dev/pud +./usr/include/dev/putter ./usr/include/dev/raidframe ./usr/include/dev/sbus ./usr/include/dev/scsipi
