CVS commit: xsrc/external/mit/MesaLib/src

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 21:40:37 UTC 2019

Added Files:
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_format_table.c
u_indices_gen.c u_unfilled_gen.c
xsrc/external/mit/MesaLib/src/gallium/drivers/radeonsi: si_driinfo.h
xsrc/external/mit/MesaLib/src/mapi/glapi: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated.c
xsrc/external/mit/MesaLib/src/mesa: format_info.h get_hash.h matypes.h
xsrc/external/mit/MesaLib/src/mesa/main: dispatch.h format_fallback.c
format_pack.c format_unpack.c marshal_generated.h remap_helper.h
xsrc/external/mit/MesaLib/src/mesa/program: program_parse.tab.c
program_parse.tab.h
xsrc/external/mit/MesaLib/src/util: format_srgb.c
xsrc/external/mit/MesaLib/src/util/xmlpool: options.h

Log Message:
Add more generated files from mesa 19.1.7.

Generated by doing a regular build using pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/MesaLib/src/gallium/auxiliary/u_format_table.c \
xsrc/external/mit/MesaLib/src/gallium/auxiliary/u_indices_gen.c \
xsrc/external/mit/MesaLib/src/gallium/auxiliary/u_unfilled_gen.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/gallium/drivers/radeonsi/si_driinfo.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/mapi/glapi/api_exec.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/enums.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/glapi_mapi_tmp.h \
xsrc/external/mit/MesaLib/src/mapi/glapi/marshal_generated.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/mapi/glapi/indirect.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect.h \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect_init.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect_size.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect_size.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/mesa/format_info.h \
xsrc/external/mit/MesaLib/src/mesa/matypes.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/mesa/get_hash.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/mesa/main/dispatch.h \
xsrc/external/mit/MesaLib/src/mesa/main/remap_helper.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/mesa/main/format_fallback.c \
xsrc/external/mit/MesaLib/src/mesa/main/format_pack.c \
xsrc/external/mit/MesaLib/src/mesa/main/format_unpack.c \
xsrc/external/mit/MesaLib/src/mesa/main/marshal_generated.h
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/MesaLib/src/mesa/program/program_parse.tab.c \
xsrc/external/mit/MesaLib/src/mesa/program/program_parse.tab.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/util/format_srgb.c
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/util/xmlpool/options.h

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

diffs are larger than 1MB and have been omitted


CVS commit: xsrc/external/mit/MesaLib/src

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 21:40:37 UTC 2019

Added Files:
xsrc/external/mit/MesaLib/src/gallium/auxiliary: u_format_table.c
u_indices_gen.c u_unfilled_gen.c
xsrc/external/mit/MesaLib/src/gallium/drivers/radeonsi: si_driinfo.h
xsrc/external/mit/MesaLib/src/mapi/glapi: api_exec.c enums.c
glapi_mapi_tmp.h indirect.c indirect.h indirect_init.c
indirect_size.c indirect_size.h marshal_generated.c
xsrc/external/mit/MesaLib/src/mesa: format_info.h get_hash.h matypes.h
xsrc/external/mit/MesaLib/src/mesa/main: dispatch.h format_fallback.c
format_pack.c format_unpack.c marshal_generated.h remap_helper.h
xsrc/external/mit/MesaLib/src/mesa/program: program_parse.tab.c
program_parse.tab.h
xsrc/external/mit/MesaLib/src/util: format_srgb.c
xsrc/external/mit/MesaLib/src/util/xmlpool: options.h

Log Message:
Add more generated files from mesa 19.1.7.

Generated by doing a regular build using pkgsrc.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/MesaLib/src/gallium/auxiliary/u_format_table.c \
xsrc/external/mit/MesaLib/src/gallium/auxiliary/u_indices_gen.c \
xsrc/external/mit/MesaLib/src/gallium/auxiliary/u_unfilled_gen.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/gallium/drivers/radeonsi/si_driinfo.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/mapi/glapi/api_exec.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/enums.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/glapi_mapi_tmp.h \
xsrc/external/mit/MesaLib/src/mapi/glapi/marshal_generated.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/mapi/glapi/indirect.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect.h \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect_init.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect_size.c \
xsrc/external/mit/MesaLib/src/mapi/glapi/indirect_size.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/mesa/format_info.h \
xsrc/external/mit/MesaLib/src/mesa/matypes.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/mesa/get_hash.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/mesa/main/dispatch.h \
xsrc/external/mit/MesaLib/src/mesa/main/remap_helper.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/mesa/main/format_fallback.c \
xsrc/external/mit/MesaLib/src/mesa/main/format_pack.c \
xsrc/external/mit/MesaLib/src/mesa/main/format_unpack.c \
xsrc/external/mit/MesaLib/src/mesa/main/marshal_generated.h
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/MesaLib/src/mesa/program/program_parse.tab.c \
xsrc/external/mit/MesaLib/src/mesa/program/program_parse.tab.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/MesaLib/src/util/format_srgb.c
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/util/xmlpool/options.h

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



CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 21:33:48 UTC 2019

Modified Files:
src/external/mit/xorg/lib: libmesa.mk

Log Message:
Adjust .PATH


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libmesa.mk

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/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.8 src/external/mit/xorg/lib/libmesa.mk:1.9
--- src/external/mit/xorg/lib/libmesa.mk:1.8	Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/libmesa.mk	Tue Sep 24 21:33:48 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libmesa.mk,v 1.8 2019/09/24 19:29:41 maya Exp $
+#	$NetBSD: libmesa.mk,v 1.9 2019/09/24 21:33:48 maya Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -424,7 +424,7 @@ SRCS.state_tracker= \
 	st_tgsi_lower_yuv.c
 
 # Program sources
-PATHS.program=	mesa/program ../../src/mesa/main/program
+PATHS.program=	mesa/program ../../src/mesa/program
 INCLUDES.program=	glsl
 SRCS.program= \
 	arbprogparse.c \



CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 21:33:48 UTC 2019

Modified Files:
src/external/mit/xorg/lib: libmesa.mk

Log Message:
Adjust .PATH


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libmesa.mk

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



CVS commit: src/external/gpl2/xcvs/dist/src

2019-09-24 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Tue Sep 24 21:03:29 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: ignore.c

Log Message:
Add missing ;


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/src/ignore.c

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



CVS commit: src/external/gpl2/xcvs/dist/src

2019-09-24 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Tue Sep 24 21:03:29 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: ignore.c

Log Message:
Add missing ;


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl2/xcvs/dist/src/ignore.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/gpl2/xcvs/dist/src/ignore.c
diff -u src/external/gpl2/xcvs/dist/src/ignore.c:1.5 src/external/gpl2/xcvs/dist/src/ignore.c:1.6
--- src/external/gpl2/xcvs/dist/src/ignore.c:1.5	Tue Sep 24 21:01:50 2019
+++ src/external/gpl2/xcvs/dist/src/ignore.c	Tue Sep 24 21:03:29 2019
@@ -8,7 +8,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.  */
 #include 
-__RCSID("$NetBSD: ignore.c,v 1.5 2019/09/24 21:01:50 kamil Exp $");
+__RCSID("$NetBSD: ignore.c,v 1.6 2019/09/24 21:03:29 kamil Exp $");
 
 /*
  * .cvsignore file support contributed by David G. Grubbs 
@@ -39,7 +39,7 @@ static int ign_hold = -1;		/* Index wher
 const char *ign_default = ". .. *.core RCSLOG tags TAGS RCS SCCS .make.state\
  .nse_depinfo #* .#* cvslog.* ,* CVS.adm .del-* *.a *.olb *.o *.obj\
  .gitignore .gitattributes .gitmodules .hgignore\
- *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$"
+ *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
 extern const char *cvsDir;
 
 #define IGN_GROW 16			/* grow the list by 16 elements at a



CVS commit: src/external/gpl2/xcvs/dist/src

2019-09-24 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Tue Sep 24 21:01:50 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: ignore.c

Log Message:
Add a bunch of meta files from git and hg to ignore from CVS imports

This will allow interop of src/ with git and hg without malforming repos.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/ignore.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/gpl2/xcvs/dist/src/ignore.c
diff -u src/external/gpl2/xcvs/dist/src/ignore.c:1.4 src/external/gpl2/xcvs/dist/src/ignore.c:1.5
--- src/external/gpl2/xcvs/dist/src/ignore.c:1.4	Tue Sep 24 17:23:06 2019
+++ src/external/gpl2/xcvs/dist/src/ignore.c	Tue Sep 24 21:01:50 2019
@@ -8,7 +8,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.  */
 #include 
