CVS commit: src
Module Name:src Committed By: mrg Date: Tue Mar 19 05:55:01 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64: gstdint.h src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64: configargs.h defs.mk tm.h src/tools/gcc: Makefile Log Message: enable the workarounds for cortex a53 errata 835769 and 843419 by default. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h cvs rdiff -u -r1.92 -r1.93 src/tools/gcc/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/arch/aarch64/gstdint.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h:1.4 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h:1.3 Thu Jan 24 08:56:44 2019 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h Tue Mar 19 05:55:01 2019 @@ -1,8 +1,8 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ -/* generated for aarch64--netbsd-gcc (NetBSD nb1 20190119) 7.4.0 */ +/* generated for aarch64--netbsd-gcc (NetBSD nb2 20190226) 7.4.0 */ #ifndef GCC_GENERATED_STDINT_H #define GCC_GENERATED_STDINT_H 1 Index: src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h:1.9 --- src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h:1.8 Wed Feb 27 08:19:53 2019 +++ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h Tue Mar 19 05:55:01 2019 @@ -3,7 +3,7 @@ /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ /* Generated automatically. */ -static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=aarch64--netbsd --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20190119' --with-system-zlib --without-isl --enable-__cxa_atexit --enable-libstdcxx-time=rt --enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --with-default-libstdcxx-abi=new --with-mpc-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/aarch64 --enable-tls --disable-multilib --disable-libstdcxx-pch --build=aarch64--netbsd --host=aarch64--netbsd --with-sy sroot=/var/obj/mknative/evbarm-aarch64/usr/src/destdir.evbarm"; +static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=aarch64--netbsd --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb2 20190226' --with-system-zlib --without-isl --enable-__cxa_atexit --enable-libstdcxx-time=rt --enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 --with-default-libstdcxx-abi=new --with-mpc-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/aarch64 --enable-tls --disable-multilib --disable-libstdcx x-pch --build=aarch64--netbsd --host=aarch64--netbsd --with-sysroot=/var/obj/mknative/evbarm-aarch64/usr/src/destdir.evbarm"; static const char thread_model[] = "posix"; static const struct { Index: src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk:1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk:1.4 --- src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk:1.3 Thu Jan 24 08:56:44 2019 +++
CVS commit: src/bin/pax
Module Name:src Committed By: gutteridge Date: Tue Mar 19 00:36:14 UTC 2019 Modified Files: src/bin/pax: pax.1 tar.1 Log Message: pax.1 & tar.1: add a minor clarification about "-s" As a somewhat pedantic clarification, "-s" does not accept backslashes as delimiters. (While here, also make the macro use of an expression shared between pax.1 and tar.1 consistent.) To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/bin/pax/pax.1 cvs rdiff -u -r1.37 -r1.38 src/bin/pax/tar.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/pax.1 diff -u src/bin/pax/pax.1:1.70 src/bin/pax/pax.1:1.71 --- src/bin/pax/pax.1:1.70 Tue Mar 19 00:12:08 2019 +++ src/bin/pax/pax.1 Tue Mar 19 00:36:14 2019 @@ -1,4 +1,4 @@ -.\"$NetBSD: pax.1,v 1.70 2019/03/19 00:12:08 gutteridge Exp $ +.\"$NetBSD: pax.1,v 1.71 2019/03/19 00:36:14 gutteridge Exp $ .\" .\" Copyright (c) 1992 Keith Muller. .\" Copyright (c) 1992, 1993 @@ -585,7 +585,8 @@ The string may also contain .Aq Dv newline characters. -Any non-null character can be used as a delimiter (/ is shown here). +Any non-null character except a backslash (\\) can be used as a delimiter +(/ is shown here). Multiple .Fl s expressions can be specified. Index: src/bin/pax/tar.1 diff -u src/bin/pax/tar.1:1.37 src/bin/pax/tar.1:1.38 --- src/bin/pax/tar.1:1.37 Mon Jul 3 21:33:23 2017 +++ src/bin/pax/tar.1 Tue Mar 19 00:36:14 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: tar.1,v 1.37 2017/07/03 21:33:23 wiz Exp $ +.\" $NetBSD: tar.1,v 1.38 2019/03/19 00:36:14 gutteridge Exp $ .\" .\" Copyright (c) 1996 SigmaSoft, Th. Lockert .\" All rights reserved. @@ -25,7 +25,7 @@ .\" .\" OpenBSD: tar.1,v 1.28 2000/11/09 23:58:56 aaron Exp .\" -.Dd December 19, 2015 +.Dd March 19, 2019 .Dt TAR 1 .Os .Sh NAME @@ -177,7 +177,8 @@ The string may also contain .Aq Dv newline characters. -Any non-null character can be used as a delimiter (/ is shown here). +Any non-null character except a backslash (\\) can be used as a delimiter +(/ is shown here). Multiple .Fl s expressions can be specified. @@ -196,7 +197,7 @@ The optional trailing will cause the final result of a successful substitution to be written to .Dv standard error in the following format: -.Dl >> +.Dl Ao "original pathname" Ac >> Ao "new pathname" Ac File or archive member names that substitute to the empty string are not selected and will be skipped. The substitutions are applied by default to the destination hard and symbolic
CVS commit: src/bin/pax
Module Name:src Committed By: gutteridge Date: Tue Mar 19 00:12:08 UTC 2019 Modified Files: src/bin/pax: pax.1 Log Message: pax.1: document the "s" flag of the "s" option Note the "s" option has an "s" flag that "prevents substitutions from being performed on symbolic link destinations". Carry over r. 1.25 from christos@ and part of r. 1.26 from wiz@ from tar.1, since this functionality is available in pax as well as tar. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/bin/pax/pax.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/pax.1 diff -u src/bin/pax/pax.1:1.69 src/bin/pax/pax.1:1.70 --- src/bin/pax/pax.1:1.69 Mon Jul 3 21:33:23 2017 +++ src/bin/pax/pax.1 Tue Mar 19 00:12:08 2019 @@ -1,4 +1,4 @@ -.\"$NetBSD: pax.1,v 1.69 2017/07/03 21:33:23 wiz Exp $ +.\"$NetBSD: pax.1,v 1.70 2019/03/19 00:12:08 gutteridge Exp $ .\" .\" Copyright (c) 1992 Keith Muller. .\" Copyright (c) 1992, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 .\" -.Dd August 12, 2016 +.Dd March 19, 2019 .Dt PAX 1 .Os .Sh NAME @@ -572,7 +572,7 @@ using the syntax of the .Xr ed 1 utility regular expressions. The format of these regular expressions are: -.Dl /old/new/[gp] +.Dl /old/new/[gps] As in .Xr ed 1 , .Cm old @@ -607,6 +607,11 @@ in the following format: .Dl Ao "original pathname" Ac >> Ao "new pathname" Ac File or archive member names that substitute to the empty string are not selected and will be skipped. +The substitutions are applied by default to the destination hard and symbolic +links. +The optional trailing +.Cm s +prevents the substitutions from being performed on symbolic link destinations. .It Fl t Reset the access times of any file or directory read or accessed by .Nm
CVS commit: src/games/atc
Module Name:src Committed By: pgoyette Date: Tue Mar 19 00:11:34 UTC 2019 Modified Files: src/games/atc: log.c Log Message: Report the users score _after_ the game has ended and the screen has been restored to pre-game state. Otherwise, the user gets a message that their score did (or more likely, did not) improve over their previous score, yet the user has no indication of what the current score actually was! To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/games/atc/log.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/atc/log.c diff -u src/games/atc/log.c:1.23 src/games/atc/log.c:1.24 --- src/games/atc/log.c:1.23 Tue Jan 10 20:40:53 2017 +++ src/games/atc/log.c Tue Mar 19 00:11:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: log.c,v 1.23 2017/01/10 20:40:53 christos Exp $ */ +/* $NetBSD: log.c,v 1.24 2019/03/19 00:11:34 pgoyette Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,7 +46,7 @@ #if 0 static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: log.c,v 1.23 2017/01/10 20:40:53 christos Exp $"); +__RCSID("$NetBSD: log.c,v 1.24 2019/03/19 00:11:34 pgoyette Exp $"); #endif #endif /* not lint */ @@ -161,6 +161,12 @@ log_score(int list_em) struct utsname lname; long offset; + if (safe_planes == 1) + printf("You directed 1 plane safely to its destination.\n\n"); + else + printf("You directed %d planes safely to their destinations.\n\n", + safe_planes); + if (score_fp == NULL) { warnx("no score file available"); return (-1);
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: wiz Date: Mon Mar 18 22:40:45 UTC 2019 Modified Files: src/distrib/sets/lists/comp: ad.mips src/distrib/sets/lists/debug: ad.mips Log Message: Revert previous. The lines look like misapplied patches but I'm told they are correct. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/debug/ad.mips 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.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.80 src/distrib/sets/lists/comp/ad.mips:1.81 --- src/distrib/sets/lists/comp/ad.mips:1.80 Mon Mar 18 09:03:08 2019 +++ src/distrib/sets/lists/comp/ad.mips Mon Mar 18 22:40:44 2019 @@ -1,4 +1,12 @@ -# $NetBSD: ad.mips,v 1.80 2019/03/18 09:03:08 wiz Exp $ +# $NetBSD: ad.mips,v 1.81 2019/03/18 22:40:44 wiz Exp $ +-./usr/lib/64/libgomp.a +-./usr/lib/64/libgomp.so +-./usr/lib/64/libgomp.so.1 +-./usr/lib/64/libgomp.so.1.1 +-./usr/lib/64/libgomp.so.2 +-./usr/lib/64/libgomp.so.2.0 +-./usr/lib/64/libgomp_p.a +-./usr/lib/64/libgomp_pic.a ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/clang-4.0/msa.h comp-obsolete obsolete Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.72 src/distrib/sets/lists/debug/ad.mips:1.73 --- src/distrib/sets/lists/debug/ad.mips:1.72 Mon Mar 18 09:03:08 2019 +++ src/distrib/sets/lists/debug/ad.mips Mon Mar 18 22:40:45 2019 @@ -1,5 +1,8 @@ -# $NetBSD: ad.mips,v 1.72 2019/03/18 09:03:08 wiz Exp $ +# $NetBSD: ad.mips,v 1.73 2019/03/18 22:40:45 wiz Exp $ +-./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug comp-c-debug debug,compatfile,gcc=6 +-./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug comp-c-debug debug,compatfile,gcc=7 ./usr/lib/64/libc_fp_g.acomp-c-debuglib debuglib,softfloat,compat,arch64 +-./usr/lib/64/libgomp_g.acomp-c-debuglib debuglib,compat,arch64 ./usr/lib/libc_fp_g.a comp-c-debuglib debuglib,softfloat,arch64 ./usr/lib/o32/libc_fp_g.acomp-c-debuglib debuglib,softfloat,compat,arch64 ./usr/libdata/debug/lib/libc_fp.so.0.0.debug comp-c-debug debug,softfloat,arch64
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Mon Mar 18 20:34:48 UTC 2019 Modified Files: src/sys/kern: subr_pool.c Log Message: Kernel Heap Hardening: manage freed items with bitmaps rather than linked lists when we're on-page and the page header is naturally big enough to contain a bitmap. This comes with no increase in memory consumption, and similar CPU cost (maybe it's a little faster actually). We want to favor bitmaps over linked lists, because linked lists install kernel pointers inside the items, and this can be too easily exploitable in use-after-free or double-free conditions, or in item buffer overflows occurring within a pool page. To generate a diff of this commit: cvs rdiff -u -r1.242 -r1.243 src/sys/kern/subr_pool.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_pool.c diff -u src/sys/kern/subr_pool.c:1.242 src/sys/kern/subr_pool.c:1.243 --- src/sys/kern/subr_pool.c:1.242 Sun Mar 17 19:57:54 2019 +++ src/sys/kern/subr_pool.c Mon Mar 18 20:34:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_pool.c,v 1.242 2019/03/17 19:57:54 maxv Exp $ */ +/* $NetBSD: subr_pool.c,v 1.243 2019/03/18 20:34:48 maxv Exp $ */ /* * Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.242 2019/03/17 19:57:54 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.243 2019/03/18 20:34:48 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -601,10 +601,26 @@ pool_init_is_phinpage(const struct pool static inline bool pool_init_is_usebmap(const struct pool *pp) { + size_t bmapsize; + if (pp->pr_roflags & PR_NOTOUCH) { return true; } + /* + * If we're on-page, and the page header can already contain a bitmap + * big enough to cover all the items of the page, go with a bitmap. + */ + if (!(pp->pr_roflags & PR_PHINPAGE)) { + return false; + } + bmapsize = roundup(PHSIZE, pp->pr_align) - + offsetof(struct pool_item_header, ph_bitmap[0]); + KASSERT(bmapsize % sizeof(pool_item_bitmap_t) == 0); + if (pp->pr_itemsperpage <= bmapsize * CHAR_BIT) { + return true; + } + return false; } @@ -728,6 +744,9 @@ pool_init(struct pool *pp, size_t size, SPLAY_INIT(>pr_phtree); } + pp->pr_itemsperpage = itemspace / pp->pr_size; + KASSERT(pp->pr_itemsperpage != 0); + /* * Decide whether to use a bitmap or a linked list to manage freed * items. @@ -736,9 +755,6 @@ pool_init(struct pool *pp, size_t size, pp->pr_roflags |= PR_USEBMAP; } - pp->pr_itemsperpage = itemspace / pp->pr_size; - KASSERT(pp->pr_itemsperpage != 0); - /* * If we're off-page and use a bitmap, choose the appropriate pool to * allocate page headers, whose size varies depending on the bitmap. If
CVS commit: src/external/mit/xorg/lib/libvdpau
Module Name:src Committed By: mrg Date: Mon Mar 18 20:14:02 UTC 2019 Modified Files: src/external/mit/xorg/lib/libvdpau: Makefile Log Message: add libXext and libX11 to LIBDPLIBS. fixes eg, minidlna build. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libvdpau/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libvdpau/Makefile diff -u src/external/mit/xorg/lib/libvdpau/Makefile:1.3 src/external/mit/xorg/lib/libvdpau/Makefile:1.4 --- src/external/mit/xorg/lib/libvdpau/Makefile:1.3 Tue Mar 12 11:05:09 2019 +++ src/external/mit/xorg/lib/libvdpau/Makefile Mon Mar 18 20:14:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/03/12 11:05:09 christos Exp $ +# $NetBSD: Makefile,v 1.4 2019/03/18 20:14:02 mrg Exp $ .include @@ -15,6 +15,9 @@ VDPAU_MODULEDIR= ${X11LIBDIR}/vdpau CPPFLAGS+= -DVDPAU_SYSCONFDIR=\"${VDPAU_SYSCONFDIR}\" \ -DVDPAU_MODULEDIR=\"${VDPAU_MODULEDIR}\" +LIBDPLIBS= Xext ${.CURDIR}/../libXext \ + X11 ${.CURDIR}/../libX11/dynamic + SHLIB_MAJOR= 1 SHLIB_MINOR= 0
CVS commit: src/sys
Module Name:src Committed By: msaitoh Date: Mon Mar 18 11:38:04 UTC 2019 Modified Files: src/sys/dev/marvell: if_mvxpe.c if_mvxpereg.h src/sys/dev/pci/ixgbe: ixgbe.c ixv.c src/sys/net: if_pppoe.c src/sys/netinet6: in6.c src/sys/netipsec: ipsecif.c Log Message: s/pakcet/packet/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/marvell/if_mvxpe.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/if_mvxpereg.h cvs rdiff -u -r1.178 -r1.179 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.111 -r1.112 src/sys/dev/pci/ixgbe/ixv.c cvs rdiff -u -r1.146 -r1.147 src/sys/net/if_pppoe.c cvs rdiff -u -r1.273 -r1.274 src/sys/netinet6/in6.c cvs rdiff -u -r1.13 -r1.14 src/sys/netipsec/ipsecif.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/marvell/if_mvxpe.c diff -u src/sys/dev/marvell/if_mvxpe.c:1.21 src/sys/dev/marvell/if_mvxpe.c:1.22 --- src/sys/dev/marvell/if_mvxpe.c:1.21 Tue Jan 22 03:42:27 2019 +++ src/sys/dev/marvell/if_mvxpe.c Mon Mar 18 11:38:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvxpe.c,v 1.21 2019/01/22 03:42:27 msaitoh Exp $ */ +/* $NetBSD: if_mvxpe.c,v 1.22 2019/03/18 11:38:03 msaitoh Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. * All rights reserved. @@ -25,7 +25,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.21 2019/01/22 03:42:27 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_mvxpe.c,v 1.22 2019/03/18 11:38:03 msaitoh Exp $"); #include "opt_multiprocessor.h" @@ -568,7 +568,7 @@ mvxpe_evcnt_attach(struct mvxpe_softc *s evcnt_attach_dynamic(>sc_ev.ev_rxtx_rreq, EVCNT_TYPE_INTR, NULL, device_xname(sc->sc_dev), "RxTx Rx resource erorr"); evcnt_attach_dynamic(>sc_ev.ev_rxtx_rpq, EVCNT_TYPE_INTR, - NULL, device_xname(sc->sc_dev), "RxTx Rx pakcet"); + NULL, device_xname(sc->sc_dev), "RxTx Rx packet"); evcnt_attach_dynamic(>sc_ev.ev_rxtx_tbrq, EVCNT_TYPE_INTR, NULL, device_xname(sc->sc_dev), "RxTx Tx complete"); evcnt_attach_dynamic(>sc_ev.ev_rxtx_rxtxth, EVCNT_TYPE_INTR, @@ -2538,7 +2538,7 @@ mvxpe_rx_queue_select(struct mvxpe_softc continue; DPRINTSC(sc, 2, - "queue %d selected: prxs=%#x, %u pakcet received.\n", + "queue %d selected: prxs=%#x, %u packet received.\n", q, prxs, npkt); *queue = q; mvxpe_rx_lockq(sc, q); Index: src/sys/dev/marvell/if_mvxpereg.h diff -u src/sys/dev/marvell/if_mvxpereg.h:1.4 src/sys/dev/marvell/if_mvxpereg.h:1.5 --- src/sys/dev/marvell/if_mvxpereg.h:1.4 Sat Feb 13 06:33:21 2016 +++ src/sys/dev/marvell/if_mvxpereg.h Mon Mar 18 11:38:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mvxpereg.h,v 1.4 2016/02/13 06:33:21 hikaru Exp $ */ +/* $NetBSD: if_mvxpereg.h,v 1.5 2019/03/18 11:38:03 msaitoh Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. * All rights reserved. @@ -818,7 +818,7 @@ struct mvxpe_rx_desc { }; /* - * Received pakcet command header: + * Received packet command header: * network controller => software * the controller parse the packet and set some flags. */ @@ -872,7 +872,7 @@ struct mvxpe_rx_desc { #define MVXPE_TX_CMD_L3_OFFSET(v) (((v) & 0x7f) << 0) /* - * Transmit pakcet extra attributes + * Transmit packet extra attributes * and error status returned from network controller. */ #define MVXPE_TX_F_DSA_TAG (3 << 30) /* DSA Tag */ Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.178 src/sys/dev/pci/ixgbe/ixgbe.c:1.179 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.178 Fri Mar 15 02:38:20 2019 +++ src/sys/dev/pci/ixgbe/ixgbe.c Mon Mar 18 11:38:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.178 2019/03/15 02:38:20 msaitoh Exp $ */ +/* $NetBSD: ixgbe.c,v 1.179 2019/03/18 11:38:03 msaitoh Exp $ */ /** @@ -324,7 +324,7 @@ static int ixgbe_flow_control = ixgbe_fc SYSCTL_INT(_hw_ix, OID_AUTO, flow_control, CTLFLAG_RDTUN, _flow_control, 0, "Default flow control used for all adapters"); -/* Which pakcet processing uses workqueue or softint */ +/* Which packet processing uses workqueue or softint */ static bool ixgbe_txrx_workqueue = false; /* Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.111 src/sys/dev/pci/ixgbe/ixv.c:1.112 --- src/sys/dev/pci/ixgbe/ixv.c:1.111 Fri Mar 15 02:38:20 2019 +++ src/sys/dev/pci/ixgbe/ixv.c Mon Mar 18 11:38:03 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.111 2019/03/15 02:38:20 msaitoh Exp $*/ +/*$NetBSD: ixv.c,v 1.112 2019/03/18 11:38:03 msaitoh Exp $*/ /** @@ -203,7 +203,7 @@ TUNABLE_INT("hw.ixv.rx_process_limit", & static int ixv_tx_process_limit = 256; TUNABLE_INT("hw.ixv.tx_process_limit", _tx_process_limit); -/* Which pakcet processing uses workqueue or softint
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Mon Mar 18 09:22:15 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ctldir.c zfs_vfsops.c src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: zfs_ctldir.h Log Message: Make ZFS exportable by NFS, implement zfsctl_vptofh(), zfs_netbsd_vptofh() and zfs_netbsd_fhtovp(). Undo changes to now completely unused zfs_fhtovp(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c cvs rdiff -u -r1.20 -r1.21 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c cvs rdiff -u -r1.2 -r1.3 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_ctldir.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/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.8 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.9 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.8 Mon Mar 18 09:21:31 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c Mon Mar 18 09:22:14 2019 @@ -1885,6 +1885,33 @@ zfsctl_loadvnode(vfs_t *vfsp, vnode_t *v return 0; } +int +zfsctl_vptofh(vnode_t *vp, fid_t *fidp, size_t *fh_size) +{ + struct sfs_node *node = VTOSFS(vp); + uint64_t object = node->sn_id; + zfid_short_t *zfid = (zfid_short_t *)fidp; + int i; + + SFS_NODE_ASSERT(vp); + + if (*fh_size < SHORT_FID_LEN) { + *fh_size = SHORT_FID_LEN; + return SET_ERROR(E2BIG); + } + *fh_size = SHORT_FID_LEN; + + zfid->zf_len = SHORT_FID_LEN; + for (i = 0; i < sizeof(zfid->zf_object); i++) + zfid->zf_object[i] = (uint8_t)(object >> (8 * i)); + + /* .zfs nodes always have a generation number of 0 */ + for (i = 0; i < sizeof(zfid->zf_gen); i++) + zfid->zf_gen[i] = 0; + + return 0; +} + /* * Return the ".zfs" vnode. */ Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.20 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.21 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.20 Mon Mar 18 09:20:58 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Mon Mar 18 09:22:14 2019 @@ -136,7 +136,8 @@ static int zfs_umount(vfs_t *vfsp, int f static int zfs_root(vfs_t *vfsp, int flags, vnode_t **vpp); static int zfs_netbsd_root(vfs_t *vfsp, vnode_t **vpp); static int zfs_statvfs(vfs_t *vfsp, struct statvfs *statp); -static int zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp); +static int zfs_netbsd_vptofh(vnode_t *vp, fid_t *fidp, size_t *fh_size); +static int zfs_netbsd_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp); static int zfs_vget(vfs_t *vfsp, ino_t ino, vnode_t **vpp); static int zfs_sync(vfs_t *vfsp, int waitfor); static int zfs_netbsd_sync(vfs_t *vfsp, int waitfor, cred_t *cr); @@ -172,8 +173,8 @@ struct vfsops zfs_vfsops = { .vfs_renamelock_enter = genfs_renamelock_enter, .vfs_renamelock_exit = genfs_renamelock_exit, .vfs_reinit = (void *)nullop, - .vfs_vptofh = (void *)eopnotsupp, - .vfs_fhtovp = (void *)eopnotsupp, + .vfs_vptofh = zfs_netbsd_vptofh, + .vfs_fhtovp = zfs_netbsd_fhtovp, .vfs_quotactl = (void *)eopnotsupp, .vfs_extattrctl = (void *)eopnotsupp, .vfs_suspendctl = genfs_suspendctl, @@ -254,6 +255,171 @@ zfs_netbsd_root(vfs_t *vfsp, vnode_t **v return zfs_root(vfsp, LK_EXCLUSIVE | LK_RETRY, vpp); } +static int +zfs_netbsd_vptofh(vnode_t *vp, fid_t *fidp, size_t *fh_size) +{ + znode_t *zp; + zfsvfs_t *zfsvfs; + uint32_t gen; + uint64_t gen64; + uint64_t object; + zfid_short_t *zfid; + int size, i, error; + + if (zfsctl_is_node(vp)) + return zfsctl_vptofh(vp, fidp, fh_size); + + zp = VTOZ(vp); + zfsvfs = zp->z_zfsvfs; + object = zp->z_id; + + ZFS_ENTER(zfsvfs); + ZFS_VERIFY_ZP(zp); + + if ((error = sa_lookup(zp->z_sa_hdl, SA_ZPL_GEN(zfsvfs), + , sizeof (uint64_t))) != 0) { + ZFS_EXIT(zfsvfs); + return (error); + } + + gen = (uint32_t)gen64; + + size = (zfsvfs->z_parent != zfsvfs) ? LONG_FID_LEN : SHORT_FID_LEN; + + if (*fh_size < size) { + ZFS_EXIT(zfsvfs); + *fh_size = size; + return SET_ERROR(E2BIG); + } + *fh_size = size; + + zfid = (zfid_short_t *)fidp; + + zfid->zf_len = size; + + for (i = 0; i < sizeof (zfid->zf_object); i++) + zfid->zf_object[i] = (uint8_t)(object >> (8 * i)); + + /* Must have a non-zero generation number to distinguish from .zfs */ + if (gen == 0) + gen = 1; + for (i = 0; i < sizeof (zfid->zf_gen); i++) + zfid->zf_gen[i] = (uint8_t)(gen >> (8 * i)); + + if (size == LONG_FID_LEN) { + uint64_t objsetid = dmu_objset_id(zfsvfs->z_os); + zfid_long_t *zlfid; + + zlfid = (zfid_long_t *)fidp; + + for (i = 0; i < sizeof (zlfid->zf_setid); i++) + zlfid->zf_setid[i] = (uint8_t)(objsetid >> (8 * i)); + + /* XXX - this should be the generation
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Mon Mar 18 09:21:31 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ctldir.c Log Message: Implement zfsctl_lookup_objset() to look up "zfsvfs" of an mounted snapshot. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.7 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.8 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.7 Mon Mar 18 09:20:58 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c Mon Mar 18 09:21:31 2019 @@ -1946,8 +1946,23 @@ zfsctl_destroy(zfsvfs_t *zfsvfs) int zfsctl_lookup_objset(vfs_t *vfsp, uint64_t objsetid, zfsvfs_t **zfsvfsp) { + struct sfs_node_key key = { + .parent_id = ZFSCTL_INO_SNAPDIR, + .id = objsetid + }; + vnode_t *vp; + int error; - return EINVAL; + *zfsvfsp = NULL; + error = vcache_get(vfsp, , sizeof(key), ); + if (error == 0) { + if (vp->v_mountedhere) + *zfsvfsp = vp->v_mountedhere->mnt_data; + vrele(vp); + } + if (*zfsvfsp == NULL) + return SET_ERROR(EINVAL); + return 0; } int
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Mon Mar 18 09:20:58 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ctldir.c zfs_vfsops.c zfs_vnops.c Log Message: Set "mnt_stat.f_fsid" and "mnt_stat.f_fsidx" from the objset guid like FreeBSD and Illumos do. Use "f_fsid" for "va_fsid" and cheat NFSD to export snapshots under ".zfs" by setting these snaphots "f_fsidx" to the parents "f_fsidx". To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c cvs rdiff -u -r1.19 -r1.20 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c cvs rdiff -u -r1.46 -r1.47 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.6 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.7 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c:1.6 Wed Feb 20 10:08:37 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c Mon Mar 18 09:20:58 2019 @@ -1335,7 +1335,9 @@ sfs_snapshot_mount(vnode_t *vp, const ch if (error) goto out; - vfs_getnewfsid(vfsp); + /* Set f_fsidx from parent to cheat NFSD. */ + vfsp->mnt_stat.f_fsidx = vp->v_vfsp->mnt_stat.f_fsidx; + strlcpy(vfsp->mnt_stat.f_mntfromname, osname, sizeof(vfsp->mnt_stat.f_mntfromname)); set_statvfs_info(path, UIO_SYSSPACE, vfsp->mnt_stat.f_mntfromname, @@ -1622,7 +1624,7 @@ sfs_getattr(void *v) vap->va_nlink = 2; vap->va_uid = 0; vap->va_gid = 0; - vap->va_fsid = vp->v_vfsp->mnt_stat.f_fsidx.__fsid_val[0]; + vap->va_fsid = vp->v_vfsp->mnt_stat.f_fsid; vap->va_fileid = node->sn_id; vap->va_size = 0; vap->va_blocksize = 0; Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.19 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.20 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c:1.19 Tue Feb 5 09:54:36 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c Mon Mar 18 09:20:58 2019 @@ -1374,7 +1374,9 @@ zfs_domount(vfs_t *vfsp, char *osname) #endif #ifdef __NetBSD__ vfsp->mnt_stat.f_fsidx.__fsid_val[0] = fsid_guid; - vfsp->mnt_stat.f_fsidx.__fsid_val[1] = fsid_guid >> 32; + vfsp->mnt_stat.f_fsidx.__fsid_val[1] = ((fsid_guid>>32) << 8) | + makefstype(vfsp->mnt_op->vfs_name) & 0xFF; + vfsp->mnt_stat.f_fsid = fsid_guid; #endif /* @@ -1962,8 +1964,6 @@ zfs_mount(vfs_t *vfsp, const char *path, #endif #ifdef __NetBSD__ - vfs_getnewfsid(vfsp); - /* setup zfs mount info */ strlcpy(vfsp->mnt_stat.f_mntfromname, osname, sizeof(vfsp->mnt_stat.f_mntfromname)); @@ -2036,7 +2036,8 @@ zfs_statvfs(vfs_t *vfsp, struct statvfs statp->f_fsid = d32; #endif #ifdef __NetBSD__ - statp->f_fsid = vfsp->mnt_stat.f_fsidx.__fsid_val[0]; + statp->f_fsid = vfsp->mnt_stat.f_fsid; + statp->f_fsidx = vfsp->mnt_stat.f_fsidx; #endif /* Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.46 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.47 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.46 Mon Mar 18 09:20:15 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Mon Mar 18 09:20:58 2019 @@ -3073,7 +3073,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, i vap->va_nodeid = zp->z_id; #endif #ifdef __NetBSD__ - vap->va_fsid = vp->v_mount->mnt_stat.f_fsidx.__fsid_val[0]; + vap->va_fsid = vp->v_mount->mnt_stat.f_fsid; vap->va_nodeid = zp->z_id; /* * If we are a snapshot mounted under .zfs, return
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Mon Mar 18 09:20:15 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c Log Message: As zfs_netbsd_getpages() ignores "a_count" and processes exactly one page return an error if "a_count != 1". To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.45 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.46 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.45 Mon Mar 18 09:19:39 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Mon Mar 18 09:20:15 2019 @@ -5844,6 +5844,9 @@ zfs_netbsd_getpages(void *v) if (async) { return 0; } + if (*ap->a_count != 1) { + return EBUSY; + } ZFS_ENTER(zfsvfs); ZFS_VERIFY_ZP(zp);
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Mon Mar 18 09:19:39 UTC 2019 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c Log Message: Change zfs_readdir() to use malloc() instead of kmem_alloc() to allocate cookies. Required by protocol, caller uses free(). To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.44 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.45 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.44 Tue Feb 5 09:54:36 2019 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Mon Mar 18 09:19:39 2019 @@ -85,6 +85,7 @@ #include #include #include +#include uint_t zfs_putpage_key; #endif @@ -2754,7 +2755,7 @@ zfs_readdir(vnode_t *vp, uio_t *uio, cre #endif #ifdef __NetBSD__ ncooks = uio->uio_resid / _DIRENT_MINSIZE(odp); - cooks = kmem_alloc(ncooks * sizeof(off_t), KM_SLEEP); + cooks = malloc(ncooks * sizeof(off_t), M_TEMP, M_WAITOK); #endif *cookies = cooks; *ncookies = ncooks;
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: wiz Date: Mon Mar 18 09:03:08 UTC 2019 Modified Files: src/distrib/sets/lists/comp: ad.mips src/distrib/sets/lists/debug: ad.mips Log Message: Remove weird lines from set lists. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/debug/ad.mips 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.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.79 src/distrib/sets/lists/comp/ad.mips:1.80 --- src/distrib/sets/lists/comp/ad.mips:1.79 Thu Feb 7 00:04:56 2019 +++ src/distrib/sets/lists/comp/ad.mips Mon Mar 18 09:03:08 2019 @@ -1,12 +1,4 @@ -# $NetBSD: ad.mips,v 1.79 2019/02/07 00:04:56 mrg Exp $ --./usr/lib/64/libgomp.a --./usr/lib/64/libgomp.so --./usr/lib/64/libgomp.so.1 --./usr/lib/64/libgomp.so.1.1 --./usr/lib/64/libgomp.so.2 --./usr/lib/64/libgomp.so.2.0 --./usr/lib/64/libgomp_p.a --./usr/lib/64/libgomp_pic.a +# $NetBSD: ad.mips,v 1.80 2019/03/18 09:03:08 wiz Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/clang-4.0/msa.h comp-obsolete obsolete Index: src/distrib/sets/lists/debug/ad.mips diff -u src/distrib/sets/lists/debug/ad.mips:1.71 src/distrib/sets/lists/debug/ad.mips:1.72 --- src/distrib/sets/lists/debug/ad.mips:1.71 Sat Feb 2 22:39:33 2019 +++ src/distrib/sets/lists/debug/ad.mips Mon Mar 18 09:03:08 2019 @@ -1,8 +1,5 @@ -# $NetBSD: ad.mips,v 1.71 2019/02/02 22:39:33 mrg Exp $ --./usr/libdata/debug/usr/lib/64/libgomp.so.1.3.debug comp-c-debug debug,compatfile,gcc=6 --./usr/libdata/debug/usr/lib/64/libgomp.so.2.0.debug comp-c-debug debug,compatfile,gcc=7 +# $NetBSD: ad.mips,v 1.72 2019/03/18 09:03:08 wiz Exp $ ./usr/lib/64/libc_fp_g.acomp-c-debuglib debuglib,softfloat,compat,arch64 --./usr/lib/64/libgomp_g.acomp-c-debuglib debuglib,compat,arch64 ./usr/lib/libc_fp_g.a comp-c-debuglib debuglib,softfloat,arch64 ./usr/lib/o32/libc_fp_g.acomp-c-debuglib debuglib,softfloat,compat,arch64 ./usr/libdata/debug/lib/libc_fp.so.0.0.debug comp-c-debug debug,softfloat,arch64