CVS commit: src/tests/lib/libnvmm
Module Name:src
Committed By: kre
Date: Mon Dec 24 05:06:46 UTC 2018
Modified Files:
src/tests/lib/libnvmm: Makefile
Log Message:
Keep infrastructure setup and only exclude test for non-amd64 case.
Should be final nail in coffin of non-amd64 build failures (ie: Atffile
should get installed where it belongs rather than the root dir).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libnvmm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libnvmm/Makefile
diff -u src/tests/lib/libnvmm/Makefile:1.3 src/tests/lib/libnvmm/Makefile:1.4
--- src/tests/lib/libnvmm/Makefile:1.3 Sun Dec 23 16:40:16 2018
+++ src/tests/lib/libnvmm/Makefile Mon Dec 24 05:06:45 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2018/12/23 16:40:16 jakllsch Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/24 05:06:45 kre Exp $
NOMAN= # defined
.include
-.if ${MACHINE} == "amd64"
TESTSDIR= ${TESTSBASE}/lib/libnvmm
@@ -12,6 +11,7 @@ LDADD+= -lnvmm
BINDIR= ${TESTSDIR}
+.if ${MACHINE} == "amd64"
# Mem Assist
TESTS_SH= t_mem_assist
PROGS= h_mem_assist
CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src Committed By: christos Date: Mon Dec 24 02:58:39 UTC 2018 Modified Files: src/external/bsd/ntp/dist/ntpd: ntp_config.c Log Message: only use yydebug if YYDEBUG To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/bsd/ntp/dist/ntpd/ntp_config.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/bsd/ntp/dist/ntpd/ntp_config.c diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.19 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.20 --- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.19 Sat Sep 29 17:52:33 2018 +++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Sun Dec 23 21:58:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_config.c,v 1.19 2018/09/29 21:52:33 christos Exp $ */ +/* $NetBSD: ntp_config.c,v 1.20 2018/12/24 02:58:39 christos Exp $ */ /* ntp_config.c * @@ -4750,7 +4750,7 @@ getconfig( /*** BULK OF THE PARSER ***/ -#ifdef DEBUG +#if defined(DEBUG) && defined(YYDEBUG) yydebug = !!(debug >= 5); #endif yyparse();
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src
Committed By: christos
Date: Mon Dec 24 02:39:12 UTC 2018
Modified Files:
src/external/bsd/tcpdump/dist: tcpdump.c
Log Message:
make pcap_debug weak.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/tcpdump/dist/tcpdump.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/bsd/tcpdump/dist/tcpdump.c
diff -u src/external/bsd/tcpdump/dist/tcpdump.c:1.16 src/external/bsd/tcpdump/dist/tcpdump.c:1.17
--- src/external/bsd/tcpdump/dist/tcpdump.c:1.16 Fri Sep 8 10:01:13 2017
+++ src/external/bsd/tcpdump/dist/tcpdump.c Sun Dec 23 21:39:12 2018
@@ -30,7 +30,7 @@
static const char copyright[] _U_ =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
The Regents of the University of California. All rights reserved.\n";
-__RCSID("$NetBSD: tcpdump.c,v 1.16 2017/09/08 14:01:13 christos Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.17 2018/12/24 02:39:12 christos Exp $");
#endif
/*
@@ -261,9 +261,10 @@ static void
pcap_set_parser_debug(int value)
{
#ifdef HAVE_PCAP_DEBUG
- extern int pcap_debug;
+ extern int pcap_debug __weak;
- pcap_debug = value;
+ if (_debug)
+ pcap_debug = value;
#else /* HAVE_PCAP_DEBUG */
extern int yydebug;
CVS commit: src/usr.bin/config
Module Name:src
Committed By: christos
Date: Mon Dec 24 02:07:44 UTC 2018
Modified Files:
src/usr.bin/config: main.c
Log Message:
yydebug is now defined only if YYDEBUG is
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/usr.bin/config/main.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.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.97 src/usr.bin/config/main.c:1.98
--- src/usr.bin/config/main.c:1.97 Tue Nov 28 10:31:33 2017
+++ src/usr.bin/config/main.c Sun Dec 23 21:07:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.97 2017/11/28 15:31:33 christos Exp $ */
+/* $NetBSD: main.c,v 1.98 2018/12/24 02:07:44 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include
-__RCSID("$NetBSD: main.c,v 1.97 2017/11/28 15:31:33 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.98 2018/12/24 02:07:44 christos Exp $");
#ifndef MAKE_BOOTSTRAP
#include
@@ -95,7 +95,7 @@ int handling_cmdlineopts; /* currently
int yyparse(void);
-#ifndef MAKE_BOOTSTRAP
+#if !defined(MAKE_BOOTSTRAP) && defined(YYDEBUG)
extern int yydebug;
#endif
int dflag;
@@ -172,7 +172,7 @@ main(int argc, char **argv)
switch (ch) {
case 'd':
-#ifndef MAKE_BOOTSTRAP
+#if !defined(MAKE_BOOTSTRAP) && defined(YYDEBUG)
yydebug = 1;
#endif
dflag++;
CVS commit: src/external/bsd/flex/dist/src
Module Name:src Committed By: christos Date: Sun Dec 23 22:14:29 UTC 2018 Modified Files: src/external/bsd/flex/dist/src: flex.skl Log Message: fix incorrect cast. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/bsd/flex/dist/src/flex.skl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/flex/dist/src/flex.skl diff -u src/external/bsd/flex/dist/src/flex.skl:1.12 src/external/bsd/flex/dist/src/flex.skl:1.13 --- src/external/bsd/flex/dist/src/flex.skl:1.12 Sun Dec 23 11:27:17 2018 +++ src/external/bsd/flex/dist/src/flex.skl Sun Dec 23 17:14:29 2018 @@ -1694,7 +1694,7 @@ m4_ifdef( [[M4_YY_USES_REJECT]], if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (yy_size_t) (new_size - 2); } YY_G(yy_n_chars) += number_to_move;
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jakllsch Date: Sun Dec 23 21:27:45 UTC 2018 Modified Files: src/distrib/sets/lists/tests: md.amd64 mi Log Message: Make the /usr/tests/lib/libnvmm directory and testing framework files MI. Should fix non-amd64 build. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/tests/md.amd64 cvs rdiff -u -r1.797 -r1.798 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/md.amd64 diff -u src/distrib/sets/lists/tests/md.amd64:1.5 src/distrib/sets/lists/tests/md.amd64:1.6 --- src/distrib/sets/lists/tests/md.amd64:1.5 Sun Dec 23 16:40:15 2018 +++ src/distrib/sets/lists/tests/md.amd64 Sun Dec 23 21:27:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.5 2018/12/23 16:40:15 jakllsch Exp $ +# $NetBSD: md.amd64,v 1.6 2018/12/23 21:27:45 jakllsch Exp $ ./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete @@ -7,8 +7,5 @@ ./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete ./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete -./usr/tests/lib/libnvmmtests-lib-tests compattestfile,atf -./usr/tests/lib/libnvmm/Atffile tests-lib-tests compattestfile,atf -./usr/tests/lib/libnvmm/Kyuafile tests-lib-tests compattestfile,atf,kyua ./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf ./usr/tests/lib/libnvmm/t_mem_assist tests-lib-tests compattestfile,atf Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.797 src/distrib/sets/lists/tests/mi:1.798 --- src/distrib/sets/lists/tests/mi:1.797 Sun Dec 23 16:40:15 2018 +++ src/distrib/sets/lists/tests/mi Sun Dec 23 21:27:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.797 2018/12/23 16:40:15 jakllsch Exp $ +# $NetBSD: mi,v 1.798 2018/12/23 21:27:45 jakllsch Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3044,6 +3044,9 @@ ./usr/tests/lib/libm/t_sqrt tests-lib-tests compattestfile,atf ./usr/tests/lib/libm/t_tan tests-lib-tests compattestfile,atf ./usr/tests/lib/libm/t_tanh tests-lib-tests compattestfile,atf +./usr/tests/lib/libnvmmtests-lib-tests compattestfile,atf +./usr/tests/lib/libnvmm/Atffile tests-lib-tests compattestfile,atf +./usr/tests/lib/libnvmm/Kyuafile tests-lib-tests compattestfile,atf,kyua ./usr/tests/lib/libobjctests-lib-tests compattestfile,atf ./usr/tests/lib/libobjc/Atffile tests-lib-tests compattestfile,atf ./usr/tests/lib/libobjc/Kyuafile tests-lib-tests compattestfile,atf,kyua
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: jakllsch
Date: Sun Dec 23 20:27:23 UTC 2018
Modified Files:
src/external/bsd/byacc/dist: closure.c error.c graph.c lalr.c lr0.c
main.c mkpar.c output.c reader.c symtab.c verbose.c warshall.c
Log Message:
Restore "defs.h", #include ordering from before today's
update. Fixes tools build on, for instance, Linux hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/byacc/dist/closure.c \
src/external/bsd/byacc/dist/symtab.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/byacc/dist/error.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/byacc/dist/graph.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/byacc/dist/lalr.c \
src/external/bsd/byacc/dist/warshall.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/byacc/dist/lr0.c \
src/external/bsd/byacc/dist/mkpar.c src/external/bsd/byacc/dist/verbose.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/byacc/dist/main.c \
src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/byacc/dist/output.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/bsd/byacc/dist/closure.c
diff -u src/external/bsd/byacc/dist/closure.c:1.10 src/external/bsd/byacc/dist/closure.c:1.11
--- src/external/bsd/byacc/dist/closure.c:1.10 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/closure.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: closure.c,v 1.10 2018/12/23 15:38:53 christos Exp $ */
-
-#include
-__RCSID("$NetBSD: closure.c,v 1.10 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: closure.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp */
#include "defs.h"
+#include
+__RCSID("$NetBSD: closure.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $");
+
Value_t *itemset;
Value_t *itemsetend;
unsigned *ruleset;
Index: src/external/bsd/byacc/dist/symtab.c
diff -u src/external/bsd/byacc/dist/symtab.c:1.10 src/external/bsd/byacc/dist/symtab.c:1.11
--- src/external/bsd/byacc/dist/symtab.c:1.10 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/symtab.c Sun Dec 23 20:27:23 2018
@@ -1,12 +1,12 @@
-/* $NetBSD: symtab.c,v 1.10 2018/12/23 15:38:53 christos Exp $ */
-
-#include
-__RCSID("$NetBSD: symtab.c,v 1.10 2018/12/23 15:38:53 christos Exp $");
+/* $NetBSD: symtab.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $ */
/* Id: symtab.c,v 1.11 2014/03/26 00:17:09 Tom.Shields Exp */
#include "defs.h"
+#include
+__RCSID("$NetBSD: symtab.c,v 1.11 2018/12/23 20:27:23 jakllsch Exp $");
+
/* TABLE_SIZE is the number of entries in the symbol table. */
/* TABLE_SIZE must be a power of two. */
Index: src/external/bsd/byacc/dist/error.c
diff -u src/external/bsd/byacc/dist/error.c:1.13 src/external/bsd/byacc/dist/error.c:1.14
--- src/external/bsd/byacc/dist/error.c:1.13 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/error.c Sun Dec 23 20:27:23 2018
@@ -1,15 +1,13 @@
-/* $NetBSD: error.c,v 1.13 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: error.c,v 1.14 2018/12/23 20:27:23 jakllsch Exp $ */
+#include "defs.h"
#include
-__RCSID("$NetBSD: error.c,v 1.13 2018/12/23 15:38:53 christos Exp $");
-
+__RCSID("$NetBSD: error.c,v 1.14 2018/12/23 20:27:23 jakllsch Exp $");
/* Id: error.c,v 1.14 2016/12/02 18:35:55 tom Exp */
-#include "defs.h"
/* routines for printing error messages */
-
__dead void
fatal(const char *msg)
{
Index: src/external/bsd/byacc/dist/graph.c
diff -u src/external/bsd/byacc/dist/graph.c:1.7 src/external/bsd/byacc/dist/graph.c:1.8
--- src/external/bsd/byacc/dist/graph.c:1.7 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/graph.c Sun Dec 23 20:27:23 2018
@@ -1,11 +1,10 @@
-/* $NetBSD: graph.c,v 1.7 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: graph.c,v 1.8 2018/12/23 20:27:23 jakllsch Exp $ */
+#include "defs.h"
/* Id: graph.c,v 1.8 2014/02/19 00:46:57 Tom.Shields Exp */
#include
-__RCSID("$NetBSD: graph.c,v 1.7 2018/12/23 15:38:53 christos Exp $");
-
-#include "defs.h"
+__RCSID("$NetBSD: graph.c,v 1.8 2018/12/23 20:27:23 jakllsch Exp $");
static void graph_state(int stateno);
static void graph_LA(int ruleno);
Index: src/external/bsd/byacc/dist/lalr.c
diff -u src/external/bsd/byacc/dist/lalr.c:1.9 src/external/bsd/byacc/dist/lalr.c:1.10
--- src/external/bsd/byacc/dist/lalr.c:1.9 Sun Dec 23 15:38:53 2018
+++ src/external/bsd/byacc/dist/lalr.c Sun Dec 23 20:27:23 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: lalr.c,v 1.9 2018/12/23 15:38:53 christos Exp $ */
+/* $NetBSD: lalr.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $ */
-#include
-__RCSID("$NetBSD: lalr.c,v 1.9 2018/12/23 15:38:53 christos Exp $");
-
-/* Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp */
#include "defs.h"
+/* Id: lalr.c,v 1.12 2016/06/07 00:28:03 tom Exp */
+
+#include
+__RCSID("$NetBSD: lalr.c,v 1.10 2018/12/23 20:27:23 jakllsch Exp $");
typedef struct shorts
{
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Sun Dec 23 19:17:26 UTC 2018 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 md.amd64 shl.mi Log Message: new binutils is 231 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.263 -r1.264 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.322 -r1.323 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.aarch64 diff -u src/distrib/sets/lists/comp/ad.aarch64:1.25 src/distrib/sets/lists/comp/ad.aarch64:1.26 --- src/distrib/sets/lists/comp/ad.aarch64:1.25 Sun Dec 9 10:08:05 2018 +++ src/distrib/sets/lists/comp/ad.aarch64 Sun Dec 23 14:17:26 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.25 2018/12/09 15:08:05 alnsn Exp $ +# $NetBSD: ad.aarch64,v 1.26 2018/12/23 19:17:26 christos Exp $ ./usr/include/aarch64comp-c-include ./usr/include/aarch64/ansi.h comp-c-include ./usr/include/aarch64/aout_machdep.h comp-c-include @@ -214,9 +214,6 @@ ./usr/libdata/ldscripts/armelf.x -unknown- binutils ./usr/libdata/ldscripts/armelf.xbn -unknown- binutils ./usr/libdata/ldscripts/armelf.xc -unknown- binutils -./usr/libdata/ldscripts/armelf.xd -unknown- binutils=230 -./usr/libdata/ldscripts/armelf.xdc -unknown- binutils=230 -./usr/libdata/ldscripts/armelf.xdw -unknown- binutils=230 ./usr/libdata/ldscripts/armelf.xn -unknown- binutils ./usr/libdata/ldscripts/armelf.xr -unknown- binutils ./usr/libdata/ldscripts/armelf.xs -unknown- binutils @@ -266,9 +263,6 @@ ./usr/libdata/ldscripts/armelfb.x -unknown- binutils ./usr/libdata/ldscripts/armelfb.xbn -unknown- binutils ./usr/libdata/ldscripts/armelfb.xc -unknown- binutils -./usr/libdata/ldscripts/armelfb.xd -unknown- binutils=230 -./usr/libdata/ldscripts/armelfb.xdc -unknown- binutils=230 -./usr/libdata/ldscripts/armelfb.xdw -unknown- binutils=230 ./usr/libdata/ldscripts/armelfb.xn -unknown- binutils ./usr/libdata/ldscripts/armelfb.xr -unknown- binutils ./usr/libdata/ldscripts/armelfb.xs -unknown- binutils Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.263 src/distrib/sets/lists/comp/md.amd64:1.264 --- src/distrib/sets/lists/comp/md.amd64:1.263 Mon Nov 19 14:10:39 2018 +++ src/distrib/sets/lists/comp/md.amd64 Sun Dec 23 14:17:26 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.263 2018/11/19 19:10:39 christos Exp $ +# $NetBSD: md.amd64,v 1.264 2018/12/23 19:17:26 christos Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -855,11 +855,11 @@ ./usr/libdata/ldscripts/elf_x86_64.xsw comp-util-bin binutils ./usr/libdata/ldscripts/elf_x86_64.xu comp-util-bin binutils ./usr/libdata/ldscripts/elf_x86_64.xw comp-util-bin binutils -./usr/libdata/ldscripts/i386nbsd.x comp-util-bin binutils -./usr/libdata/ldscripts/i386nbsd.xbn comp-util-bin binutils -./usr/libdata/ldscripts/i386nbsd.xn comp-util-bin binutils -./usr/libdata/ldscripts/i386nbsd.xr comp-util-bin binutils -./usr/libdata/ldscripts/i386nbsd.xu comp-util-bin binutils +./usr/libdata/ldscripts/i386nbsd.x comp-util-bin binutils=227 +./usr/libdata/ldscripts/i386nbsd.xbn comp-util-bin binutils=227 +./usr/libdata/ldscripts/i386nbsd.xn comp-util-bin binutils=227 +./usr/libdata/ldscripts/i386nbsd.xr comp-util-bin binutils=227 +./usr/libdata/ldscripts/i386nbsd.xu comp-util-bin binutils=227 ./usr/libdata/lint/llib-lnvmm.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lx86_64.ln comp-c-lintlib lint ./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.322 src/distrib/sets/lists/comp/shl.mi:1.323 --- src/distrib/sets/lists/comp/shl.mi:1.322 Sat Sep 22 08:54:34 2018 +++ src/distrib/sets/lists/comp/shl.mi Sun Dec 23 14:17:26 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.322 2018/09/22 12:54:34 rmind Exp $ +# $NetBSD: shl.mi,v 1.323 2018/12/23 19:17:26 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -118,8 +118,8 @@ ./usr/lib/libobjc_pic.acomp-objc-piclib compatfile,picinstall,gcccmds ./usr/lib/libopcodes.so.8 comp-c-shlib compatfile,binutils=227 ./usr/lib/libopcodes.so.8.0 comp-c-shlib compatfile,binutils=227 -./usr/lib/libopcodes.so.9 comp-c-shlib compatfile,binutils=230 -./usr/lib/libopcodes.so.9.0 comp-c-shlib compatfile,binutils=230 +./usr/lib/libopcodes.so.9 comp-c-shlib compatfile,binutils=231 +./usr/lib/libopcodes.so.9.0 comp-c-shlib compatfile,binutils=231 ./usr/lib/libopenpgpsdk_pic.a comp-obsolete obsolete ./usr/lib/libossaudio_pic.a comp-c-piclib compatfile,picinstall ./usr/lib/libopenpgpsdk_pic.a comp-obsolete obsolete
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Sun Dec 23 19:16:43 UTC 2018 Modified Files: src/distrib/sets/lists/debug: shl.mi Log Message: new binutils is 231 To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.211 src/distrib/sets/lists/debug/shl.mi:1.212 --- src/distrib/sets/lists/debug/shl.mi:1.211 Wed Dec 19 17:20:45 2018 +++ src/distrib/sets/lists/debug/shl.mi Sun Dec 23 14:16:43 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.211 2018/12/19 22:20:45 christos Exp $ +# $NetBSD: shl.mi,v 1.212 2018/12/23 19:16:43 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot @@ -64,7 +64,7 @@ ./usr/libdata/debug/usr/lib/libatf-c.so.0.0.debug comp-atf-debug debug,compatfile,atf ./usr/libdata/debug/usr/lib/libavl.so.0.0.debug comp-zfs-debug debug,compatfile,zfs ./usr/libdata/debug/usr/lib/libbfd.so.15.0.debug comp-sys-debug debug,compatfile,binutils=227 -./usr/libdata/debug/usr/lib/libbfd.so.16.0.debug comp-sys-debug debug,compatfile,binutils=230 +./usr/libdata/debug/usr/lib/libbfd.so.16.0.debug comp-sys-debug debug,compatfile,binutils=231 ./usr/libdata/debug/usr/lib/libbind9.so.9.0.debug comp-bind-debug debug,compatfile ./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug comp-sys-debug debug,compatfile @@ -153,7 +153,7 @@ ./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug comp-zfs-debug debug,compatfile,zfs ./usr/libdata/debug/usr/lib/libobjc.so.4.0.debug comp-sys-debug debug,compatfile,gcc ./usr/libdata/debug/usr/lib/libopcodes.so.8.0.debug comp-c-debug debug,compatfile,binutils=227 -./usr/libdata/debug/usr/lib/libopcodes.so.9.0.debug comp-c-debug debug,compatfile,binutils=230 +./usr/libdata/debug/usr/lib/libopcodes.so.9.0.debug comp-c-debug debug,compatfile,binutils=231 ./usr/libdata/debug/usr/lib/libossaudio.so.1.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libp2k.so.2.0.debug comp-puffs-debug debug,compatfile,rump ./usr/libdata/debug/usr/lib/libpam.so.4.1.debug comp-sys-debug debug,compatfile,pam
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Sun Dec 23 19:14:12 UTC 2018 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: new binutils on head is 231 To generate a diff of this commit: cvs rdiff -u -r1.851 -r1.852 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.851 src/distrib/sets/lists/base/shl.mi:1.852 --- src/distrib/sets/lists/base/shl.mi:1.851 Wed Dec 19 17:20:45 2018 +++ src/distrib/sets/lists/base/shl.mi Sun Dec 23 14:14:12 2018 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.851 2018/12/19 22:20:45 christos Exp $ +# $NetBSD: shl.mi,v 1.852 2018/12/23 19:14:12 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -199,8 +199,8 @@ ./usr/lib/libavl.so.0.0 base-zfs-shlib compatfile,zfs ./usr/lib/libbfd.so.15base-sys-shlib compatfile,binutils=227 ./usr/lib/libbfd.so.15.0 base-sys-shlib compatfile,binutils=227 -./usr/lib/libbfd.so.16base-sys-shlib compatfile,binutils=230 -./usr/lib/libbfd.so.16.0 base-sys-shlib compatfile,binutils=230 +./usr/lib/libbfd.so.16base-sys-shlib compatfile,binutils=231 +./usr/lib/libbfd.so.16.0 base-sys-shlib compatfile,binutils=231 ./usr/lib/libbind9.sobase-bind-shlib compatfile ./usr/lib/libbind9.so.9base-bind-shlib compatfile ./usr/lib/libbind9.so.9.0 base-bind-shlib compatfile
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: christos
Date: Sun Dec 23 19:09:03 UTC 2018
Modified Files:
src/usr.bin/xlint/lint1: main1.c
Log Message:
yydebug is now available only if YYDEBUG is set.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/xlint/lint1/main1.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.bin/xlint/lint1/main1.c
diff -u src/usr.bin/xlint/lint1/main1.c:1.26 src/usr.bin/xlint/lint1/main1.c:1.27
--- src/usr.bin/xlint/lint1/main1.c:1.26 Sat Dec 24 12:43:45 2016
+++ src/usr.bin/xlint/lint1/main1.c Sun Dec 23 14:09:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main1.c,v 1.26 2016/12/24 17:43:45 christos Exp $ */
+/* $NetBSD: main1.c,v 1.27 2018/12/23 19:09:03 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: main1.c,v 1.26 2016/12/24 17:43:45 christos Exp $");
+__RCSID("$NetBSD: main1.c,v 1.27 2018/12/23 19:09:03 christos Exp $");
#endif
#include
@@ -241,8 +241,10 @@ main(int argc, char *argv[])
/* initialize output */
outopen(argv[1]);
+#ifdef YYDEBUG
if (yflag)
yydebug = 1;
+#endif
(void)signal(SIGFPE, sigfpe);
initmem();
CVS commit: src
Module Name:src
Committed By: jakllsch
Date: Sun Dec 23 16:40:16 UTC 2018
Modified Files:
src/distrib/sets/lists/tests: md.amd64 mi
src/tests/lib/libnvmm: Makefile
Log Message:
further build fixes
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/tests/md.amd64
cvs rdiff -u -r1.796 -r1.797 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libnvmm/Makefile
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/md.amd64
diff -u src/distrib/sets/lists/tests/md.amd64:1.4 src/distrib/sets/lists/tests/md.amd64:1.5
--- src/distrib/sets/lists/tests/md.amd64:1.4 Sun Dec 23 13:35:02 2018
+++ src/distrib/sets/lists/tests/md.amd64 Sun Dec 23 16:40:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.4 2018/12/23 13:35:02 maxv Exp $
+# $NetBSD: md.amd64,v 1.5 2018/12/23 16:40:15 jakllsch Exp $
./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete
@@ -7,6 +7,7 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
+./usr/tests/lib/libnvmmtests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/Atffile tests-lib-tests compattestfile,atf
./usr/tests/lib/libnvmm/Kyuafile tests-lib-tests compattestfile,atf,kyua
./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.796 src/distrib/sets/lists/tests/mi:1.797
--- src/distrib/sets/lists/tests/mi:1.796 Wed Dec 5 02:45:05 2018
+++ src/distrib/sets/lists/tests/mi Sun Dec 23 16:40:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.796 2018/12/05 02:45:05 kre Exp $
+# $NetBSD: mi,v 1.797 2018/12/23 16:40:15 jakllsch Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -124,6 +124,7 @@
./usr/libdata/debug/usr/tests/lib/libexecinfotests-lib-debug compattestfile,atf
./usr/libdata/debug/usr/tests/lib/liblutoktests-lutok-debug compattestfile,atf
./usr/libdata/debug/usr/tests/lib/libm tests-lib-debug compattestfile,atf
+./usr/libdata/debug/usr/tests/lib/libnvmmtests-lib-debug compattestfile,atf
./usr/libdata/debug/usr/tests/lib/libobjctests-lib-debug compattestfile,atf
./usr/libdata/debug/usr/tests/lib/libposixtests-lib-debug compattestfile,atf
./usr/libdata/debug/usr/tests/lib/libposix/bsdtests-lib-debug compattestfile,atf
Index: src/tests/lib/libnvmm/Makefile
diff -u src/tests/lib/libnvmm/Makefile:1.2 src/tests/lib/libnvmm/Makefile:1.3
--- src/tests/lib/libnvmm/Makefile:1.2 Sun Dec 23 16:23:24 2018
+++ src/tests/lib/libnvmm/Makefile Sun Dec 23 16:40:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/12/23 16:23:24 martin Exp $
+# $NetBSD: Makefile,v 1.3 2018/12/23 16:40:16 jakllsch Exp $
NOMAN= # defined
@@ -10,6 +10,8 @@ TESTSDIR= ${TESTSBASE}/lib/libnvmm
COPTS+= -Wall
LDADD+= -lnvmm
+BINDIR= ${TESTSDIR}
+
# Mem Assist
TESTS_SH= t_mem_assist
PROGS= h_mem_assist
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Dec 23 16:29:11 UTC 2018 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new flex To generate a diff of this commit: cvs rdiff -u -r1.1579 -r1.1580 src/doc/3RDPARTY cvs rdiff -u -r1.2470 -r1.2471 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1579 src/doc/3RDPARTY:1.1580 --- src/doc/3RDPARTY:1.1579 Sun Dec 23 10:40:30 2018 +++ src/doc/3RDPARTY Sun Dec 23 11:29:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1579 2018/12/23 15:40:30 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1580 2018/12/23 16:29:10 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -438,7 +438,7 @@ Notes: use file2netbsd Package: flex -Version: 2.6.3 +Version: 2.6.4 Current Vers: 2.6.4 Maintainer: Will Estes Archive Site: https://github.com/westes/flex/releases Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2470 src/doc/CHANGES:1.2471 --- src/doc/CHANGES:1.2470 Sun Dec 23 10:40:30 2018 +++ src/doc/CHANGES Sun Dec 23 11:29:10 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2470 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2471 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -269,3 +269,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: sqlite3: Import 3.26.0. [christos 20181219] network: Add SIOCSETHERCAP ioctl. [msaitoh 20181221] byacc: Update to 20180609. [christos 20181223] + flex(1): Import flex-2.6.4 [christos 20181223]
CVS commit: src/external/bsd/flex
Module Name:src
Committed By: christos
Date: Sun Dec 23 16:27:17 UTC 2018
Modified Files:
src/external/bsd/flex/bin: Makefile
src/external/bsd/flex/dist/src: dfa.c filter.c flex.skl flexdef.h
flexint.h misc.c regex.c scan.l
src/external/bsd/flex/include: config.h
Removed Files:
src/external/bsd/flex/dist/lib: Makefile.am Makefile.in reallocarray.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/flex/bin/Makefile
cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/flex/dist/lib/Makefile.am \
src/external/bsd/flex/dist/lib/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/flex/dist/lib/reallocarray.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/flex/dist/src/dfa.c \
src/external/bsd/flex/dist/src/filter.c \
src/external/bsd/flex/dist/src/misc.c \
src/external/bsd/flex/dist/src/regex.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/flex/dist/src/flex.skl
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/flex/dist/src/flexdef.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/src/flexint.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/flex/dist/src/scan.l
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/flex/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/flex/bin/Makefile
diff -u src/external/bsd/flex/bin/Makefile:1.11 src/external/bsd/flex/bin/Makefile:1.12
--- src/external/bsd/flex/bin/Makefile:1.11 Mon Jan 2 13:33:22 2017
+++ src/external/bsd/flex/bin/Makefile Sun Dec 23 11:27:17 2018
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.4 (Berkeley) 6/24/90
-# $NetBSD: Makefile,v 1.11 2017/01/02 18:33:22 christos Exp $
+# $NetBSD: Makefile,v 1.12 2018/12/23 16:27:17 christos Exp $
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
@@ -61,7 +61,7 @@ skel.c: flex.skl mkskel.sh flexint.h tab
-DFLEX_MINOR_VERSION=`echo ${VERSION} | cut -f 2 -d .` \
-DFLEX_SUBMINOR_VERSION=`echo ${VERSION} | cut -f 3 -d .` | \
${TOOL_SED} -e 's/m4postproc_/m4_/g' | \
- ${HOST_SH} ${IDIST}/mkskel.sh > ${.TARGET}
+ ${HOST_SH} ${IDIST}/mkskel.sh ${IDIST} ${TOOL_M4} ${VERSION} > ${.TARGET}
.ifndef HOSTPROG
scan.c: scan.l
Index: src/external/bsd/flex/dist/src/dfa.c
diff -u src/external/bsd/flex/dist/src/dfa.c:1.3 src/external/bsd/flex/dist/src/dfa.c:1.4
--- src/external/bsd/flex/dist/src/dfa.c:1.3 Mon Jan 2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/dfa.c Sun Dec 23 11:27:17 2018
@@ -29,7 +29,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: dfa.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: dfa.c,v 1.4 2018/12/23 16:27:17 christos Exp $");
#include "tables.h"
@@ -464,14 +464,9 @@ void ntod (void)
/* We still may want to use the table if numecs
* is a power of 2.
*/
- int power_of_two;
-
- for (power_of_two = 1; power_of_two <= csize;
- power_of_two *= 2)
-if (numecs == power_of_two) {
- use_NUL_table = true;
- break;
-}
+ if (numecs <= csize && is_power_of_2(numecs)) {
+use_NUL_table = true;
+ }
}
if (use_NUL_table)
Index: src/external/bsd/flex/dist/src/filter.c
diff -u src/external/bsd/flex/dist/src/filter.c:1.3 src/external/bsd/flex/dist/src/filter.c:1.4
--- src/external/bsd/flex/dist/src/filter.c:1.3 Mon Jan 2 12:45:27 2017
+++ src/external/bsd/flex/dist/src/filter.c Sun Dec 23 11:27:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.3 2017/01/02 17:45:27 christos Exp $ */
+/* $NetBSD: filter.c,v 1.4 2018/12/23 16:27:17 christos Exp $ */
/* filter - postprocessing of flex output through filters */
@@ -23,7 +23,7 @@
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
#include "flexdef.h"
-__RCSID("$NetBSD: filter.c,v 1.3 2017/01/02 17:45:27 christos Exp $");
+__RCSID("$NetBSD: filter.c,v 1.4 2018/12/23 16:27:17 christos Exp $");
static const char * check_4_gnu_m4 =
"m4_dnl ifdef(`__gnu__', ,"
@@ -179,7 +179,7 @@ clearerr(stdin);
if ((r = chain->filter_func (chain)) == -1)
flexfatal (_("filter_func failed"));
- exit (0);
+ FLEX_EXIT (0);
}
else {
execvp (chain->argv[0],
@@ -188,7 +188,7 @@ clearerr(stdin);
chain->argv[0]);
}
- exit (1);
+ FLEX_EXIT (1);
}
/* Parent */
@@ -299,7 +299,8 @@ int filter_tee_header (struct filter *ch
fprintf (to_h, "\n");
/* write a fake line number. It will get fixed by the linedir filter. */
- fprintf (to_h, "#line 4000 \"M4_YY_OUTFILE_NAME\"\n");
+ if (gen_line_dirs)
+ fprintf (to_h, "#line 4000 \"M4_YY_OUTFILE_NAME\"\n");
fprintf (to_h, "#undef %sIN_HEADER\n", prefix);
fprintf (to_h, "#endif /* %sHEADER_H */\n", prefix);
@@ -326,7 +327,7 @@ int
CVS commit: src/tests/lib/libnvmm
Module Name:src
Committed By: martin
Date: Sun Dec 23 16:23:24 UTC 2018
Modified Files:
src/tests/lib/libnvmm: Makefile
Log Message:
Fix the build
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libnvmm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libnvmm/Makefile
diff -u src/tests/lib/libnvmm/Makefile:1.1 src/tests/lib/libnvmm/Makefile:1.2
--- src/tests/lib/libnvmm/Makefile:1.1 Sun Dec 23 13:35:02 2018
+++ src/tests/lib/libnvmm/Makefile Sun Dec 23 16:23:24 2018
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2018/12/23 13:35:02 maxv Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/23 16:23:24 martin Exp $
NOMAN= # defined
.include
+.if ${MACHINE} == "amd64"
TESTSDIR= ${TESTSBASE}/lib/libnvmm
COPTS+= -Wall
LDADD+= -lnvmm
-.if ${MACHINE} == "amd64"
# Mem Assist
TESTS_SH= t_mem_assist
PROGS= h_mem_assist
CVS commit: src/etc/mtree
Module Name:src Committed By: jakllsch Date: Sun Dec 23 15:43:42 UTC 2018 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Add /usr/tests/lib/libnvmm and related debug paths to the directory list. To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/etc/mtree/NetBSD.dist.tests 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.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.153 src/etc/mtree/NetBSD.dist.tests:1.154 --- src/etc/mtree/NetBSD.dist.tests:1.153 Wed Sep 5 21:05:40 2018 +++ src/etc/mtree/NetBSD.dist.tests Sun Dec 23 15:43:42 2018 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.153 2018/09/05 21:05:40 kre Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.154 2018/12/23 15:43:42 jakllsch Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -107,6 +107,7 @@ ./usr/libdata/debug/usr/tests/lib/semaphore/pthread ./usr/libdata/debug/usr/tests/lib/liblutok ./usr/libdata/debug/usr/tests/lib/libm +./usr/libdata/debug/usr/tests/lib/libnvmm ./usr/libdata/debug/usr/tests/lib/libobjc ./usr/libdata/debug/usr/tests/lib/libposix ./usr/libdata/debug/usr/tests/lib/libposix/bsd @@ -296,6 +297,7 @@ ./usr/tests/lib/libexecinfo ./usr/tests/lib/liblutok ./usr/tests/lib/libm +./usr/tests/lib/libnvmm ./usr/tests/lib/libobjc ./usr/tests/lib/libposix ./usr/tests/lib/libposix/bsd
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sun Dec 23 15:40:30 UTC 2018 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new byacc To generate a diff of this commit: cvs rdiff -u -r1.1578 -r1.1579 src/doc/3RDPARTY cvs rdiff -u -r1.2469 -r1.2470 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1578 src/doc/3RDPARTY:1.1579 --- src/doc/3RDPARTY:1.1578 Sat Dec 22 20:24:54 2018 +++ src/doc/3RDPARTY Sun Dec 23 10:40:30 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1578 2018/12/23 01:24:54 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1579 2018/12/23 15:40:30 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -225,7 +225,7 @@ is a FreeBSD committer who has been help in the past. Package: byacc -Version: 20170430 +Version: 20180609 Current Vers: 20180609 Maintainer: Thomas Dickey Archive Site: http://www.invisible-island.net/byacc/byacc.html Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2469 src/doc/CHANGES:1.2470 --- src/doc/CHANGES:1.2469 Fri Dec 21 04:04:44 2018 +++ src/doc/CHANGES Sun Dec 23 10:40:30 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2469 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2470 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -268,3 +268,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: kernel: Remove COMPAT_SVR4 and COMPAT_SVR4_32. [maxv 20181219] sqlite3: Import 3.26.0. [christos 20181219] network: Add SIOCSETHERCAP ioctl. [msaitoh 20181221] + byacc: Update to 20180609. [christos 20181223]
CVS import: src/external/bsd/flex/dist
Module Name:src
Committed By: christos
Date: Sun Dec 23 15:57:57 UTC 2018
Update of /cvsroot/src/external/bsd/flex/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv105
Log Message:
2017-05-06 Will Estes
* po/ca.po, po/da.po, po/de.po, po/eo.po, po/es.po, po/fi.po,
po/fr.po, po/ga.po, po/hr.po, po/ko.po, po/nl.po, po/pl.po,
po/pt_BR.po, po/ro.po, po/ru.po, po/sr.po, po/sv.po, po/tr.po,
po/vi.po, po/zh_CN.po, po/zh_TW.po: gettext: pulled latest
translations; recompiled against current sources
2017-05-06 Will Estes
* NEWS: version 2.6.4 * NEWS: Record release date.
2017-05-06 Will Estes
* .prev-version: note previous version
2017-05-06 Will Estes
* NEWS: doc: update NEWS for upcoming release
2017-05-04 viktor.shepel
* doc/flex.texi: doc: Correct typo in C code sample in manual
2017-05-04 Explorer09
* src/flex.skl: scanner: Mention %# comments are removed when
building skel.c
2017-05-02 Demi Obenour
* src/flex.skl: Honor user definitions of yy_* macros The user may have
defined the yy_* macros themselves. In that case,
don't clobber them.
2017-05-02 Demi Obenour
* src/flex.skl, src/main.c: Don't leak macro definitions into header
files This allowed unnamespaced definitions to leak into header files,
breaking client code. Fixes #142
2017-05-03 Demi Obenour
* src/scan.l: scanner: Check for 0 bracecount when EOL ends quoted
literal. This can happen in the case of // comments (which Flex doesn't
handle specially).
2017-05-03 Demi Obenour
* src/scan.l: scanner: when bracelevel is negative, treat as zero.
This really should never happen, but this at least fixes the
breakage on Verilator.
2017-04-02 Jeff Smith
* tests/Makefile.am, tests/tableopts.am, tests/tableopts.sh: test:
enable more silent building of tests. When running 'make V=0 check',
some compile and link steps are made
less verbose and some are not. This cleans up most steps that are
not. These have no effect if V=0 is not specified.
2017-05-03 Demi Obenour
* src/Makefile.am, src/misc.c, src/mkskel.sh: build: Delete comments
from skeleton file. Since the comments in flex.skl are, by hypothesis,
not needed in
skel.c, we remove them. THis reduces the size of the resulting
executable somewhat.
2017-05-03 Explorer09
* Makefile.am, configure.ac, lib/Makefile.am: build: do not generate
lib/Makefile.in. Files in lib/ are picked up and built using makefile
directives in
src/Makefile.am. Remove the need to generate lib/Makefile.in and the
stub lib/Makefile.am.
2017-05-02 Will Estes
* po/POTFILES.in: gettext: revert listing generated .c files
2017-04-10 Jeff Smith
* src/filter.c: FLEX_EXIT() is the preferred way to exit flex
2017-04-11 Explorer09
* src/misc.c: Fix myesc() 'sptr' conditionals * Don't call isascii()
here. It's deprecated in POSIX and not needed for myesc's case. * The check
of the character class and range here should match
what's defined as {ESCSEQ} in scan.l, so for [[:xdigit:]] we use
isxdigit(); for [0-7] we check '0' <= c <= '7' (not isdigit(c)
because isdigit is locale-dependant in standard's sense) * Add
missing length limit for "\x" ( is at most 2 digits)
2017-04-11 Explorer09
* src/flexdef.h, src/misc.c: Obsolete htoui() and otoui(); use
strtoul(). No sense to keep these two function when libc's strtoul()
can do the
same job, but better.
2017-04-12 Todd C. Miller
* src/flex.skl: scanner: update yy_buf_size after yyrealloc()
2017-05-02 Simon Sobisch
* configure.ac: build: use lowest versions for gettext, automake.
2017-05-02 Simon Sobisch
* po/Makevars, po/Rules-getpo, po/update_linguas.sh: gettext: more
recent makevars; new script to update po files. Previously, "make
dist" and similar commands would cause the po
files to be updated, which is incorrect. The more recent version now
used should not do this. Replaced Rules-getpo by extra script to
manually update and rebuild
all po files.
2017-05-02 Simon Sobisch
* po/POTFILES.in: gettext: list generated files instead of flex,
bison sources in POTFILES.in. Listing the flex and bison sources -- as
the gettext manual suggests
-- causes warnings. Listing the generated C files for the lexer and
parser removes the warnings. Since both files contain line
directives, any translator who needs to refer back to those files
should be able to find the context in which strings are needed.
2017-05-02 Simon Sobisch
* autogen.sh: build: only touch ChangeLog if it does not exist
2017-05-02 Simon Sobisch
* configure.ac,
CVS import: external/bsd/flex/dist
Module Name:external
Committed By: christos
Date: Sun Dec 23 15:55:58 UTC 2018
Update of /cvsroot/external/bsd/flex/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8811
Log Message:
2017-05-06 Will Estes
* po/ca.po, po/da.po, po/de.po, po/eo.po, po/es.po, po/fi.po,
po/fr.po, po/ga.po, po/hr.po, po/ko.po, po/nl.po, po/pl.po,
po/pt_BR.po, po/ro.po, po/ru.po, po/sr.po, po/sv.po, po/tr.po,
po/vi.po, po/zh_CN.po, po/zh_TW.po: gettext: pulled latest
translations; recompiled against current sources
2017-05-06 Will Estes
* NEWS: version 2.6.4 * NEWS: Record release date.
2017-05-06 Will Estes
* .prev-version: note previous version
2017-05-06 Will Estes
* NEWS: doc: update NEWS for upcoming release
2017-05-04 viktor.shepel
* doc/flex.texi: doc: Correct typo in C code sample in manual
2017-05-04 Explorer09
* src/flex.skl: scanner: Mention %# comments are removed when
building skel.c
2017-05-02 Demi Obenour
* src/flex.skl: Honor user definitions of yy_* macros The user may have
defined the yy_* macros themselves. In that case,
don't clobber them.
2017-05-02 Demi Obenour
* src/flex.skl, src/main.c: Don't leak macro definitions into header
files This allowed unnamespaced definitions to leak into header files,
breaking client code. Fixes #142
2017-05-03 Demi Obenour
* src/scan.l: scanner: Check for 0 bracecount when EOL ends quoted
literal. This can happen in the case of // comments (which Flex doesn't
handle specially).
2017-05-03 Demi Obenour
* src/scan.l: scanner: when bracelevel is negative, treat as zero.
This really should never happen, but this at least fixes the
breakage on Verilator.
2017-04-02 Jeff Smith
* tests/Makefile.am, tests/tableopts.am, tests/tableopts.sh: test:
enable more silent building of tests. When running 'make V=0 check',
some compile and link steps are made
less verbose and some are not. This cleans up most steps that are
not. These have no effect if V=0 is not specified.
2017-05-03 Demi Obenour
* src/Makefile.am, src/misc.c, src/mkskel.sh: build: Delete comments
from skeleton file. Since the comments in flex.skl are, by hypothesis,
not needed in
skel.c, we remove them. THis reduces the size of the resulting
executable somewhat.
2017-05-03 Explorer09
* Makefile.am, configure.ac, lib/Makefile.am: build: do not generate
lib/Makefile.in. Files in lib/ are picked up and built using makefile
directives in
src/Makefile.am. Remove the need to generate lib/Makefile.in and the
stub lib/Makefile.am.
2017-05-02 Will Estes
* po/POTFILES.in: gettext: revert listing generated .c files
2017-04-10 Jeff Smith
* src/filter.c: FLEX_EXIT() is the preferred way to exit flex
2017-04-11 Explorer09
* src/misc.c: Fix myesc() 'sptr' conditionals * Don't call isascii()
here. It's deprecated in POSIX and not needed for myesc's case. * The check
of the character class and range here should match
what's defined as {ESCSEQ} in scan.l, so for [[:xdigit:]] we use
isxdigit(); for [0-7] we check '0' <= c <= '7' (not isdigit(c)
because isdigit is locale-dependant in standard's sense) * Add
missing length limit for "\x" ( is at most 2 digits)
2017-04-11 Explorer09
* src/flexdef.h, src/misc.c: Obsolete htoui() and otoui(); use
strtoul(). No sense to keep these two function when libc's strtoul()
can do the
same job, but better.
2017-04-12 Todd C. Miller
* src/flex.skl: scanner: update yy_buf_size after yyrealloc()
2017-05-02 Simon Sobisch
* configure.ac: build: use lowest versions for gettext, automake.
2017-05-02 Simon Sobisch
* po/Makevars, po/Rules-getpo, po/update_linguas.sh: gettext: more
recent makevars; new script to update po files. Previously, "make
dist" and similar commands would cause the po
files to be updated, which is incorrect. The more recent version now
used should not do this. Replaced Rules-getpo by extra script to
manually update and rebuild
all po files.
2017-05-02 Simon Sobisch
* po/POTFILES.in: gettext: list generated files instead of flex,
bison sources in POTFILES.in. Listing the flex and bison sources -- as
the gettext manual suggests
-- causes warnings. Listing the generated C files for the lexer and
parser removes the warnings. Since both files contain line
directives, any translator who needs to refer back to those files
should be able to find the context in which strings are needed.
2017-05-02 Simon Sobisch
* autogen.sh: build: only touch ChangeLog if it does not exist
2017-05-02 Simon Sobisch
* configure.ac,
CVS import: src/external/bsd/byacc/dist
Module Name:src Committed By: christos Date: Sun Dec 23 15:26:16 UTC 2018 Update of /cvsroot/src/external/bsd/byacc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15983 Log Message: 2018-06-09 Thomas E. Dickey * yacc.1: minor typographical fixes * test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.t ab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/rename_debug.c, btyaccpar.c: regen * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2018-06-09 Tom.Shields * btyaccpar.skel: add casts to fix g++ (clang++) compile errors in the backtracking skeleton due to assignment of ‘void *’ to another pointer type. 2018-05-25 Thomas E. Dickey * test/run_make.sh: check if this is bison 3+ before adding options to suppress warnings * package/byacc.spec: build-fix for Mageia 6 * package/byacc.spec: add btyacc package * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * package/debian/control: add a package for btyacc * package/debian/rules: generate a package for btyacc 2018-05-24 Thomas E. Dickey * test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/error.tab.c, test/btyacc/expr.oxout.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/ok_syntax1.tab.c, btyaccpar.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyac c_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/rename_debug.c: regen * btyaccpar.skel: fix typo 2018-05-21 Thomas E. Dickey * test/run_make.sh: ignore case for "%" directives to skip with old-yacc, and add %token-table to the list * btyaccpar.c: regen 2018-05-21 Christos.Zoulas * btyaccpar.skel: improve compatibility with bison by changing the YYLLOC_DEFAULT macro to use YYRHSLOC() macro, and adjusting the array indices of yyerror_loc_range[] for consistency. 2018-05-10 Thomas E. Dickey * output.c: add a fallback definition for YYDEBUG to the -i externs file. * test/btyacc/rename_debug.i, test/yacc/rename_debug.i: regen * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump 2018-05-09 Thomas E. Dickey * configure: regen * aclocal.m4: resync with my-autoconf * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: bump * test/btyacc/rename_debug.i, btyaccpar.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c,
CVS commit: src
Module Name:src
Committed By: maxv
Date: Sun Dec 23 13:35:02 UTC 2018
Modified Files:
src/distrib/sets/lists/tests: md.amd64
src/tests/lib: Makefile
Added Files:
src/tests/lib/libnvmm: Makefile h_mem_assist.c h_mem_assist_asm.S
t_mem_assist.sh
Log Message:
Add initial tests for libnvmm's Mem Assist, with 8 test cases.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/tests/md.amd64
cvs rdiff -u -r1.30 -r1.31 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libnvmm/Makefile \
src/tests/lib/libnvmm/h_mem_assist.c \
src/tests/lib/libnvmm/h_mem_assist_asm.S \
src/tests/lib/libnvmm/t_mem_assist.sh
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/md.amd64
diff -u src/distrib/sets/lists/tests/md.amd64:1.3 src/distrib/sets/lists/tests/md.amd64:1.4
--- src/distrib/sets/lists/tests/md.amd64:1.3 Sun Apr 2 01:49:52 2017
+++ src/distrib/sets/lists/tests/md.amd64 Sun Dec 23 13:35:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.3 2017/04/02 01:49:52 kamil Exp $
+# $NetBSD: md.amd64,v 1.4 2018/12/23 13:35:02 maxv Exp $
./usr/tests/kernel/arch/x86/Atffile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/Kyuafile tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_wait tests-obsolete obsolete
@@ -7,3 +7,7 @@
./usr/tests/kernel/arch/x86/t_ptrace_wait6 tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitid tests-obsolete obsolete
./usr/tests/kernel/arch/x86/t_ptrace_waitpid tests-obsolete obsolete
+./usr/tests/lib/libnvmm/Atffile tests-lib-tests compattestfile,atf
+./usr/tests/lib/libnvmm/Kyuafile tests-lib-tests compattestfile,atf,kyua
+./usr/tests/lib/libnvmm/h_mem_assist tests-lib-tests compattestfile,atf
+./usr/tests/lib/libnvmm/t_mem_assist tests-lib-tests compattestfile,atf
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.30 src/tests/lib/Makefile:1.31
--- src/tests/lib/Makefile:1.30 Thu Nov 23 02:40:01 2017
+++ src/tests/lib/Makefile Sun Dec 23 13:35:02 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2017/11/23 02:40:01 kre Exp $
+# $NetBSD: Makefile,v 1.31 2018/12/23 13:35:02 maxv Exp $
.include
TESTS_SUBDIRS= csu libbluetooth libc libcrypt libcurses libexecinfo \
- libm libobjc libposix libppath libprop libpthread \
+ libm libnvmm libobjc libposix libppath libprop libpthread \
librefuse librt libtre libusbhid libutil \
semaphore
Added files:
Index: src/tests/lib/libnvmm/Makefile
diff -u /dev/null src/tests/lib/libnvmm/Makefile:1.1
--- /dev/null Sun Dec 23 13:35:02 2018
+++ src/tests/lib/libnvmm/Makefile Sun Dec 23 13:35:02 2018
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2018/12/23 13:35:02 maxv Exp $
+
+NOMAN= # defined
+
+.include
+
+TESTSDIR= ${TESTSBASE}/lib/libnvmm
+
+COPTS+= -Wall
+LDADD+= -lnvmm
+
+.if ${MACHINE} == "amd64"
+# Mem Assist
+TESTS_SH= t_mem_assist
+PROGS= h_mem_assist
+SRCS.h_mem_assist= h_mem_assist.c h_mem_assist_asm.S
+.endif
+
+.include
Index: src/tests/lib/libnvmm/h_mem_assist.c
diff -u /dev/null src/tests/lib/libnvmm/h_mem_assist.c:1.1
--- /dev/null Sun Dec 23 13:35:02 2018
+++ src/tests/lib/libnvmm/h_mem_assist.c Sun Dec 23 13:35:02 2018
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Maxime Villard.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jmcneill Date: Sun Dec 23 12:32:33 UTC 2018 Modified Files: src/sys/dev/pci: if_enavar.h Log Message: Use ___STRING instead of __STRING to expand driver version numbers properly To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_enavar.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/pci/if_enavar.h diff -u src/sys/dev/pci/if_enavar.h:1.6 src/sys/dev/pci/if_enavar.h:1.7 --- src/sys/dev/pci/if_enavar.h:1.6 Fri Nov 30 14:07:30 2018 +++ src/sys/dev/pci/if_enavar.h Sun Dec 23 12:32:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_enavar.h,v 1.6 2018/11/30 14:07:30 jmcneill Exp $ */ +/* $NetBSD: if_enavar.h,v 1.7 2018/12/23 12:32:33 jmcneill Exp $ */ /*- * BSD LICENSE @@ -49,9 +49,9 @@ #ifndef DRV_MODULE_VERSION #define DRV_MODULE_VERSION\ - __STRING(DRV_MODULE_VER_MAJOR) "." \ - __STRING(DRV_MODULE_VER_MINOR) "." \ - __STRING(DRV_MODULE_VER_SUBMINOR) + ___STRING(DRV_MODULE_VER_MAJOR) "." \ + ___STRING(DRV_MODULE_VER_MINOR) "." \ + ___STRING(DRV_MODULE_VER_SUBMINOR) #endif #define DEVICE_NAME "Elastic Network Adapter (ENA)" #define DEVICE_DESC "ENA adapter"
CVS commit: src/etc/etc.amd64
Module Name:src Committed By: maxv Date: Sun Dec 23 12:18:30 UTC 2018 Modified Files: src/etc/etc.amd64: MAKEDEV.conf Log Message: Add /dev/nvmm. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/etc/etc.amd64/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.amd64/MAKEDEV.conf diff -u src/etc/etc.amd64/MAKEDEV.conf:1.25 src/etc/etc.amd64/MAKEDEV.conf:1.26 --- src/etc/etc.amd64/MAKEDEV.conf:1.25 Tue Nov 27 14:55:56 2018 +++ src/etc/etc.amd64/MAKEDEV.conf Sun Dec 23 12:18:30 2018 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.25 2018/11/27 14:55:56 msaitoh Exp $ +# $NetBSD: MAKEDEV.conf,v 1.26 2018/12/23 12:18:30 maxv Exp $ # As of 2003-04-17, the "init" case must not create more than 890 entries. all_md) @@ -35,6 +35,7 @@ all_md) makedev sysmon makedev bktr makedev tprof + makedev nvmm makedev ttyCZ0 ttyCY0 makedev agp0 makedev pci0 pci1 pci2 pci3 pci4 pci5 pci6 pci7
CVS commit: src/sys
Module Name:src
Committed By: maxv
Date: Sun Dec 23 12:15:01 UTC 2018
Modified Files:
src/sys/kern: kern_malloc.c subr_asan.c subr_kmem.c subr_pool.c
src/sys/sys: asan.h
src/sys/uvm: uvm_glue.c
Log Message:
Simplify the KASAN API, use only kasan_mark() and explain briefly. The
alloc/free naming was too confusing.
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/kern/subr_asan.c
cvs rdiff -u -r1.71 -r1.72 src/sys/kern/subr_kmem.c
cvs rdiff -u -r1.230 -r1.231 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/asan.h
cvs rdiff -u -r1.165 -r1.166 src/sys/uvm/uvm_glue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.154 src/sys/kern/kern_malloc.c:1.155
--- src/sys/kern/kern_malloc.c:1.154 Sat Oct 20 14:09:47 2018
+++ src/sys/kern/kern_malloc.c Sun Dec 23 12:15:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.154 2018/10/20 14:09:47 martin Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.155 2018/12/23 12:15:01 maxv Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.154 2018/10/20 14:09:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.155 2018/12/23 12:15:01 maxv Exp $");
#include
#include
@@ -139,7 +139,7 @@ kern_malloc(unsigned long reqsize, int f
#endif
mh++;
- kasan_alloc(mh, origsize, size);
+ kasan_mark(mh, origsize, size);
return mh;
}
@@ -152,7 +152,7 @@ kern_free(void *addr)
mh = addr;
mh--;
- kasan_free(addr, mh->mh_size);
+ kasan_mark(addr, mh->mh_size, mh->mh_size);
if (mh->mh_size >= PAGE_SIZE + sizeof(struct malloc_header))
kmem_intr_free((char *)addr - PAGE_SIZE,
Index: src/sys/kern/subr_asan.c
diff -u src/sys/kern/subr_asan.c:1.1 src/sys/kern/subr_asan.c:1.2
--- src/sys/kern/subr_asan.c:1.1 Wed Oct 31 06:26:26 2018
+++ src/sys/kern/subr_asan.c Sun Dec 23 12:15:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_asan.c,v 1.1 2018/10/31 06:26:26 maxv Exp $ */
+/* $NetBSD: subr_asan.c,v 1.2 2018/12/23 12:15:01 maxv Exp $ */
/*
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.1 2018/10/31 06:26:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.2 2018/12/23 12:15:01 maxv Exp $");
#include
#include
@@ -232,19 +232,22 @@ kasan_softint(struct lwp *l)
kasan_shadow_Nbyte_fill(stk, USPACE, 0);
}
+/*
+ * In an area of size 'sz_with_redz', mark the 'size' first bytes as valid,
+ * and the rest as invalid. There are generally two use cases:
+ *
+ * o kasan_mark(addr, origsize, size), with origsize < size. This marks the
+ *redzone at the end of the buffer as invalid.
+ *
+ * o kasan_mark(addr, size, size). This marks the entire buffer as valid.
+ */
void
-kasan_alloc(const void *addr, size_t size, size_t sz_with_redz)
+kasan_mark(const void *addr, size_t size, size_t sz_with_redz)
{
kasan_markmem(addr, sz_with_redz, false);
kasan_markmem(addr, size, true);
}
-void
-kasan_free(const void *addr, size_t sz_with_redz)
-{
- kasan_markmem(addr, sz_with_redz, true);
-}
-
/* -- */
#define ADDR_CROSSES_SCALE_BOUNDARY(addr, size) \
@@ -446,7 +449,7 @@ __asan_register_globals(struct __asan_gl
size_t i;
for (i = 0; i < n; i++) {
- kasan_alloc(globals[i].beg, globals[i].size,
+ kasan_mark(globals[i].beg, globals[i].size,
globals[i].size_with_redzone);
}
}
Index: src/sys/kern/subr_kmem.c
diff -u src/sys/kern/subr_kmem.c:1.71 src/sys/kern/subr_kmem.c:1.72
--- src/sys/kern/subr_kmem.c:1.71 Wed Aug 22 14:12:30 2018
+++ src/sys/kern/subr_kmem.c Sun Dec 23 12:15:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kmem.c,v 1.71 2018/08/22 14:12:30 christos Exp $ */
+/* $NetBSD: subr_kmem.c,v 1.72 2018/12/23 12:15:01 maxv Exp $ */
/*-
* Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.71 2018/08/22 14:12:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.72 2018/12/23 12:15:01 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_kmem.h"
@@ -271,7 +271,7 @@ kmem_intr_alloc(size_t requested_size, k
FREECHECK_OUT(_freecheck, p);
kmem_size_set(p, requested_size);
p += SIZE_SIZE;
- kasan_alloc(p, origsize, size);
+ kasan_mark(p, origsize, size);
return p;
}
return p;
@@ -331,7 +331,7 @@ kmem_intr_free(void *p, size_t requested
return;
}
- kasan_free(p, size);
+ kasan_mark(p, size, size);
p = (uint8_t *)p - SIZE_SIZE;
kmem_size_check(p, requested_size);
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.230 src/sys/kern/subr_pool.c:1.231
--- src/sys/kern/subr_pool.c:1.230 Sun Dec 23
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: jdolecek
Date: Sun Dec 23 12:11:41 UTC 2018
Modified Files:
src/sys/arch/x86/x86: intr.c
Log Message:
whitespace, NFC
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/x86/x86/intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.137 src/sys/arch/x86/x86/intr.c:1.138
--- src/sys/arch/x86/x86/intr.c:1.137 Tue Dec 4 19:27:22 2018
+++ src/sys/arch/x86/x86/intr.c Sun Dec 23 12:11:40 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.137 2018/12/04 19:27:22 cherry Exp $ */
+/* $NetBSD: intr.c,v 1.138 2018/12/23 12:11:40 jdolecek Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.137 2018/12/04 19:27:22 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.138 2018/12/23 12:11:40 jdolecek Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -2127,7 +2127,7 @@ intr_set_affinity(struct intrsource *isp
pin = isp->is_pin;
(*pic->pic_hwmask)(pic, pin); /* for ci_ipending check */
- while(oldci->ci_ipending & (1 << oldslot))
+ while (oldci->ci_ipending & (1 << oldslot))
(void)kpause("intrdist", false, 1, _lock);
kpreempt_disable();
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Sun Dec 23 12:09:45 UTC 2018
Modified Files:
src/sys/arch/xen/xen: xennetback_xenbus.c
Log Message:
Cleanup the TX path:
- split in sub-functions
- ratelimit printf for mbuf allocation failure
- don't loop forever on mbuf allocation failure
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/xen/xen/xennetback_xenbus.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/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.71 src/sys/arch/xen/xen/xennetback_xenbus.c:1.72
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.71 Fri Oct 26 05:33:21 2018
+++ src/sys/arch/xen/xen/xennetback_xenbus.c Sun Dec 23 12:09:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: xennetback_xenbus.c,v 1.71 2018/10/26 05:33:21 cherry Exp $ */
+/* $NetBSD: xennetback_xenbus.c,v 1.72 2018/12/23 12:09:45 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.71 2018/10/26 05:33:21 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.72 2018/12/23 12:09:45 bouyer Exp $");
#include "opt_xen.h"
@@ -1215,6 +1215,64 @@ xennetback_ifsoftstart_transfer(void *ar
splx(s);
}
+/*
+ * sighly different from m_dup(); for some reason m_dup() can return
+ * a chain where the data area can cross a page boundary.
+ * This doesn't happens with the function below.
+ */
+static struct mbuf *
+xennetback_copymbuf(struct mbuf *m)
+{
+ struct mbuf *new_m;
+
+ MGETHDR(new_m, M_DONTWAIT, MT_DATA);
+ if (__predict_false(new_m == NULL)) {
+ return NULL;
+ }
+ if (m->m_pkthdr.len > MHLEN) {
+ MCLGET(new_m, M_DONTWAIT);
+ if (__predict_false(
+ (new_m->m_flags & M_EXT) == 0)) {
+ m_freem(new_m);
+ return NULL;
+ }
+ }
+ m_copydata(m, 0, m->m_pkthdr.len,
+ mtod(new_m, void *));
+ new_m->m_len = new_m->m_pkthdr.len =
+ m->m_pkthdr.len;
+ return new_m;
+}
+
+/* return physical page address and offset of data area of an mbuf */
+static void
+xennetback_mbuf_addr(struct mbuf *m, paddr_t *xmit_pa, int *offset)
+{
+ switch (m->m_flags & (M_EXT|M_EXT_CLUSTER)) {
+ case M_EXT|M_EXT_CLUSTER:
+ KASSERT(m->m_ext.ext_paddr != M_PADDR_INVALID);
+ *xmit_pa = m->m_ext.ext_paddr;
+ *offset = m->m_data - m->m_ext.ext_buf;
+ break;
+ case 0:
+ KASSERT(m->m_paddr != M_PADDR_INVALID);
+ *xmit_pa = m->m_paddr;
+ *offset = M_BUFOFFSET(m) +
+ (m->m_data - M_BUFADDR(m));
+ break;
+ default:
+ if (__predict_false(
+ !pmap_extract(pmap_kernel(),
+ (vaddr_t)m->m_data, xmit_pa))) {
+ panic("xennet_start: no pa");
+ }
+ *offset = 0;
+ break;
+ }
+ *offset += (*xmit_pa & ~PG_FRAME);
+ *xmit_pa = (*xmit_pa & PG_FRAME);
+}
+
static void
xennetback_ifsoftstart_copy(void *arg)
{
@@ -1230,6 +1288,7 @@ xennetback_ifsoftstart_copy(void *arg)
int do_event = 0;
gnttab_copy_t *gop;
int id, offset;
+ bool abort;
XENPRINTF(("xennetback_ifsoftstart_copy "));
int s = splnet();
@@ -1246,6 +1305,7 @@ xennetback_ifsoftstart_copy(void *arg)
xen_rmb();
gop = xstart_gop_copy;
+ abort = false;
for (i = 0; !IFQ_IS_EMPTY(>if_snd);) {
XENPRINTF(("have a packet\n"));
IFQ_POLL(>if_snd, m);
@@ -1261,69 +1321,30 @@ xennetback_ifsoftstart_copy(void *arg)
"0x%x\n",
req_prod, xneti->xni_rxring.req_cons,
resp_prod));
-ifp->if_timer = 1;
+abort = true;
break;
}
if (__predict_false(i == NB_XMIT_PAGES_BATCH))
break; /* we filled the array */
- switch (m->m_flags & (M_EXT|M_EXT_CLUSTER)) {
- case M_EXT|M_EXT_CLUSTER:
-KASSERT(m->m_ext.ext_paddr != M_PADDR_INVALID);
-xmit_pa = m->m_ext.ext_paddr;
-offset = m->m_data - m->m_ext.ext_buf;
-break;
- case 0:
-KASSERT(m->m_paddr != M_PADDR_INVALID);
-xmit_pa = m->m_paddr;
-offset = M_BUFOFFSET(m) +
-(m->m_data - M_BUFADDR(m));
-break;
- default:
-if (__predict_false(
-!pmap_extract(pmap_kernel(),
-(vaddr_t)m->m_data, _pa))) {
- panic("xennet_start: no pa");
-}
-offset = 0;
-break;
- }
- offset += (xmit_pa & ~PG_FRAME);
- xmit_pa = (xmit_pa & PG_FRAME);
+
+ xennetback_mbuf_addr(m, _pa, );
if (m->m_pkthdr.len != m->m_len ||
(offset + m->m_pkthdr.len) > PAGE_SIZE) {
-MGETHDR(new_m, M_DONTWAIT, MT_DATA);
+new_m = xennetback_copymbuf(m);
if (__predict_false(new_m == NULL)) {
- printf("%s: cannot allocate new mbuf\n",
- ifp->if_xname);
+ static struct timeval lasttime;
+ if (ratecheck(, _pool_errintvl))
+ printf("%s: cannot allocate new mbuf\n",
+ ifp->if_xname);
+ abort = 1;
break;
-}
-if (m->m_pkthdr.len > MHLEN) {
- MCLGET(new_m, M_DONTWAIT);
- if (__predict_false(
- (new_m->m_flags & M_EXT) == 0)) {
- XENPRINTF((
- "%s:
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src
Committed By: skrll
Date: Sun Dec 23 11:45:39 UTC 2018
Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Appease clang. Tested by roy.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/fdt/fdt_machdep.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/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.56 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.57
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.56 Wed Nov 28 09:16:19 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Dec 23 11:45:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.56 2018/11/28 09:16:19 ryo Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.57 2018/12/23 11:45:39 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.56 2018/11/28 09:16:19 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.57 2018/12/23 11:45:39 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -555,7 +555,9 @@ initarm(void *arg)
* Now we have APs started the pages used for stacks and L1PT can
* be given to uvm
*/
- extern char __start__init_memory[], __stop__init_memory[];
+ extern char const __start__init_memory[];
+ extern char const __stop__init_memory[] __weak;
+
if (__start__init_memory != __stop__init_memory) {
const paddr_t spa = KERN_VTOPHYS((vaddr_t)__start__init_memory);
const paddr_t epa = KERN_VTOPHYS((vaddr_t)__stop__init_memory);
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Dec 23 11:42:13 UTC 2018
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
Remove useless debugging code, the area is completely filled but it's not
checked afterwards, only pi_magic is.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 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.229 src/sys/kern/subr_pool.c:1.230
--- src/sys/kern/subr_pool.c:1.229 Sun Dec 16 21:03:35 2018
+++ src/sys/kern/subr_pool.c Sun Dec 23 11:42:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.229 2018/12/16 21:03:35 maxv Exp $ */
+/* $NetBSD: subr_pool.c,v 1.230 2018/12/23 11:42:13 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.229 2018/12/16 21:03:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.230 2018/12/23 11:42:13 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -993,15 +993,7 @@ pool_do_put(struct pool *pp, void *v, st
#ifdef POOL_CHECK_MAGIC
pi->pi_magic = PI_MAGIC;
#endif
-#ifdef DEBUG
- {
- int i, *ip = v;
- for (i = 0; i < pp->pr_size / sizeof(int); i++) {
-*ip++ = PI_MAGIC;
- }
- }
-#endif
if (pp->pr_redzone) {
/*
* Mark the pool_item as valid. The rest is already