-__RCSID("$NetBSD: ignore.c,v 1.4 2019/09/24 17:23:06 maya Exp $");
+__RCSID("$NetBSD: ignore.c,v 1.5 2019/09/24 21:01:50 kamil Exp $");
 
 /*
  * .cvsignore file support contributed by David G. Grubbs 
@@ -38,7 +38,8 @@ static int ign_hold = -1;		/* Index wher
 
 const char *ign_default = ". .. *.core RCSLOG tags TAGS RCS SCCS .make.state\
  .nse_depinfo #* .#* cvslog.* ,* CVS.adm .del-* *.a *.olb *.o *.obj\
- *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
+ .gitignore .gitattributes .gitmodules .hgignore\
+ *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$"
 extern const char *cvsDir;
 
 #define IGN_GROW 16			/* grow the list by 16 elements at a



CVS commit: src/external/gpl2/xcvs/dist/src

2019-09-24 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Tue Sep 24 21:01:50 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: ignore.c

Log Message:
Add a bunch of meta files from git and hg to ignore from CVS imports

This will allow interop of src/ with git and hg without malforming repos.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/xcvs/dist/src/ignore.c

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



CVS import: xsrc/external/mit/MesaLib/dist

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 20:59:32 UTC 2019

Update of /cvsroot/xsrc/external/mit/MesaLib/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24458

Log Message:
import mesa-19.1.7 (for pathnames including the word 'core')

Now with the correct paths...

Status:

Vendor Tag: xorg
Release Tags:   mesalib-19-1-7

N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrcommon.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrelemlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrelemlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib1.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib1.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib2.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib2.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrobject.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrobject.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/coord.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/coord.h
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/api.cpp
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/api.h
U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/arena.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_clear.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_impl.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_sample.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_singlesample.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/binner.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/binner.h
U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/blend.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/clip.cpp
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/clip.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/conservativeRast.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/context.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/depthstencil.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/fifo.hpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_conversion.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_traits.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_types.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_utils.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/frontend.h
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/knobs.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/knobs_init.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/multisample.h
U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/pa.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/pa_avx.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rasterizer.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rasterizer.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rasterizer_impl.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/ringbuffer.h
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/state.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/state_funcs.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tessellator.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/threads.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/threads.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tilemgr.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tilemgr.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tileset.h
C 

CVS import: xsrc/external/mit/MesaLib/dist

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 20:59:32 UTC 2019

Update of /cvsroot/xsrc/external/mit/MesaLib/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv24458

Log Message:
import mesa-19.1.7 (for pathnames including the word 'core')

Now with the correct paths...

Status:

Vendor Tag: xorg
Release Tags:   mesalib-19-1-7

N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrcommon.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrelemlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrelemlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib1.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib1.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib2.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrlib2.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrobject.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/addrobject.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/coord.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/coord.h
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/api.cpp
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/api.h
U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/arena.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_clear.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_impl.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_sample.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/backend_singlesample.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/binner.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/binner.h
U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/blend.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/clip.cpp
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/clip.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/conservativeRast.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/context.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/depthstencil.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/fifo.hpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_conversion.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_traits.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_types.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/format_utils.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/frontend.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/frontend.h
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/knobs.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/knobs_init.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/multisample.h
U xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/pa.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/pa_avx.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rasterizer.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rasterizer.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rasterizer_impl.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.cpp
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/rdtsc_core.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/ringbuffer.h
C xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/state.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/state_funcs.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tessellator.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/threads.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/threads.h
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tilemgr.cpp
C 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tilemgr.h
U 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/tileset.h
C 

CVS import: xsrc/external/mit/MesaLib/dist

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 20:44:34 UTC 2019

Update of /cvsroot/xsrc/external/mit/MesaLib/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6180

Log Message:
import mesa-19.1.7 (for pathnames including the word 'core')

Status:

Vendor Tag: xorg
Release Tags:   mesalib-19-1-7

N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrcommon.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrelemlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrelemlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib1.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib1.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib2.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib2.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrobject.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrobject.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/coord.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/coord.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/api.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/api.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/arena.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_clear.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_impl.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_sample.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_singlesample.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/blend.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/conservativeRast.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/context.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/depthstencil.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/fifo.hpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_conversion.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_traits.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_types.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_utils.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs_init.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/multisample.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/pa.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/pa_avx.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rasterizer.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rasterizer.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rasterizer_impl.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rdtsc_core.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rdtsc_core.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/ringbuffer.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/state.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/state_funcs.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/tessellator.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/threads.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/threads.h
N 

CVS import: xsrc/external/mit/MesaLib/dist

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 20:44:34 UTC 2019

Update of /cvsroot/xsrc/external/mit/MesaLib/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6180

Log Message:
import mesa-19.1.7 (for pathnames including the word 'core')

Status:

Vendor Tag: xorg
Release Tags:   mesalib-19-1-7

N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrcommon.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrelemlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrelemlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib1.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib1.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib2.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrlib2.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrobject.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/addrobject.h
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/coord.cpp
N xsrc/external/mit/MesaLib/dist/src/amd/addrlib/src/core/core/coord.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/api.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/api.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/arena.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_clear.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_impl.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_sample.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/backend_singlesample.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/binner.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/blend.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/clip.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/conservativeRast.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/context.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/depthstencil.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/fifo.hpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_conversion.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_traits.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_types.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/format_utils.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/frontend.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/knobs_init.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/multisample.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/pa.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/pa_avx.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rasterizer.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rasterizer.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rasterizer_impl.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rdtsc_core.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/rdtsc_core.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/ringbuffer.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/state.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/state_funcs.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/tessellator.h
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/threads.cpp
N 
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/swr/rasterizer/core/core/threads.h
N 

CVS commit: xsrc/external/mit/MesaLib/dist/src/intel/isl

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 20:07:16 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/intel/isl: isl_tiled_memcpy.c

Log Message:
Avoid conflict with netbsd's highly visible bswap32 definition.

Re-patching, patch was lost in a rename.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c

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



CVS commit: xsrc/external/mit/MesaLib/dist/src/intel/isl

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 20:07:16 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/intel/isl: isl_tiled_memcpy.c

Log Message:
Avoid conflict with netbsd's highly visible bswap32 definition.

Re-patching, patch was lost in a rename.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c
diff -u xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c:1.1.1.1	Tue Sep 24 17:44:21 2019
+++ xsrc/external/mit/MesaLib/dist/src/intel/isl/isl_tiled_memcpy.c	Tue Sep 24 20:07:16 2019
@@ -64,6 +64,10 @@ ror(uint32_t n, uint32_t d)
return (n >> d) | (n << (32 - d));
 }
 
+/* Handle conflicting declaration and conflicting macro in netbsd */
+#undef bswap32
+#define bswap32(n) __builtin_bswap32(n)
+#if 0
 static inline uint32_t
 bswap32(uint32_t n)
 {
@@ -76,6 +80,7 @@ bswap32(uint32_t n)
   (n << 24);
 #endif
 }
+#endif
 
 /**
  * Copy RGBA to BGRA - swap R and B.



CVS commit: src/doc

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:50:49 UTC 2019

Modified Files:
src/doc: 3RDPARTY

Log Message:
Updated mesa.


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

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



CVS commit: src/doc

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:50:49 UTC 2019

Modified Files:
src/doc: 3RDPARTY

Log Message:
Updated mesa.


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

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1650 src/doc/3RDPARTY:1.1651
--- src/doc/3RDPARTY:1.1650	Mon Sep 23 13:49:40 2019
+++ src/doc/3RDPARTY	Tue Sep 24 19:50:49 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1650 2019/09/23 13:49:40 taca Exp $
+#	$NetBSD: 3RDPARTY,v 1.1651 2019/09/24 19:50:49 maya Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -917,12 +917,12 @@ Location:	sys/external/bsd/drm/dist
 Notes:
 
 Package:	MesaLib
-Version:	18.3.4
-Current Vers:	19.0.1
+Version:	19.1.7
+Current Vers:	19.1.7
 Maintainer:	mesa-git@?
 Archive Site:	ftp://ftp.freedesktop.org/pub/mesa/
 Home Page:	http://www.mesa3d.org/
-Date:		2019-04-05
+Date:		2019-09-24
 Mailing List:
 Responsible:	riastradh, mrg
 License:	ISC



CVS commit: xsrc/external/mit/MesaLib/src/arch

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:49:00 UTC 2019

Removed Files:
xsrc/external/mit/MesaLib/src/arch/i386: matypes.h
xsrc/external/mit/MesaLib/src/arch/x86_64: matypes.h

Log Message:
Remove now unused generated files.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/MesaLib/src/arch/i386/matypes.h
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/MesaLib/src/arch/x86_64/matypes.h

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



CVS commit: xsrc/external/mit/MesaLib/src/arch

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:49:00 UTC 2019

Removed Files:
xsrc/external/mit/MesaLib/src/arch/i386: matypes.h
xsrc/external/mit/MesaLib/src/arch/x86_64: matypes.h

Log Message:
Remove now unused generated files.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/MesaLib/src/arch/i386/matypes.h
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/MesaLib/src/arch/x86_64/matypes.h

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



CVS commit: xsrc/external/mit/MesaLib/dist/src/util

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:47:33 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_queue.c

Log Message:
Apply u_queue.c patch from pkgsrc:

atexit is not a good idea in shared libraries.
attempt to port cpuset logic to netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/util/u_queue.c

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/util/u_queue.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_queue.c:1.3 xsrc/external/mit/MesaLib/dist/src/util/u_queue.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/util/u_queue.c:1.3	Tue Sep 24 19:26:51 2019
+++ xsrc/external/mit/MesaLib/dist/src/util/u_queue.c	Tue Sep 24 19:47:33 2019
@@ -48,15 +48,22 @@ static once_flag atexit_once_flag = ONCE
 static struct list_head queue_list;
 static mtx_t exit_mutex = _MTX_INITIALIZER_NP;
 
+#define HAVE_NOATEXIT
+#if defined(HAVE_NOATEXIT)
 static int global_init_called = 0;
 
 static void __attribute__((__destructor__))
+#else
+static void
+#endif
 atexit_handler(void)
 {
struct util_queue *iter;
 
+#if defined(HAVE_NOATEXIT)
if (!global_init_called)
   return;
+#endif
 
mtx_lock(_mutex);
/* Wait for all queues to assert idle. */
@@ -70,7 +77,11 @@ static void
 global_init(void)
 {
LIST_INITHEAD(_list);
+#if defined(HAVE_NOATEXIT)
global_init_called = 1;
+#else
+   atexit(atexit_handler);
+#endif
 }
 
 static void
@@ -251,12 +262,25 @@ util_queue_thread_func(void *input)
   /* Don't inherit the thread affinity from the parent thread.
* Set the full mask.
*/
+#if defined(__NetBSD__)
+  cpuset_t *cpuset;
+  cpuset = cpuset_create();
+  if (cpuset != NULL) {
+ cpuset_zero(cpuset);
+ for (unsigned i = 0; i < cpuset_size(cpuset); i++)
+cpuset_set(i, cpuset);
+
+ pthread_setaffinity_np(pthread_self(), cpuset_size(cpuset), cpuset);
+ cpuset_destroy(cpuset);
+  }
+#else
   cpu_set_t cpuset;
   CPU_ZERO();
   for (unsigned i = 0; i < CPU_SETSIZE; i++)
  CPU_SET(i, );
 
   pthread_setaffinity_np(pthread_self(), sizeof(cpuset), );
+#endif
}
 #endif
 



CVS commit: xsrc/external/mit/MesaLib/dist/src/util

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:47:33 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_queue.c

Log Message:
Apply u_queue.c patch from pkgsrc:

atexit is not a good idea in shared libraries.
attempt to port cpuset logic to netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/util/u_queue.c

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



CVS commit: xsrc/external/mit/MesaLib/dist/src/compiler/nir

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:45:13 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/compiler/nir: nir_builtin_builder.h

Log Message:
Provide a bogus definition of NAN for vax.

ifdef __vax__ rather than ifndef NAN to ensure it is never accidentally
picked up for non-VAX.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h
diff -u xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h:1.1.1.2 xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h:1.2
--- xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h:1.1.1.2	Tue Sep 24 16:44:18 2019
+++ xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h	Tue Sep 24 19:45:13 2019
@@ -179,6 +179,10 @@ nir_minmag(nir_builder *b, nir_ssa_def *
return nir_bcsel(b, condy, y, nir_bcsel(b, condx, x, nir_fmin(b, x, y)));
 }
 
+#ifdef __vax__
+#define NAN FLT_MAX
+#endif
+
 static inline nir_ssa_def*
 nir_nan(nir_builder *b, nir_ssa_def *x)
 {



CVS commit: xsrc/external/mit/MesaLib/dist/src/compiler/nir

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:45:13 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/compiler/nir: nir_builtin_builder.h

Log Message:
Provide a bogus definition of NAN for vax.

ifdef __vax__ rather than ifndef NAN to ensure it is never accidentally
picked up for non-VAX.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/compiler/nir/nir_builtin_builder.h

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



CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:29:42 UTC 2019

Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile

Log Message:
Update build logic for mesa 19.1.7.

A lot of files are now living outside of dist, since they're not in the
distributed sources: they're generated, usually by python/meson.

The remaining changes are due to files being moved around.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/driver.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libglapi/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/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.3 src/external/mit/xorg/lib/driver.mk:1.4
--- src/external/mit/xorg/lib/driver.mk:1.3	Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/driver.mk	Tue Sep 24 19:29:41 2019
@@ -1,9 +1,10 @@
-#	$NetBSD: driver.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+#	$NetBSD: driver.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
 
 # stuff both dri and gallium drivers need.
 
 # util
 .PATH:		${X11SRCDIR.Mesa}/src/util
+.PATH:		${X11SRCDIR.Mesa}/../src/util
 
 SRCS.util=	\
 	hash_table.c \
@@ -49,3 +50,6 @@ SRCS+=	${SRCS.util}
 .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
 SRCS+=	utils.c dri_util.c xmlconfig.c
 SRCS+=	megadriver_stub.c
+
+CPPFLAGS.dri_util.c+=		-I${X11SRCDIR.Mesa}/../src/util
+
Index: src/external/mit/xorg/lib/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.3 src/external/mit/xorg/lib/libloader.mk:1.4
--- src/external/mit/xorg/lib/libloader.mk:1.3	Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libloader.mk	Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libloader.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+#	$NetBSD: libloader.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
 
 # makefile fragment for mesa src/loader
 
@@ -12,8 +12,11 @@ SRCS.loader += \
 
 .for _f in ${SRCS.loader}
 CPPFLAGS.${_f}= 	-I${X11SRCDIR.Mesa}/src/util \
+			-I${X11SRCDIR.Mesa}/../src/util \
 			-I${X11SRCDIR.Mesa}/src/mesa \
 			-I${X11SRCDIR.Mesa}/src \
+			-DGL_LIB_NAME=\"libGL.so.3\" \
+			-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
 			-DUSE_DRICONF
 .endfor
 

Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.5 src/external/mit/xorg/lib/libglsl.mk:1.6
--- src/external/mit/xorg/lib/libglsl.mk:1.5	Sun Apr  7 08:14:20 2019
+++ src/external/mit/xorg/lib/libglsl.mk	Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libglsl.mk,v 1.5 2019/04/07 08:14:20 maya Exp $
+#	$NetBSD: libglsl.mk,v 1.6 2019/09/24 19:29:41 maya Exp $
 
 LIBGLSL_GENERATED_CXX_FILES = \
 	glsl_lexer.cpp \
@@ -8,7 +8,14 @@ LIBGLSL_GENERATED_CXX_FILES = \
 COPTS.vtn_glsl450.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
 
 CPPFLAGS+=	-I${X11SRCDIR.Mesa}/src/compiler \
-		-I${X11SRCDIR.Mesa}/src/compiler/nir
+		-I${X11SRCDIR.Mesa}/../src/compiler \
+		-I${X11SRCDIR.Mesa}/src/compiler/nir \
+		-I${X11SRCDIR.Mesa}/../src/compiler/nir \
+		-I${X11SRCDIR.Mesa}/src/compiler/glsl \
+		-I${X11SRCDIR.Mesa}/../src/compiler/glsl \
+		-I${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp \
+		-I${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp \
+		-I${X11SRCDIR.Mesa}/src/compiler/spirv
 
 LIBGLSL_FILES = \
 	ast_array_index.cpp \
@@ -21,28 +28,30 @@ LIBGLSL_FILES = \
 	builtin_variables.cpp \
 	generate_ir.cpp \
 	gl_nir_lower_atomics.c \
-	gl_nir_lower_samplers.c \
-	gl_nir_lower_samplers_as_deref.c \
 	gl_nir_link_atomics.c \
 	gl_nir_link_uniform_initializers.c \
 	gl_nir_link_uniforms.c \
 	gl_nir_link_xfb.c \
 	gl_nir_linker.c \
+	gl_nir_lower_bindless_images.c \
+	gl_nir_lower_buffers.c \
+	gl_nir_lower_samplers.c \
+	gl_nir_lower_samplers_as_deref.c \
 	glsl_parser_extras.cpp \
 	glsl_symbol_table.cpp \
 	glsl_to_nir.cpp \
 	hir_field_selection.cpp \
+	ir.cpp \
 	ir_array_refcount.cpp \
 	ir_basic_block.cpp \
 	ir_builder.cpp \
 	ir_clone.cpp \
 	ir_constant_expression.cpp \
-	ir.cpp \
 	ir_equals.cpp \
 	

CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:29:42 UTC 2019

Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile

Log Message:
Update build logic for mesa 19.1.7.

A lot of files are now living outside of dist, since they're not in the
distributed sources: they're generated, usually by python/meson.

The remaining changes are due to files being moved around.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/driver.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libglapi/Makefile

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



CVS commit: xsrc/external/mit/MesaLib/dist

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:26:53 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/include/GL/internal: dri_interface.h
xsrc/external/mit/MesaLib/dist/src/compiler/glsl:
glsl_parser_extras.cpp
xsrc/external/mit/MesaLib/dist/src/egl/main: eglglobals.c
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/util: u_format.c
u_format_tests.c
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/vl:
vl_compositor.c vl_compositor.h
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/llvmpipe:
lp_setup_point.c
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau/codegen:
nv50_ir.h nv50_ir_lowering_nvc0.cpp nv50_ir_lowering_nvc0.h
nv50_ir_print.cpp nv50_ir_ra.cpp nv50_ir_util.h
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600:
evergreen_compute.c r600_query.c r600_texture.c
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeon:
radeon_vcn_enc.c
xsrc/external/mit/MesaLib/dist/src/gallium/include/pipe:
p_video_state.h
xsrc/external/mit/MesaLib/dist/src/gallium/state_trackers/dri:
dri_drawable.c dri_screen.h
xsrc/external/mit/MesaLib/dist/src/gbm/backends/dri: gbm_dri.c
xsrc/external/mit/MesaLib/dist/src/glx: dri_common.c dri_glx.c
glxclient.h
xsrc/external/mit/MesaLib/dist/src/intel/compiler: brw_vue_map.c
xsrc/external/mit/MesaLib/dist/src/intel/dev: gen_device_info.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915:
intel_context.c intel_context.h intel_screen.c intel_screen.h
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965:
intel_batchbuffer.c intel_buffer_objects.c intel_mipmap_tree.c
intel_mipmap_tree.h intel_screen.c intel_screen.h
intel_tex_validate.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/nouveau:
nouveau_context.c
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/radeon:
radeon_common_context.c
xsrc/external/mit/MesaLib/dist/src/mesa/main: context.c dlist.c
xsrc/external/mit/MesaLib/dist/src/mesa/swrast: s_span.c
xsrc/external/mit/MesaLib/dist/src/mesa/vbo: vbo_exec_draw.c
xsrc/external/mit/MesaLib/dist/src/util: disk_cache.c ralloc.c u_math.h
u_process.c u_queue.c
Added Files:
xsrc/external/mit/MesaLib/dist: Android.common.mk Android.mk
CleanSpec.mk
xsrc/external/mit/MesaLib/dist/bin: bugzilla_mesa.sh get-pick-list.sh
shortlog_mesa.sh
xsrc/external/mit/MesaLib/dist/src/gallium: Android.common.mk
Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm: f.cpp
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/freedreno:
Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/i915: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/nouveau: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r300: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/r600: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/radeonsi: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/softpipe: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/drivers/svga: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/freedreno/drm:
Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/i915/drm: Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/nouveau/drm:
Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/radeon/drm:
Android.mk
xsrc/external/mit/MesaLib/dist/src/gallium/winsys/svga/drm: Android.mk
xsrc/external/mit/MesaLib/dist/src/loader: Android.mk
xsrc/external/mit/MesaLib/dist/src/mapi: Android.mk
xsrc/external/mit/MesaLib/dist/src/mesa: Android.gen.mk
Android.libmesa_dricore.mk Android.libmesa_glsl_utils.mk
Android.libmesa_st_mesa.mk Android.mesa_gen_matypes.mk Android.mk
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri: Android.mk
gen-symbol-redefs.py
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/common: Android.mk
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i915: Android.mk
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/i965: Android.mk
xsrc/external/mit/MesaLib/dist/src/mesa/drivers/dri/r200: Doxyfile
xsrc/external/mit/MesaLib/dist/src/mesa/program: Android.mk
xsrc/external/mit/MesaLib/dist/src/util: Android.mk
Removed Files:
xsrc/external/mit/MesaLib/dist: Makefile.am Makefile.in aclocal.m4
  

CVS commit: src/sys/kern

2019-09-24 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Tue Sep 24 19:21:45 UTC 2019

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

Log Message:
Add a temporary ctassert checking whether void* and intptr_t are compatible


To generate a diff of this commit:
cvs rdiff -u -r1.504 -r1.505 src/sys/kern/init_main.c

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



CVS commit: src/sys/kern

2019-09-24 Thread Kamil Rytarowski
Module Name:src
Committed By:   kamil
Date:   Tue Sep 24 19:21:45 UTC 2019

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

Log Message:
Add a temporary ctassert checking whether void* and intptr_t are compatible


To generate a diff of this commit:
cvs rdiff -u -r1.504 -r1.505 src/sys/kern/init_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/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.504 src/sys/kern/init_main.c:1.505
--- src/sys/kern/init_main.c:1.504	Fri May 17 03:34:26 2019
+++ src/sys/kern/init_main.c	Tue Sep 24 19:21:45 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.504 2019/05/17 03:34:26 ozaki-r Exp $	*/
+/*	$NetBSD: init_main.c,v 1.505 2019/09/24 19:21:45 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.504 2019/05/17 03:34:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.505 2019/09/24 19:21:45 kamil Exp $");
 
 #include "opt_ddb.h"
 #include "opt_inet.h"
@@ -250,6 +250,9 @@ static void configure2(void);
 static void configure3(void);
 void main(void);
 
+CTASSERT(sizeof(void *) == sizeof(intptr_t));
+CTASSERT(__alignof__(void *) == __alignof__(intptr_t));
+
 /*
  * System startup; initialize the world, create process 0, mount root
  * filesystem, and fork to create init and pagedaemon.  Most of the



CVS commit: xsrc/external/mit/MesaLib/src

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:21:13 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/src/mapi: shared-glapi_glapi_mapi_tmp.h
Added Files:
xsrc/external/mit/MesaLib/src/amd/common: sid_tables.h
xsrc/external/mit/MesaLib/src/compiler: ir_expression_operation.h
xsrc/external/mit/MesaLib/src/compiler/glsl: float64_glsl.h
glsl_lexer.cpp glsl_parser.cpp glsl_parser.h
ir_expression_operation_constant.h
ir_expression_operation_strings.h
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp: glcpp-lex.c
glcpp-parse.c glcpp-parse.h
xsrc/external/mit/MesaLib/src/compiler/nir: nir_builder_opcodes.h
nir_constant_expressions.c nir_intrinsics.c nir_intrinsics.h
nir_opcodes.c nir_opcodes.h nir_opt_algebraic.c
xsrc/external/mit/MesaLib/src/compiler/spirv: spirv_info.c
vtn_gather_types.c
xsrc/external/mit/MesaLib/src/intel: brw_nir_trig_workarounds.c
isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen10_pack.h gen11_pack.h
gen45_pack.h gen4_pack.h gen5_pack.h gen6_pack.h gen75_pack.h
gen7_pack.h gen8_pack.h gen9_pack.h genX_bits.h genX_xml.h
xsrc/external/mit/MesaLib/src/intel/perf: gen_perf_metrics.c
gen_perf_metrics.h
xsrc/external/mit/MesaLib/src/pkgconfig: dri.pc.in egl.pc.in gbm.pc.in
gl.pc.in

Log Message:
Update generated files from a regular build of mesa 19.1.7.

The pkgconfig files are now generated using meson, no more .pc.in files,
so I made my own using the result of the pkgsrc build.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/amd/common/sid_tables.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/ir_expression_operation.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/glsl/float64_glsl.h \
xsrc/external/mit/MesaLib/src/compiler/glsl/glsl_lexer.cpp \
xsrc/external/mit/MesaLib/src/compiler/glsl/glsl_parser.cpp \
xsrc/external/mit/MesaLib/src/compiler/glsl/glsl_parser.h \

xsrc/external/mit/MesaLib/src/compiler/glsl/ir_expression_operation_constant.h \

xsrc/external/mit/MesaLib/src/compiler/glsl/ir_expression_operation_strings.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp/glcpp-lex.c \
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp/glcpp-parse.c \
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp/glcpp-parse.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_builder_opcodes.h \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_constant_expressions.c \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_intrinsics.c \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_intrinsics.h \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_opcodes.c \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_opcodes.h \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_opt_algebraic.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/spirv/spirv_info.c \
xsrc/external/mit/MesaLib/src/compiler/spirv/vtn_gather_types.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/intel/brw_nir_trig_workarounds.c \
xsrc/external/mit/MesaLib/src/intel/isl_format_layout.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/intel/genxml/gen10_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen11_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen45_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen4_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen5_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen6_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen75_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen7_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen8_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen9_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/genX_bits.h \
xsrc/external/mit/MesaLib/src/intel/genxml/genX_xml.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/intel/perf/gen_perf_metrics.c \
xsrc/external/mit/MesaLib/src/intel/perf/gen_perf_metrics.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/src/mapi/shared-glapi_glapi_mapi_tmp.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/pkgconfig/dri.pc.in \
xsrc/external/mit/MesaLib/src/pkgconfig/egl.pc.in \
xsrc/external/mit/MesaLib/src/pkgconfig/gbm.pc.in \
xsrc/external/mit/MesaLib/src/pkgconfig/gl.pc.in

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

diffs are larger than 1MB and have been omitted


CVS commit: xsrc/external/mit/MesaLib/src

2019-09-24 Thread Maya Rashish
Module Name:xsrc
Committed By:   maya
Date:   Tue Sep 24 19:21:13 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/src/mapi: shared-glapi_glapi_mapi_tmp.h
Added Files:
xsrc/external/mit/MesaLib/src/amd/common: sid_tables.h
xsrc/external/mit/MesaLib/src/compiler: ir_expression_operation.h
xsrc/external/mit/MesaLib/src/compiler/glsl: float64_glsl.h
glsl_lexer.cpp glsl_parser.cpp glsl_parser.h
ir_expression_operation_constant.h
ir_expression_operation_strings.h
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp: glcpp-lex.c
glcpp-parse.c glcpp-parse.h
xsrc/external/mit/MesaLib/src/compiler/nir: nir_builder_opcodes.h
nir_constant_expressions.c nir_intrinsics.c nir_intrinsics.h
nir_opcodes.c nir_opcodes.h nir_opt_algebraic.c
xsrc/external/mit/MesaLib/src/compiler/spirv: spirv_info.c
vtn_gather_types.c
xsrc/external/mit/MesaLib/src/intel: brw_nir_trig_workarounds.c
isl_format_layout.c
xsrc/external/mit/MesaLib/src/intel/genxml: gen10_pack.h gen11_pack.h
gen45_pack.h gen4_pack.h gen5_pack.h gen6_pack.h gen75_pack.h
gen7_pack.h gen8_pack.h gen9_pack.h genX_bits.h genX_xml.h
xsrc/external/mit/MesaLib/src/intel/perf: gen_perf_metrics.c
gen_perf_metrics.h
xsrc/external/mit/MesaLib/src/pkgconfig: dri.pc.in egl.pc.in gbm.pc.in
gl.pc.in

Log Message:
Update generated files from a regular build of mesa 19.1.7.

The pkgconfig files are now generated using meson, no more .pc.in files,
so I made my own using the result of the pkgsrc build.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/amd/common/sid_tables.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/ir_expression_operation.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/glsl/float64_glsl.h \
xsrc/external/mit/MesaLib/src/compiler/glsl/glsl_lexer.cpp \
xsrc/external/mit/MesaLib/src/compiler/glsl/glsl_parser.cpp \
xsrc/external/mit/MesaLib/src/compiler/glsl/glsl_parser.h \

xsrc/external/mit/MesaLib/src/compiler/glsl/ir_expression_operation_constant.h \

xsrc/external/mit/MesaLib/src/compiler/glsl/ir_expression_operation_strings.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp/glcpp-lex.c \
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp/glcpp-parse.c \
xsrc/external/mit/MesaLib/src/compiler/glsl/glcpp/glcpp-parse.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_builder_opcodes.h \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_constant_expressions.c \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_intrinsics.c \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_intrinsics.h \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_opcodes.c \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_opcodes.h \
xsrc/external/mit/MesaLib/src/compiler/nir/nir_opt_algebraic.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/compiler/spirv/spirv_info.c \
xsrc/external/mit/MesaLib/src/compiler/spirv/vtn_gather_types.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/intel/brw_nir_trig_workarounds.c \
xsrc/external/mit/MesaLib/src/intel/isl_format_layout.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/intel/genxml/gen10_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen11_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen45_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen4_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen5_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen6_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen75_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen7_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen8_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/gen9_pack.h \
xsrc/external/mit/MesaLib/src/intel/genxml/genX_bits.h \
xsrc/external/mit/MesaLib/src/intel/genxml/genX_xml.h
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/MesaLib/src/intel/perf/gen_perf_metrics.c \
xsrc/external/mit/MesaLib/src/intel/perf/gen_perf_metrics.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/src/mapi/shared-glapi_glapi_mapi_tmp.h
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/MesaLib/src/pkgconfig/dri.pc.in \
xsrc/external/mit/MesaLib/src/pkgconfig/egl.pc.in \
xsrc/external/mit/MesaLib/src/pkgconfig/gbm.pc.in \
xsrc/external/mit/MesaLib/src/pkgconfig/gl.pc.in

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



CVS commit: src/external/mit/expat/lib/libexpat

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:19:49 UTC 2019

Modified Files:
src/external/mit/expat/lib/libexpat: Makefile

Log Message:
Unless we add --sysroot, the netbsd src tree headers won't be used.
Do so, so we don't rely on the build machine to have  for
this macro check.

Using ${CPPFLAGS} rather than my own encoding of --sysroot, since it
already includes it.

Tested by agc, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/lib/libexpat/Makefile

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



CVS commit: src/external/mit/expat/lib/libexpat

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:19:49 UTC 2019

Modified Files:
src/external/mit/expat/lib/libexpat: Makefile

Log Message:
Unless we add --sysroot, the netbsd src tree headers won't be used.
Do so, so we don't rely on the build machine to have  for
this macro check.

Using ${CPPFLAGS} rather than my own encoding of --sysroot, since it
already includes it.

Tested by agc, thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/lib/libexpat/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/expat/lib/libexpat/Makefile
diff -u src/external/mit/expat/lib/libexpat/Makefile:1.3 src/external/mit/expat/lib/libexpat/Makefile:1.4
--- src/external/mit/expat/lib/libexpat/Makefile:1.3	Mon Sep 23 17:20:41 2019
+++ src/external/mit/expat/lib/libexpat/Makefile	Tue Sep 24 19:19:49 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2019/09/23 17:20:41 maya Exp $
+#	$NetBSD: Makefile,v 1.4 2019/09/24 19:19:49 maya Exp $
 
 .include 
 
@@ -36,7 +36,7 @@ dependall: all
 
 expat.pc: expat_config.h expat.pc.in
 	@(V=$$( (echo '#include '; echo PACKAGE_VERSION) | \
-	${CC} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
+	${CC} ${CPPFLAGS} -E -I${.CURDIR} - | tail -1 | tr -d '"') && \
 	${TOOL_SED} -e s/@VERSION@/$$V/ < ${.CURDIR}/expat.pc.in \
 	> ${.TARGET})
 



CVS commit: [netbsd-8] src/doc

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:28:19 UTC 2019

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

Log Message:
Ticket #1385


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-8.2

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



CVS commit: [netbsd-8] src/doc

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:28:19 UTC 2019

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

Log Message:
Ticket #1385


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-8.2

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

Modified files:

Index: src/doc/CHANGES-8.2
diff -u src/doc/CHANGES-8.2:1.1.2.41 src/doc/CHANGES-8.2:1.1.2.42
--- src/doc/CHANGES-8.2:1.1.2.41	Mon Sep 23 14:37:34 2019
+++ src/doc/CHANGES-8.2	Tue Sep 24 18:28:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.2,v 1.1.2.41 2019/09/23 14:37:34 martin Exp $
+# $NetBSD: CHANGES-8.2,v 1.1.2.42 2019/09/24 18:28:19 martin Exp $
 
 A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2
 release:
@@ -1104,3 +1104,33 @@ external/mit/expat/lib/libexpat/expat_co
 	Actually define BYTEORDER since it is used.
 	[maya, ticket #1384]
 
+sys/net/if.c1.461
+sys/net/if.h1.277
+sys/net/if_gif.c			1.149
+sys/net/if_gif.h			1.33
+sys/net/if_ipsec.c			1.19,1.20,1.24
+sys/net/if_ipsec.h			1.5
+sys/net/if_l2tp.c			1.33,1.36-1.39
+sys/net/if_l2tp.h			1.7,1.8
+sys/net/route.c 			1.220,1.221
+sys/net/route.h 			1.125
+sys/netinet/in_gif.c			1.95
+sys/netinet/in_l2tp.c			1.17
+sys/netinet/ip_input.c			1.391,1.392
+sys/netinet/wqinput.c			1.6
+sys/netinet6/in6_gif.c			1.94
+sys/netinet6/in6_l2tp.c 		1.18
+sys/netinet6/ip6_forward.c		1.97
+sys/netinet6/ip6_input.c		1.210,1.211
+sys/netipsec/ipsec_output.c		1.82,1.83 (patched)
+sys/netipsec/ipsecif.c			1.12,1.13,1.15,1.17 (patched)
+sys/netipsec/key.c			1.259,1.260
+
+	ipsecif(4): support input drop packet counter,
+	remove unnecessary addresses in PF_KEY message.
+	l2tp(4): fix output bytes counter, initialize mowner variables
+	for MBUFTRACE, divide Tx context of l2tp(4) to improve performance.
+	rtcache, wqinput and l2tp: avoid having data directly in a
+	percpu storage.
+	[knakahara, ticket #1385]
+



CVS commit: [netbsd-8] src/sys

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:27:10 UTC 2019

Modified Files:
src/sys/net [netbsd-8]: if.c if.h if_gif.c if_gif.h if_ipsec.c
if_ipsec.h if_l2tp.c if_l2tp.h route.c route.h
src/sys/netinet [netbsd-8]: in_gif.c in_l2tp.c ip_input.c wqinput.c
src/sys/netinet6 [netbsd-8]: in6_gif.c in6_l2tp.c ip6_forward.c
ip6_input.c
src/sys/netipsec [netbsd-8]: ipsec_output.c ipsecif.c key.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1385):

sys/net/if.c1.461
sys/net/if.h1.277
sys/net/if_gif.c1.149
sys/net/if_gif.h1.33
sys/net/if_ipsec.c  1.19,1.20,1.24
sys/net/if_ipsec.h  1.5
sys/net/if_l2tp.c   1.33,1.36-1.39
sys/net/if_l2tp.h   1.7,1.8
sys/net/route.c 1.220,1.221
sys/net/route.h 1.125
sys/netinet/in_gif.c1.95
sys/netinet/in_l2tp.c   1.17
sys/netinet/ip_input.c  1.391,1.392
sys/netinet/wqinput.c   1.6
sys/netinet6/in6_gif.c  1.94
sys/netinet6/in6_l2tp.c 1.18
sys/netinet6/ip6_forward.c  1.97
sys/netinet6/ip6_input.c1.210,1.211
sys/netipsec/ipsec_output.c 1.82,1.83 (patched)
sys/netipsec/ipsecif.c  1.12,1.13,1.15,1.17 (patched)
sys/netipsec/key.c  1.259,1.260

ipsecif(4) support input drop packet counter.

ipsecif(4) should not increment drop counter by errors not related to if_snd. 
Pointed out by ozaki-r@n.o, thanks.
Remove unnecessary addresses in PF_KEY message.

MOBIKE Extensions for PF_KEY draft-schilcher-mobike-pfkey-extension-01.txt says

5.  SPD Update
// snip
   SADB_X_SPDADD:
// snip
  sadb_x_ipsecrequest_reqid:
 An ID for that SA can be passed to the kernel in the
 sadb_x_ipsecrequest_reqid field.
  If tunnel mode is specified, the sadb_x_ipsecrequest structure is
  followed by two sockaddr structures that define the tunnel
  endpoint addresses.  In the case that transport mode is used, no
  additional addresses are specified.

see: https://tools.ietf.org/html/draft-schilcher-mobike-pfkey-extension-01;>https://tools.ietf.org/html/draft-schilcher-mobike-pfkey-extension-01

ipsecif(4) uses transport mode, so it should not add addresses.

ipsecif(4) supports multiple peers in the same NAPT.

E.g. ipsec0 connects between NetBSD_A and NetBSD_B, ipsec1 connects
NetBSD_A and NetBSD_C at the following figure.
+--+
   +| NetBSD_B |
 +--+   +--+   |+--+
 | NetBSD_A |--- ... ---| NAPT |---+
 +--+   +--+   |+--+
   +| NetBSD_C |
+--+

Add ATF later.

l2tp(4): fix output bytes counter. Pointed by k-goda@IIJ, thanks.
remove a variable which is no longer used.

l2tp: initialize mowner variables for MBUFTRACE

Avoid having a rtcache directly in a percpu storage
percpu(9) has a certain memory storage for each CPU and provides it by the piece
to users.  If the storages went short, percpu(9) enlarges them by allocating new
larger memory areas, replacing old ones with them and destroying the old ones.
A percpu storage referenced by a pointer gotten via percpu_getref can be
destroyed by the mechanism after a running thread sleeps even if percpu_putref
has not been called.

Using rtcache, i.e., packet processing, typically involves sleepable operations
such as rwlock so we must avoid dereferencing a rtcache that is directly stored
in a percpu storage during packet processing.  Address this situation by having
just a pointer to a rtcache in a percpu storage instead.

Reviewed by knakahara@ and yamaguchi@

wqinput: avoid having struct wqinput_worklist directly in a percpu storage
percpu(9) has a certain memory storage for each CPU and provides it by the piece
to users.  If the storages went short, percpu(9) enlarges them by allocating new
larger memory areas, replacing old ones with them and destroying the old ones.

A percpu storage referenced by a pointer gotten via percpu_getref can be
destroyed by the mechanism after a running thread sleeps even if percpu_putref
has not been called.

Input handlers of wqinput normally involves sleepable operations so we must
avoid dereferencing a percpu data (struct wqinput_worklist) after executing
an input handler.  Address this situation by having just a pointer to the data
in a percpu storage 

CVS commit: [netbsd-8] src/sys

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:27:10 UTC 2019

Modified Files:
src/sys/net [netbsd-8]: if.c if.h if_gif.c if_gif.h if_ipsec.c
if_ipsec.h if_l2tp.c if_l2tp.h route.c route.h
src/sys/netinet [netbsd-8]: in_gif.c in_l2tp.c ip_input.c wqinput.c
src/sys/netinet6 [netbsd-8]: in6_gif.c in6_l2tp.c ip6_forward.c
ip6_input.c
src/sys/netipsec [netbsd-8]: ipsec_output.c ipsecif.c key.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1385):

sys/net/if.c1.461
sys/net/if.h1.277
sys/net/if_gif.c1.149
sys/net/if_gif.h1.33
sys/net/if_ipsec.c  1.19,1.20,1.24
sys/net/if_ipsec.h  1.5
sys/net/if_l2tp.c   1.33,1.36-1.39
sys/net/if_l2tp.h   1.7,1.8
sys/net/route.c 1.220,1.221
sys/net/route.h 1.125
sys/netinet/in_gif.c1.95
sys/netinet/in_l2tp.c   1.17
sys/netinet/ip_input.c  1.391,1.392
sys/netinet/wqinput.c   1.6
sys/netinet6/in6_gif.c  1.94
sys/netinet6/in6_l2tp.c 1.18
sys/netinet6/ip6_forward.c  1.97
sys/netinet6/ip6_input.c1.210,1.211
sys/netipsec/ipsec_output.c 1.82,1.83 (patched)
sys/netipsec/ipsecif.c  1.12,1.13,1.15,1.17 (patched)
sys/netipsec/key.c  1.259,1.260

ipsecif(4) support input drop packet counter.

ipsecif(4) should not increment drop counter by errors not related to if_snd. 
Pointed out by ozaki-r@n.o, thanks.
Remove unnecessary addresses in PF_KEY message.

MOBIKE Extensions for PF_KEY draft-schilcher-mobike-pfkey-extension-01.txt says

5.  SPD Update
// snip
   SADB_X_SPDADD:
// snip
  sadb_x_ipsecrequest_reqid:
 An ID for that SA can be passed to the kernel in the
 sadb_x_ipsecrequest_reqid field.
  If tunnel mode is specified, the sadb_x_ipsecrequest structure is
  followed by two sockaddr structures that define the tunnel
  endpoint addresses.  In the case that transport mode is used, no
  additional addresses are specified.

see: https://tools.ietf.org/html/draft-schilcher-mobike-pfkey-extension-01;>https://tools.ietf.org/html/draft-schilcher-mobike-pfkey-extension-01

ipsecif(4) uses transport mode, so it should not add addresses.

ipsecif(4) supports multiple peers in the same NAPT.

E.g. ipsec0 connects between NetBSD_A and NetBSD_B, ipsec1 connects
NetBSD_A and NetBSD_C at the following figure.
+--+
   +| NetBSD_B |
 +--+   +--+   |+--+
 | NetBSD_A |--- ... ---| NAPT |---+
 +--+   +--+   |+--+
   +| NetBSD_C |
+--+

Add ATF later.

l2tp(4): fix output bytes counter. Pointed by k-goda@IIJ, thanks.
remove a variable which is no longer used.

l2tp: initialize mowner variables for MBUFTRACE

Avoid having a rtcache directly in a percpu storage
percpu(9) has a certain memory storage for each CPU and provides it by the piece
to users.  If the storages went short, percpu(9) enlarges them by allocating new
larger memory areas, replacing old ones with them and destroying the old ones.
A percpu storage referenced by a pointer gotten via percpu_getref can be
destroyed by the mechanism after a running thread sleeps even if percpu_putref
has not been called.

Using rtcache, i.e., packet processing, typically involves sleepable operations
such as rwlock so we must avoid dereferencing a rtcache that is directly stored
in a percpu storage during packet processing.  Address this situation by having
just a pointer to a rtcache in a percpu storage instead.

Reviewed by knakahara@ and yamaguchi@

wqinput: avoid having struct wqinput_worklist directly in a percpu storage
percpu(9) has a certain memory storage for each CPU and provides it by the piece
to users.  If the storages went short, percpu(9) enlarges them by allocating new
larger memory areas, replacing old ones with them and destroying the old ones.

A percpu storage referenced by a pointer gotten via percpu_getref can be
destroyed by the mechanism after a running thread sleeps even if percpu_putref
has not been called.

Input handlers of wqinput normally involves sleepable operations so we must
avoid dereferencing a percpu data (struct wqinput_worklist) after executing
an input handler.  Address this situation by having just a pointer to the data
in a percpu storage 

CVS commit: [netbsd-9] src/doc

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:15:50 UTC 2019

Modified Files:
src/doc [netbsd-9]: CHANGES-9.0

Log Message:
Ticket #239


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-9.0

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



CVS commit: [netbsd-9] src/sys/dev/nvmm/x86

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:14:59 UTC 2019

Modified Files:
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_vmx.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #239):

sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.37

Always set hwcode on error. Useful for debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c

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



CVS commit: [netbsd-9] src/doc

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:15:50 UTC 2019

Modified Files:
src/doc [netbsd-9]: CHANGES-9.0

Log Message:
Ticket #239


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-9.0

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

Modified files:

Index: src/doc/CHANGES-9.0
diff -u src/doc/CHANGES-9.0:1.1.2.58 src/doc/CHANGES-9.0:1.1.2.59
--- src/doc/CHANGES-9.0:1.1.2.58	Tue Sep 24 03:11:58 2019
+++ src/doc/CHANGES-9.0	Tue Sep 24 18:15:50 2019
@@ -1,5 +1,5 @@
 
-# $NetBSD: CHANGES-9.0,v 1.1.2.58 2019/09/24 03:11:58 martin Exp $
+# $NetBSD: CHANGES-9.0,v 1.1.2.59 2019/09/24 18:15:50 martin Exp $
 
 A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30
 until the 9.0 release:
@@ -3956,3 +3956,8 @@ sys/netipsec/ipsecif.c1.17
 	and avoid having struct ifqueue directly in a percpu storage.
 	[ozaki-r, ticket #238]
 
+sys/dev/nvmm/x86/nvmm_x86_vmx.c			1.37
+
+	Always set hwcode on error. Useful for debugging.
+	[maxv, ticket #239]
+



CVS commit: [netbsd-9] src/sys/dev/nvmm/x86

2019-09-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Sep 24 18:14:59 UTC 2019

Modified Files:
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_vmx.c

Log Message:
Pull up following revision(s) (requested by maxv in ticket #239):

sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.37

Always set hwcode on error. Useful for debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/dev/nvmm/x86/nvmm_x86_vmx.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/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.1
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36	Sun Jun 16 18:30:31 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c	Tue Sep 24 18:14:59 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_vmx.c,v 1.36 2019/06/16 18:30:31 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_vmx.c,v 1.36.2.1 2019/09/24 18:14:59 martin Exp $	*/
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36 2019/06/16 18:30:31 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.1 2019/09/24 18:14:59 martin Exp $");
 
 #include 
 #include 
@@ -1106,6 +1106,13 @@ vmx_inkernel_advance(void)
 }
 
 static void
+vmx_exit_invalid(struct nvmm_exit *exit, uint64_t code)
+{
+	exit->u.inv.hwcode = code;
+	exit->reason = NVMM_EXIT_INVALID;
+}
+
+static void
 vmx_exit_exc_nmi(struct nvmm_machine *mach, struct nvmm_cpu *vcpu,
 struct nvmm_exit *exit)
 {
@@ -1124,7 +1131,7 @@ vmx_exit_exc_nmi(struct nvmm_machine *ma
 	return;
 
 error:
-	exit->reason = NVMM_EXIT_INVALID;
+	vmx_exit_invalid(exit, VMCS_EXITCODE_EXC_NMI);
 }
 
 static void
@@ -1689,13 +1696,6 @@ vmx_exit_epf(struct nvmm_machine *mach, 
 	NVMM_X64_STATE_CRS | NVMM_X64_STATE_MSRS);
 }
 
-static void
-vmx_exit_invalid(struct nvmm_exit *exit, uint64_t code)
-{
-	exit->u.inv.hwcode = code;
-	exit->reason = NVMM_EXIT_INVALID;
-}
-
 /* -- */
 
 static void
@@ -1940,7 +1940,7 @@ vmx_vcpu_run(struct nvmm_machine *mach, 
 		splx(s);
 
 		if (__predict_false(ret != 0)) {
-			exit->reason = NVMM_EXIT_INVALID;
+			vmx_exit_invalid(exit, -1);
 			break;
 		}
 		vmx_exit_evt(cpudata);



CVS commit: src/external/gpl2/xcvs/dist/src

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 17:23:06 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: ignore.c

Log Message:
Ignore our default core file pattern rather than one of another system.
"core" shows up as a path sometimes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/ignore.c

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



CVS commit: src/external/gpl2/xcvs/dist/src

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 17:23:06 UTC 2019

Modified Files:
src/external/gpl2/xcvs/dist/src: ignore.c

Log Message:
Ignore our default core file pattern rather than one of another system.
"core" shows up as a path sometimes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/ignore.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/gpl2/xcvs/dist/src/ignore.c
diff -u src/external/gpl2/xcvs/dist/src/ignore.c:1.3 src/external/gpl2/xcvs/dist/src/ignore.c:1.4
--- src/external/gpl2/xcvs/dist/src/ignore.c:1.3	Tue May 17 14:00:09 2016
+++ src/external/gpl2/xcvs/dist/src/ignore.c	Tue Sep 24 17:23:06 2019
@@ -8,7 +8,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.  */
 #include 
-__RCSID("$NetBSD: ignore.c,v 1.3 2016/05/17 14:00:09 christos Exp $");
+__RCSID("$NetBSD: ignore.c,v 1.4 2019/09/24 17:23:06 maya Exp $");
 
 /*
  * .cvsignore file support contributed by David G. Grubbs 
@@ -36,7 +36,7 @@ static int ign_size;			/* This many slot
 static int ign_hold = -1;		/* Index where first "temporary" item
 	 * is held */
 
-const char *ign_default = ". .. core RCSLOG tags TAGS RCS SCCS .make.state\
+const char *ign_default = ". .. *.core RCSLOG tags TAGS RCS SCCS .make.state\
  .nse_depinfo #* .#* cvslog.* ,* CVS.adm .del-* *.a *.olb *.o *.obj\
  *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$";
 extern const char *cvsDir;



CVS commit: src/sys/dev/fdt

2019-09-24 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Tue Sep 24 15:23:34 UTC 2019

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

Log Message:
Use correct #cells for parent address when decoding ranges


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/fdt/fdt_subr.c

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

Modified files:

Index: src/sys/dev/fdt/fdt_subr.c
diff -u src/sys/dev/fdt/fdt_subr.c:1.30 src/sys/dev/fdt/fdt_subr.c:1.31
--- src/sys/dev/fdt/fdt_subr.c:1.30	Fri Jun 14 11:08:18 2019
+++ src/sys/dev/fdt/fdt_subr.c	Tue Sep 24 15:23:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_subr.c,v 1.30 2019/06/14 11:08:18 hkenken Exp $ */
+/* $NetBSD: fdt_subr.c,v 1.31 2019/09/24 15:23:34 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.30 2019/06/14 11:08:18 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_subr.c,v 1.31 2019/09/24 15:23:34 jmcneill Exp $");
 
 #include "opt_fdt.h"
 
@@ -224,7 +224,7 @@ fdtbus_decode_range(int phandle, uint64_
 
 	const int addr_cells = fdtbus_get_addr_cells(phandle);
 	const int size_cells = fdtbus_get_size_cells(phandle);
-	const int paddr_cells = fdtbus_get_addr_cells(OF_parent(parent));
+	const int paddr_cells = fdtbus_get_addr_cells(parent);
 	if (addr_cells == -1 || size_cells == -1 || paddr_cells == -1)
 		return paddr;
 
@@ -237,6 +237,10 @@ fdtbus_decode_range(int phandle, uint64_
 		cl = fdtbus_get_cells(buf, size_cells);
 		buf += size_cells * 4;
 
+#ifdef FDTBUS_DEBUG
+		printf("%s: %s: cba=0x%#" PRIx64 ", pba=0x%#" PRIx64 ", cl=0x%#" PRIx64 "\n", __func__, fdt_get_name(fdtbus_get_data(), fdtbus_phandle2offset(phandle), NULL), cba, pba, cl);
+#endif
+
 		if (paddr >= cba && paddr < cba + cl)
 			return fdtbus_decode_range(parent, pba) + (paddr - cba);
 



CVS commit: src/sys/dev/fdt

2019-09-24 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Tue Sep 24 15:23:34 UTC 2019

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

Log Message:
Use correct #cells for parent address when decoding ranges


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/fdt/fdt_subr.c

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



CVS commit: src/sys/dev/pci

2019-09-24 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Tue Sep 24 14:39:38 UTC 2019

Modified Files:
src/sys/dev/pci: if_mcx.c

Log Message:
 Use IFM_50G_SR2.


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

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



CVS commit: src/sys/dev/pci

2019-09-24 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Tue Sep 24 14:39:38 UTC 2019

Modified Files:
src/sys/dev/pci: if_mcx.c

Log Message:
 Use IFM_50G_SR2.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/if_mcx.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/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.1 src/sys/dev/pci/if_mcx.c:1.2
--- src/sys/dev/pci/if_mcx.c:1.1	Sat Sep 21 14:04:12 2019
+++ src/sys/dev/pci/if_mcx.c	Tue Sep 24 14:39:38 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mcx.c,v 1.1 2019/09/21 14:04:12 jmcneill Exp $ */
+/*	$NetBSD: if_mcx.c,v 1.2 2019/09/24 14:39:38 msaitoh Exp $ */
 /*	$OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
 
 /*
@@ -2159,7 +2159,7 @@ static const uint64_t mcx_eth_cap_map[] 
 	IFM_40G_SR4,
 	IFM_40G_LR4,
 	0,
-	0, /* IFM_50G_SR2 */
+	IFM_50G_SR2,
 	0,
 	IFM_100G_CR4,
 	IFM_100G_SR4,



CVS commit: src/sys/arch/vax/include

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 14:26:33 UTC 2019

Modified Files:
src/sys/arch/vax/include: bus.h

Log Message:
Avoid duplicate PRIxBUSADDR and follow the likely intention, providing PRIxBSH.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/include/bus.h

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

Modified files:

Index: src/sys/arch/vax/include/bus.h
diff -u src/sys/arch/vax/include/bus.h:1.34 src/sys/arch/vax/include/bus.h:1.35
--- src/sys/arch/vax/include/bus.h:1.34	Mon Sep 23 16:17:58 2019
+++ src/sys/arch/vax/include/bus.h	Tue Sep 24 14:26:32 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.34 2019/09/23 16:17:58 skrll Exp $	*/
+/*	$NetBSD: bus.h,v 1.35 2019/09/24 14:26:32 maya Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -105,7 +105,7 @@ typedef psize_t bus_size_t;
 typedef	struct vax_bus_space *bus_space_tag_t;
 typedef	vaddr_t bus_space_handle_t;
 
-#define PRIxBUSADDR	PRIxVADDR
+#define PRIxBSH		PRIxVADDR
 
 struct vax_bus_space {
 	/* cookie */



CVS commit: src/sys/arch/vax/include

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 14:26:33 UTC 2019

Modified Files:
src/sys/arch/vax/include: bus.h

Log Message:
Avoid duplicate PRIxBUSADDR and follow the likely intention, providing PRIxBSH.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/include/bus.h

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



CVS commit: src/usr.sbin/postinstall

2019-09-24 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Tue Sep 24 13:27:39 UTC 2019

Modified Files:
src/usr.sbin/postinstall: postinstall.in

Log Message:
Add ${DEST_DIR} prefix to check target directory not host directory.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/postinstall/postinstall.in

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



CVS commit: src/usr.sbin/postinstall

2019-09-24 Thread Takeshi Nakayama
Module Name:src
Committed By:   nakayama
Date:   Tue Sep 24 13:27:39 UTC 2019

Modified Files:
src/usr.sbin/postinstall: postinstall.in

Log Message:
Add ${DEST_DIR} prefix to check target directory not host directory.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/postinstall/postinstall.in

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

Modified files:

Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.6 src/usr.sbin/postinstall/postinstall.in:1.7
--- src/usr.sbin/postinstall/postinstall.in:1.6	Thu Sep 12 21:56:55 2019
+++ src/usr.sbin/postinstall/postinstall.in	Tue Sep 24 13:27:39 2019
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall.in,v 1.6 2019/09/12 21:56:55 uwe Exp $
+# $NetBSD: postinstall.in,v 1.7 2019/09/24 13:27:39 nakayama Exp $
 #
 # Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -2254,7 +2254,7 @@ getarchsubdirs() {
 getcompatlibdirs() {
 	for i in $(getarchsubdirs); do
 		echo $i 1>&2
-		if [ -d /usr/lib/$i ]; then
+		if [ -d "${DEST_DIR}/usr/lib/$i" ]; then
 			echo /usr/lib/$i
 		fi
 	done



CVS commit: src/usr.sbin/intrctl

2019-09-24 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Sep 24 11:31:06 UTC 2019

Modified Files:
src/usr.sbin/intrctl: intrctl.8 intrctl.c

Log Message:
Merge single letter options in usage.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/intrctl/intrctl.8
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/intrctl/intrctl.c

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

Modified files:

Index: src/usr.sbin/intrctl/intrctl.8
diff -u src/usr.sbin/intrctl/intrctl.8:1.6 src/usr.sbin/intrctl/intrctl.8:1.7
--- src/usr.sbin/intrctl/intrctl.8:1.6	Mon Sep 23 20:15:31 2019
+++ src/usr.sbin/intrctl/intrctl.8	Tue Sep 24 11:31:06 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: intrctl.8,v 1.6 2019/09/23 20:15:31 mrg Exp $
+.\" $NetBSD: intrctl.8,v 1.7 2019/09/24 11:31:06 wiz Exp $
 .\"
 .\" Copyright (c) 2015 Internet Initiative Japan Inc.
 .\" All rights reserved.
@@ -56,7 +56,7 @@ enable to set an interrupt's affinity to
 If
 .Ar cpu_index
 is already enabled, this command has no effect.
-.It list Oo Fl c Oc Oo Fl w Ar wait Oc Op Fl z
+.It list Oo Fl cz Oc Oo Fl w Ar wait Oc
 for each intrid in the system, display interrupt counts per CPU.
 The intrid is an interrupt name such as "ioapic0 pin 22" for x86.
 .Pp

Index: src/usr.sbin/intrctl/intrctl.c
diff -u src/usr.sbin/intrctl/intrctl.c:1.10 src/usr.sbin/intrctl/intrctl.c:1.11
--- src/usr.sbin/intrctl/intrctl.c:1.10	Mon Sep 23 20:15:31 2019
+++ src/usr.sbin/intrctl/intrctl.c	Tue Sep 24 11:31:06 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: intrctl.c,v 1.10 2019/09/23 20:15:31 mrg Exp $	*/
+/*	$NetBSD: intrctl.c,v 1.11 2019/09/24 11:31:06 wiz Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: intrctl.c,v 1.10 2019/09/23 20:15:31 mrg Exp $");
+__RCSID("$NetBSD: intrctl.c,v 1.11 2019/09/24 11:31:06 wiz Exp $");
 
 #include 
 #include 
@@ -99,7 +99,7 @@ usage(void)
 {
 	const char *progname = getprogname();
 
-	fprintf(stderr, "usage: %s list [-c] [-w secs] [-z]\n", progname);
+	fprintf(stderr, "usage: %s list [-cz] [-w secs]\n", progname);
 	fprintf(stderr, "   %s affinity -i interrupt_name -c cpu_index\n",
 	progname);
 	fprintf(stderr, "   %s intr -c cpu_index\n", progname);



CVS commit: src/usr.sbin/intrctl

2019-09-24 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Tue Sep 24 11:31:06 UTC 2019

Modified Files:
src/usr.sbin/intrctl: intrctl.8 intrctl.c

Log Message:
Merge single letter options in usage.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/intrctl/intrctl.8
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/intrctl/intrctl.c

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