CVS commit: src/sys/fs/hfs

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Fri Jul 24 05:26:37 UTC 2020

Modified Files:
src/sys/fs/hfs: hfs.h

Log Message:
Replace the */ I accidentally removed in the last commit


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/fs/hfs/hfs.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/fs/hfs/hfs.h
diff -u src/sys/fs/hfs/hfs.h:1.11 src/sys/fs/hfs/hfs.h:1.12
--- src/sys/fs/hfs/hfs.h:1.11	Thu Jul 23 19:26:34 2020
+++ src/sys/fs/hfs/hfs.h	Fri Jul 24 05:26:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: hfs.h,v 1.11 2020/07/23 19:26:34 skrll Exp $	*/
+/*	$NetBSD: hfs.h,v 1.12 2020/07/24 05:26:37 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
 #ifdef HFS_DEBUG
 	#if defined(_KERNEL)
 		#include "opt_ddb.h"
-	#endif /* defined(_KERNEL_)
+	#endif /* defined(_KERNEL_) */
 #endif /* HFS_DEBUG */
 
 #include

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-23 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Jul 24 03:57:21 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c

Log Message:
Use proper args for dixLookupResourceByType() to get defcolormap.

Botched in mechanical 1.20 updates.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2	Thu Jul 23 18:14:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Fri Jul 24 03:57:21 2020
@@ -197,7 +197,7 @@ sunUninstallColormap(ColormapPtr cmap)
 	if (cmap->mid != defMapID) {
 	ColormapPtr defMap;
 	dixLookupResourceByType((void **), defMapID, RT_COLORMAP,
-NullClient, DixUnknownAccess);
+serverClient, DixUseAccess);
 
 	if (defMap)
 		(*cmap->pScreen->InstallColormap)(defMap);

CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun

2020-07-23 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Fri Jul 24 02:25:58 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun

Log Message:
Explicitly disable dbe, record, and present DIX extentions.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun

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/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.3
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2	Thu Jul 23 09:59:36 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Fri Jul 24 02:25:58 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
+#	$NetBSD: Makefile.Xsun,v 1.3 2020/07/24 02:25:58 tsutsui Exp $
 
 .include 
 
@@ -73,11 +73,10 @@ SRCS+=  stubs.c
 SRCS+=	fbcmap_mi.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/sun \
-		-I${DESTDIR}${X11INCDIR}/xorg \
 		${X11INCS.DIX}
 
 CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
-
+CPPFLAGS+=	-UDBE -UXRECORD -UPRESENT
 CPPFLAGS+=	-UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
 		-UXF86DRI -UXF86BIGFONT
 
@@ -90,9 +89,7 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xkbstubs} \
 	${LDADD.randr} \
 	${LDADD.Xext} \
-	${LDADD.dbe} \
 	${LDADD.composite} \
-	${LDADD.record} \
 	${LDADD.render} \
 	${LDADD.os} \
 	${LDADD.xfixes} \
@@ -100,7 +97,6 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.miext/damage} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
-	${LDADD.present} \
 	-lXfont2 \
 	-lpixman-1 \
 	-lX11 \
@@ -113,9 +109,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xkb} \
 	${DPADD.randr} \
 	${DPADD.Xext} \
-	${DPADD.dbe} \
 	${DPADD.composite} \
-	${DPADD.record} \
 	${DPADD.render} \
 	${DPADD.os} \
 	${DPADD.xfixes} \
@@ -123,10 +117,8 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.miext/damage} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
-	${DPADD.present} \
 	${LIBXFONT2} \
 	${LIBPIXMAN-1} \
-	${LIBXEXT} \
 	${LIBX11} \
 	${LIBZ} \
 	${LIBM}

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-23 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Jul 24 02:20:20 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunInit.c

Log Message:
Apply upstream "free the EQ allocated memory on shutdown" fixes.

This should be updated before 1.20 import:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=87d4f90bfcb509471ac9e7886e14a92b33223fd7


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.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/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c	Fri Jul 24 02:20:20 2020
@@ -664,6 +664,7 @@ InitInput(int argc, char **argv)
 void
 CloseInput(void)
 {
+mieqFini();
 }
 
 #if SUNMAXDEPTH == 8

CVS commit: src/usr.bin/make

2020-07-23 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Thu Jul 23 20:24:22 UTC 2020

Modified Files:
src/usr.bin/make: var.c

Log Message:
make(1): only set missing_delim if it is actually missing

Just to make it easier to understand the code.


To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/usr.bin/make/var.c

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

Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.297 src/usr.bin/make/var.c:1.298
--- src/usr.bin/make/var.c:1.297	Thu Jul 23 19:49:39 2020
+++ src/usr.bin/make/var.c	Thu Jul 23 20:24:22 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.297 2020/07/23 19:49:39 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.298 2020/07/23 20:24:22 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.297 2020/07/23 19:49:39 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.298 2020/07/23 20:24:22 rillig Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.297 2020/07/23 19:49:39 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.298 2020/07/23 20:24:22 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2086,7 +2086,7 @@ typedef struct {
 const char *cp;		/* Secondary pointer into str (place marker
  * for tstr) */
 char termc;			/* Character which terminated scan */
-char delim;
+char missing_delim;		/* For error reporting */
 int modifier;		/* that we are processing */
 Var_Parse_State parsestate;	/* Flags passed to helper functions */
 
@@ -2109,21 +2109,24 @@ ApplyModifier_Loop(ApplyModifiersState *
 
 args.ctx = st->ctxt;
 st->cp = ++st->tstr;
-st->delim = '@';
-args.tvar = ParseModifierPart(st->ctxt, >cp, st->delim,
+char delim = '@';
+args.tvar = ParseModifierPart(st->ctxt, >cp, delim,
   st->eflags | VARE_NOSUBST,
   NULL, NULL, NULL);
-if (args.tvar == NULL)
+if (args.tvar == NULL) {
+	st->missing_delim = delim;
 	return FALSE;
+}
 
-args.str = ParseModifierPart(st->ctxt, >cp, st->delim,
+args.str = ParseModifierPart(st->ctxt, >cp, delim,
  st->eflags | VARE_NOSUBST,
  NULL, NULL, NULL);
-if (args.str == NULL)
+if (args.str == NULL) {
+	st->missing_delim = delim;
 	return FALSE;
+}
 
 st->termc = *st->cp;
-st->delim = '\0';
 
 args.eflags = st->eflags & (VARE_UNDEFERR | VARE_WANTRES);
 int prev_sep = st->parsestate.varSpace;
@@ -2286,12 +2289,14 @@ ApplyModifier_Path(ApplyModifiersState *
 static Boolean
 ApplyModifier_Exclam(ApplyModifiersState *st)
 {
-st->delim = '!';
 st->cp = ++st->tstr;
-char *cmd = ParseModifierPart(st->ctxt, >cp, st->delim, st->eflags,
+char delim = '!';
+char *cmd = ParseModifierPart(st->ctxt, >cp, delim, st->eflags,
   NULL, NULL, NULL);
-if (cmd == NULL)
+if (cmd == NULL) {
+	st->missing_delim = delim;
 	return FALSE;
+}
 
 const char *emsg = NULL;
 if (st->eflags & VARE_WANTRES)
@@ -2304,7 +2309,6 @@ ApplyModifier_Exclam(ApplyModifiersState
 	Error(emsg, st->nstr);
 
 st->termc = *st->cp;
-st->delim = '\0';
 if (st->v->flags & VAR_JUNK)
 	st->v->flags |= VAR_KEEP;
 return TRUE;
@@ -2419,7 +2423,7 @@ ApplyModifier_Subst(ApplyModifiersState 
 {
 ModifyWord_SubstArgs args;
 Var_Parse_State tmpparsestate = st->parsestate;
-st->delim = st->tstr[1];
+char delim = st->tstr[1];
 st->tstr += 2;
 
 /*
@@ -2433,16 +2437,20 @@ ApplyModifier_Subst(ApplyModifiersState 
 }
 
 st->cp = st->tstr;
-char *lhs = ParseModifierPart(st->ctxt, >cp, st->delim, st->eflags,
+char *lhs = ParseModifierPart(st->ctxt, >cp, delim, st->eflags,
   , , NULL);
-if (lhs == NULL)
+if (lhs == NULL) {
+	st->missing_delim = delim;
 	return FALSE;
+}
 args.lhs = lhs;
 
-char *rhs = ParseModifierPart(st->ctxt, >cp, st->delim, st->eflags,
+char *rhs = ParseModifierPart(st->ctxt, >cp, delim, st->eflags,
   NULL, , );
-if (rhs == NULL)
+if (rhs == NULL) {
+	st->missing_delim = delim;
 	return FALSE;
+}
 args.rhs = rhs;
 
 /*
@@ -2471,7 +2479,6 @@ ApplyModifier_Subst(ApplyModifiersState 
 
 free(lhs);
 free(rhs);
-st->delim = '\0';
 return TRUE;
 }
 
@@ -2493,7 +2500,7 @@ ApplyModifier_Regex(ApplyModifiersState 
 char *re = ParseModifierPart(st->ctxt, >cp, delim,
  st->eflags, NULL, NULL, NULL);
 if (re == NULL) {
-	st->delim = delim;
+	st->missing_delim = delim;
 	return FALSE;
 }
 
@@ -2501,7 +2508,7 @@ ApplyModifier_Regex(ApplyModifiersState 
  st->eflags, NULL, NULL, NULL);
 if (args.replace == NULL) {
 	free(re);
-	st->delim = delim;
+	st->missing_delim = delim;
 	return FALSE;
 }
 
@@ -2658,14 +2665,15 @@ static int

CVS commit: src/usr.bin/make

2020-07-23 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Thu Jul 23 19:49:39 UTC 2020

Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: modmisc.exp

Log Message:
make(1): fix wrong warning about missing delimiter


To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/usr.bin/make/var.c
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/make/unit-tests/modmisc.exp

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

Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.296 src/usr.bin/make/var.c:1.297
--- src/usr.bin/make/var.c:1.296	Thu Jul 23 19:32:54 2020
+++ src/usr.bin/make/var.c	Thu Jul 23 19:49:39 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.297 2020/07/23 19:49:39 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.297 2020/07/23 19:49:39 rillig Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.297 2020/07/23 19:49:39 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -2485,20 +2485,23 @@ ApplyModifier_Regex(ApplyModifiersState 
 
 args.pflags = 0;
 Var_Parse_State tmpparsestate = st->parsestate;
-st->delim = st->tstr[1];
+char delim = st->tstr[1];
 st->tstr += 2;
 
 st->cp = st->tstr;
 
-char *re = ParseModifierPart(st->ctxt, >cp, st->delim,
+char *re = ParseModifierPart(st->ctxt, >cp, delim,
  st->eflags, NULL, NULL, NULL);
-if (re == NULL)
+if (re == NULL) {
+	st->delim = delim;
 	return FALSE;
+}
 
-args.replace = ParseModifierPart(st->ctxt, >cp, st->delim,
+args.replace = ParseModifierPart(st->ctxt, >cp, delim,
  st->eflags, NULL, NULL, NULL);
 if (args.replace == NULL) {
 	free(re);
+	st->delim = delim;
 	return FALSE;
 }
 
@@ -2539,7 +2542,6 @@ ApplyModifier_Regex(ApplyModifiersState 
 regfree();
 free(args.replace);
 free(args.matches);
-st->delim = '\0';
 return TRUE;
 }
 #endif

Index: src/usr.bin/make/unit-tests/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.26 src/usr.bin/make/unit-tests/modmisc.exp:1.27
--- src/usr.bin/make/unit-tests/modmisc.exp:1.26	Thu Jul 23 19:46:55 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp	Thu Jul 23 19:49:39 2020
@@ -29,7 +29,6 @@ mod-C:
 :a b b c:
 : b c:
 make: RE substitution error: (details omitted)
-make: Unclosed substitution for  (, missing)
 :C,word,,:Q}:
 :a c:
 :x__ 3 x__ 3:
@@ -74,7 +73,6 @@ mod-C-limits:22-missing:1 6
 mod-C-limits:22-ok:1 33 556
 mod-C-limits:capture:ihgfedcbaabcdefghijABCDEFGHIJa0a1a2rest
 make: RE substitution error: (details omitted)
-make: Unclosed substitution for UNDEF (, missing)
 mod-C-errors:
 mod-assign: first=1.
 mod-assign: last=3.

CVS commit: src/usr.bin/make/unit-tests

2020-07-23 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Thu Jul 23 19:46:55 UTC 2020

Modified Files:
src/usr.bin/make/unit-tests: modmisc.exp modmisc.mk

Log Message:
make(1): demonstrate wrong error message about missing delimiter

The current practice of setting st->delim at the beginning of each
modifier and resetting it again at the end produces too many error
messages.  In this case, there is no missing delimiter.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/make/unit-tests/modmisc.exp
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/make/unit-tests/modmisc.mk

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

Modified files:

Index: src/usr.bin/make/unit-tests/modmisc.exp
diff -u src/usr.bin/make/unit-tests/modmisc.exp:1.25 src/usr.bin/make/unit-tests/modmisc.exp:1.26
--- src/usr.bin/make/unit-tests/modmisc.exp:1.25	Tue Jul 21 23:19:46 2020
+++ src/usr.bin/make/unit-tests/modmisc.exp	Thu Jul 23 19:46:55 2020
@@ -73,6 +73,9 @@ make: No subexpression \2
 mod-C-limits:22-missing:1 6
 mod-C-limits:22-ok:1 33 556
 mod-C-limits:capture:ihgfedcbaabcdefghijABCDEFGHIJa0a1a2rest
+make: RE substitution error: (details omitted)
+make: Unclosed substitution for UNDEF (, missing)
+mod-C-errors:
 mod-assign: first=1.
 mod-assign: last=3.
 mod-assign: appended=1 2 3.

Index: src/usr.bin/make/unit-tests/modmisc.mk
diff -u src/usr.bin/make/unit-tests/modmisc.mk:1.20 src/usr.bin/make/unit-tests/modmisc.mk:1.21
--- src/usr.bin/make/unit-tests/modmisc.mk:1.20	Tue Jul 21 23:19:46 2020
+++ src/usr.bin/make/unit-tests/modmisc.mk	Thu Jul 23 19:46:55 2020
@@ -1,4 +1,4 @@
-# $Id: modmisc.mk,v 1.20 2020/07/21 23:19:46 rillig Exp $
+# $Id: modmisc.mk,v 1.21 2020/07/23 19:46:55 rillig Exp $
 #
 # miscellaneous modifier tests
 
@@ -19,6 +19,7 @@ all:	modvar modvarloop modsysv mod-HTE e
 all:	mod-S mod-C mod-at-varname mod-at-resolve mod-at-dollar
 all:	mod-subst-dollar mod-loop-dollar
 all:	mod-C-limits
+all:	mod-C-errors
 all:	mod-assign
 all:	mod-assign-nested
 all:	mod-tu-space
@@ -153,6 +154,9 @@ mod-C-limits:
 	# which is more than enough for daily use.
 	@echo $@:capture:${:UabcdefghijABCDEFGHIJrest:C,(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.),\9\8\7\6\5\4\3\2\1\0\10\11\12,}
 
+mod-C-errors:
+	@echo $@: ${UNDEF:Uvalue:C,[,,}
+
 # Just a bit of basic code coverage for the obscure ::= assignment modifiers.
 mod-assign:
 	@echo $@: ${1 2 3:L:@i@${FIRST::?=$i}@} first=${FIRST}.

CVS commit: src/usr.bin/make

2020-07-23 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Thu Jul 23 19:32:54 UTC 2020

Modified Files:
src/usr.bin/make: var.c

Log Message:
make(1): reduce code size on x86_64


To generate a diff of this commit:
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/make/var.c

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

Modified files:

Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.295 src/usr.bin/make/var.c:1.296
--- src/usr.bin/make/var.c:1.295	Tue Jul 21 23:47:50 2020
+++ src/usr.bin/make/var.c	Thu Jul 23 19:32:54 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.295 2020/07/21 23:47:50 rillig Exp $	*/
+/*	$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.295 2020/07/21 23:47:50 rillig Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.295 2020/07/21 23:47:50 rillig Exp $");
+__RCSID("$NetBSD: var.c,v 1.296 2020/07/23 19:32:54 rillig Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -1566,9 +1566,7 @@ VarSelectWords(Var_Parse_State *vpstate,
 	step = 1;
 }
 
-for (i = start;
-	 (step < 0 && i >= end) || (step > 0 && i < end);
-	 i += step) {
+for (i = start; (step < 0) == (i >= end); i += step) {
 	if (av[i][0] != '\0') {
 	SepBuf_AddBytes(, av[i], strlen(av[i]));
 	SepBuf_Sep();

CVS commit: src/sys/fs/hfs

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:26:34 UTC 2020

Modified Files:
src/sys/fs/hfs: hfs.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/hfs/hfs.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/fs/hfs/hfs.h
diff -u src/sys/fs/hfs/hfs.h:1.10 src/sys/fs/hfs/hfs.h:1.11
--- src/sys/fs/hfs/hfs.h:1.10	Thu Jul 23 19:26:00 2020
+++ src/sys/fs/hfs/hfs.h	Thu Jul 23 19:26:34 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: hfs.h,v 1.10 2020/07/23 19:26:00 skrll Exp $	*/
+/*	$NetBSD: hfs.h,v 1.11 2020/07/23 19:26:34 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -41,9 +41,9 @@
 /*#define HFS_DEBUG*/
 
 #ifdef HFS_DEBUG
-	#if defined(_KERNEL) && !defined(_LKM)
+	#if defined(_KERNEL)
 		#include "opt_ddb.h"
-	#endif /* defined(_KERNEL_) && !defined(_LKM) */
+	#endif /* defined(_KERNEL_)
 #endif /* HFS_DEBUG */
 
 #include

CVS commit: src/sys/fs/hfs

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:26:00 UTC 2020

Modified Files:
src/sys/fs/hfs: hfs.h

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/fs/hfs/hfs.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/fs/hfs/hfs.h
diff -u src/sys/fs/hfs/hfs.h:1.9 src/sys/fs/hfs/hfs.h:1.10
--- src/sys/fs/hfs/hfs.h:1.9	Sun Aug 10 08:53:22 2014
+++ src/sys/fs/hfs/hfs.h	Thu Jul 23 19:26:00 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: hfs.h,v 1.9 2014/08/10 08:53:22 hannken Exp $	*/
+/*	$NetBSD: hfs.h,v 1.10 2020/07/23 19:26:00 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -27,8 +27,8 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- */ 
- 
+ */
+
 #ifndef _FS_HFS_HFS_H_
 #define _FS_HFS_HFS_H_
 
@@ -87,7 +87,7 @@ struct hfsnode {
 			hfs_cnid_t		cnid;
 		} u; /* convenience for accessing common record info */
 	} h_rec; /* catalog record for this hnode */
-	
+
 	/*
 	 * We cache this vnode's parent CNID here upon vnode creation (i.e., during
 	 * hfs_vop_vget()) for quick access without needing to search the catalog.

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:25:14 UTC 2020

Modified Files:
src/sys/arch/epoc32/include: intr.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/include/intr.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/epoc32/include/intr.h
diff -u src/sys/arch/epoc32/include/intr.h:1.1 src/sys/arch/epoc32/include/intr.h:1.2
--- src/sys/arch/epoc32/include/intr.h:1.1	Sun Apr 28 12:11:26 2013
+++ src/sys/arch/epoc32/include/intr.h	Thu Jul 23 19:25:14 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $	*/
+/*	$NetBSD: intr.h,v 1.2 2020/07/23 19:25:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -66,21 +66,11 @@
 
 #include 
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #define PIC_MAXSOURCES		16
 #define PIC_MAXMAXSOURCES	16
 
 #include 
 
-#endif /* _LKM */
-
 #define	splsoft()	_splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:24:39 UTC 2020

Modified Files:
src/sys/arch/zaurus/include: intr.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/include/intr.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/zaurus/include/intr.h
diff -u src/sys/arch/zaurus/include/intr.h:1.9 src/sys/arch/zaurus/include/intr.h:1.10
--- src/sys/arch/zaurus/include/intr.h:1.9	Sun Jul 27 08:55:39 2014
+++ src/sys/arch/zaurus/include/intr.h	Thu Jul 23 19:24:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.9 2014/07/27 08:55:39 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.10 2020/07/23 19:24:38 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -68,14 +68,6 @@
 
 #include 
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -119,8 +111,6 @@ void	splx(int);
 
 #endif	/* ARM_INTR_IMPL */
 
-#endif /* _LKM */
-
 #define	splsoft()	_splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:23:27 UTC 2020

Modified Files:
src/sys/arch/alpha/include: pmap.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/alpha/include/pmap.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/alpha/include/pmap.h
diff -u src/sys/arch/alpha/include/pmap.h:1.81 src/sys/arch/alpha/include/pmap.h:1.82
--- src/sys/arch/alpha/include/pmap.h:1.81	Sat Mar 14 14:05:42 2020
+++ src/sys/arch/alpha/include/pmap.h	Thu Jul 23 19:23:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.81 2020/03/14 14:05:42 ad Exp $ */
+/* $NetBSD: pmap.h,v 1.82 2020/07/23 19:23:27 skrll Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -188,7 +188,6 @@ typedef struct pv_entry {
 #define	_PMAP_MAY_USE_PROM_CONSOLE
 #endif
 
-#ifndef _LKM
 #if defined(MULTIPROCESSOR)
 struct cpu_info;
 struct trapframe;
@@ -206,7 +205,6 @@ void	pmap_do_tlb_shootdown(struct cpu_in
 #define	PMAP_TLB_SHOOTDOWN(pm, va, pte)		/* nothing */
 #define	PMAP_TLB_SHOOTNOW()			/* nothing */
 #endif /* MULTIPROCESSOR */
-#endif /* _LKM */
 
 #define	pmap_resident_count(pmap)	((pmap)->pm_stats.resident_count)
 #define	pmap_wired_count(pmap)		((pmap)->pm_stats.wired_count)

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:23:49 UTC 2020

Modified Files:
src/sys/arch/iyonix/include: intr.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/iyonix/include/intr.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/iyonix/include/intr.h
diff -u src/sys/arch/iyonix/include/intr.h:1.10 src/sys/arch/iyonix/include/intr.h:1.11
--- src/sys/arch/iyonix/include/intr.h:1.10	Sun Jun 10 13:15:24 2012
+++ src/sys/arch/iyonix/include/intr.h	Thu Jul 23 19:23:49 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.10 2012/06/10 13:15:24 skrll Exp $	*/
+/*	$NetBSD: intr.h,v 1.11 2020/07/23 19:23:49 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -66,14 +66,6 @@
 
 #ifndef _LOCORE
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -118,8 +110,6 @@ void	splx(int);
 
 #endif	/* ARM_INTR_IMPL */
 
-#endif /* _LKM */
-
 typedef uint8_t ipl_t;
 typedef struct {
 	ipl_t _ipl;

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:22:13 UTC 2020

Modified Files:
src/sys/arch/mips/include: locore.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/arch/mips/include/locore.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/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.108 src/sys/arch/mips/include/locore.h:1.109
--- src/sys/arch/mips/include/locore.h:1.108	Thu Jul 23 19:20:02 2020
+++ src/sys/arch/mips/include/locore.h	Thu Jul 23 19:22:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.108 2020/07/23 19:20:02 skrll Exp $ */
+/* $NetBSD: locore.h,v 1.109 2020/07/23 19:22:13 skrll Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -28,7 +28,7 @@
 #ifndef _MIPS_LOCORE_H
 #define _MIPS_LOCORE_H
 
-#if !defined(_LKM) && defined(_KERNEL_OPT)
+#if defined(_KERNEL_OPT)
 #include "opt_cputype.h"
 #endif
 
@@ -51,7 +51,7 @@ typedef uint32_t pt_entry_t;
 
 #ifdef _KERNEL
 
-#if defined(_MODULAR) || defined(_LKM) || defined(_STANDALONE)
+#if defined(_MODULAR) || defined(_STANDALONE)
 /* Assume all CPU architectures are valid for LKM's and standlone progs */
 #if !defined(__mips_n32) && !defined(__mips_n64)
 #define	MIPS1		1
@@ -64,7 +64,7 @@ typedef uint32_t pt_entry_t;
 #endif
 #define	MIPS64		1
 #define	MIPS64R2	1
-#endif /* _MODULAR || _LKM || _STANDALONE */
+#endif /* _MODULAR || _STANDALONE */
 
 #if (MIPS1 + MIPS3 + MIPS4 + MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) == 0
 #error at least one of MIPS1, MIPS3, MIPS4, MIPS32, MIPS32R2, MIPS64, or MIPS64R2 must be specified

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:21:23 UTC 2020

Modified Files:
src/sys/arch/i386/include: byte_swap.h

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/i386/include/byte_swap.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/i386/include/byte_swap.h
diff -u src/sys/arch/i386/include/byte_swap.h:1.15 src/sys/arch/i386/include/byte_swap.h:1.16
--- src/sys/arch/i386/include/byte_swap.h:1.15	Mon Apr 28 20:23:24 2008
+++ src/sys/arch/i386/include/byte_swap.h	Thu Jul 23 19:21:23 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: byte_swap.h,v 1.15 2008/04/28 20:23:24 martin Exp $	*/
+/*	$NetBSD: byte_swap.h,v 1.16 2020/07/23 19:21:23 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@ static __inline uint16_t __byte_swap_u16
 static __inline uint16_t
 __byte_swap_u16_variable(uint16_t x)
 {
-	__asm volatile ("rorw $8, %w1" : "=r" (x) : "0" (x)); 
+	__asm volatile ("rorw $8, %w1" : "=r" (x) : "0" (x));
 	return (x);
 }

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:20:03 UTC 2020

Modified Files:
src/sys/arch/mips/include: locore.h

Log Message:
Trailing whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/mips/include/locore.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/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.107 src/sys/arch/mips/include/locore.h:1.108
--- src/sys/arch/mips/include/locore.h:1.107	Sun Jun 14 06:50:31 2020
+++ src/sys/arch/mips/include/locore.h	Thu Jul 23 19:20:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.107 2020/06/14 06:50:31 simonb Exp $ */
+/* $NetBSD: locore.h,v 1.108 2020/07/23 19:20:02 skrll Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -402,7 +402,7 @@ struct mips_jump_fixup_info {
 	uint32_t jfi_stub;
 	uint32_t jfi_real;
 };
- 
+
 void	fixup_splcalls(void);/* splstubs.c */
 bool	mips_fixup_exceptions(mips_fixup_callback_t, void *);
 bool	mips_fixup_zero_relative(int32_t, uint32_t [2], void *);

CVS commit: src/sys/uvm

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:07:01 UTC 2020

Modified Files:
src/sys/uvm: uvm_param.h

Log Message:
unifdef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/uvm/uvm_param.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/uvm/uvm_param.h
diff -u src/sys/uvm/uvm_param.h:1.40 src/sys/uvm/uvm_param.h:1.41
--- src/sys/uvm/uvm_param.h:1.40	Thu Jun 25 18:20:18 2020
+++ src/sys/uvm/uvm_param.h	Thu Jul 23 19:07:01 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_param.h,v 1.40 2020/06/25 18:20:18 jdolecek Exp $	*/
+/*	$NetBSD: uvm_param.h,v 1.41 2020/07/23 19:07:01 skrll Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -133,11 +133,11 @@
 
 /*
  * If MIN_PAGE_SIZE and MAX_PAGE_SIZE are not equal, then we must use
- * non-constant PAGE_SIZE, et al for LKMs.
+ * non-constant PAGE_SIZE, et al for modules.
  */
 #if (MIN_PAGE_SIZE != MAX_PAGE_SIZE)
 #define	__uvmexp_pagesize
-#if defined(_LKM) || defined(_MODULE)
+#if defined(_MODULE)
 #undef PAGE_SIZE
 #undef PAGE_MASK
 #undef PAGE_SHIFT

CVS commit: src/sys/arch

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 19:04:03 UTC 2020

Modified Files:
src/sys/arch/evbarm/include: intr.h
src/sys/arch/hpcarm/include: intr.h

Log Message:
unidef -U_LKM


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/include/intr.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcarm/include/intr.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/evbarm/include/intr.h
diff -u src/sys/arch/evbarm/include/intr.h:1.26 src/sys/arch/evbarm/include/intr.h:1.27
--- src/sys/arch/evbarm/include/intr.h:1.26	Thu Mar 13 23:48:38 2014
+++ src/sys/arch/evbarm/include/intr.h	Thu Jul 23 19:04:03 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.26 2014/03/13 23:48:38 matt Exp $	*/
+/*	$NetBSD: intr.h,v 1.27 2020/07/23 19:04:03 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -71,14 +71,6 @@
 
 #include 
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -122,8 +114,6 @@ void	splx(int);
 
 #endif	/* ARM_INTR_IMPL */
 
-#endif /* _LKM */
-
 typedef uint8_t ipl_t;
 typedef struct {
 	ipl_t _ipl;

Index: src/sys/arch/hpcarm/include/intr.h
diff -u src/sys/arch/hpcarm/include/intr.h:1.19 src/sys/arch/hpcarm/include/intr.h:1.20
--- src/sys/arch/hpcarm/include/intr.h:1.19	Tue Feb  4 18:51:16 2014
+++ src/sys/arch/hpcarm/include/intr.h	Thu Jul 23 19:04:03 2020
@@ -1,4 +1,4 @@
-/* 	$NetBSD: intr.h,v 1.19 2014/02/04 18:51:16 matt Exp $	*/
+/* 	$NetBSD: intr.h,v 1.20 2020/07/23 19:04:03 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -72,14 +72,6 @@
 
 #include 
 
-#if defined(_LKM)
-
-int	_splraise(int);
-int	_spllower(int);
-void	splx(int);
-
-#else	/* _LKM */
-
 #include "opt_arm_intr_impl.h"
 
 #if defined(ARM_INTR_IMPL)
@@ -124,8 +116,6 @@ void	splx(int);
 
 #endif	/* ARM_INTR_IMPL */
 
-#endif	/* _LKM */
-
 #define splsoft()	_splraise(IPL_SOFT)
 
 typedef uint8_t ipl_t;

CVS commit: xsrc/external/mit/xorg-server/dist/hw/sun

2020-07-23 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Jul 23 18:14:36 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c

Log Message:
Use proper ANSI offsetof(3) to specify framebuffer offset in struct.

Fixes build error on sparc64.  No binary change on sun3.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.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/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.1 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.1	Wed Jul 22 20:38:29 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Thu Jul 23 18:14:36 2020
@@ -418,7 +418,7 @@ sunCG2Init(
 	ret = sunInitCommon (screen, pScreen, (off_t) 0,
 			sunCfbScreenInit, CG2ScreenInit,
 			fbCreateDefColormap, CG2SaveScreen,
-			(int) &((struct cg2memfb *) 0)->pixplane);
+			offsetof(struct cg2memfb, pixplane));
 	((CG2Ptr) sunFbs[screen].fb)->regs.ppmask.reg = 0xFF;
 #ifndef LOWMEMFTPT
 }
@@ -436,7 +436,7 @@ typedef struct {
 u_char mpixel[CG4_MELEN];		/* bit-per-pixel memory */
 u_char epixel[CG4_MELEN];		/* enable plane */
 u_char cpixel[CG4_HEIGHT][CG4_WIDTH];	/* byte-per-pixel memory */
-} *CG4Ptr;
+} *CG4Ptr, CG4Rec;
 
 static void
 CG4Switch(ScreenPtr pScreen, int select)
@@ -462,7 +462,7 @@ sunCG4Init(
 	sunFbs[screen].EnterLeave = CG4Switch;
 return sunInitCommon (screen, pScreen, (off_t) 0,
 	sunCfbScreenInit, CGScreenInit,
-	fbCreateDefColormap, sunSaveScreen, (int) ((CG4Ptr) 0)->cpixel);
+	fbCreateDefColormap, sunSaveScreen, offsetof(CG4Rec, cpixel));
 }
 
 #ifdef FBTYPE_SUNFAST_COLOR /* { */

CVS commit: src/sys/arch/sparc64/sparc64

2020-07-23 Thread Julian Coleman 
Module Name:src
Committed By:   jdc
Date:   Thu Jul 23 16:08:03 UTC 2020

Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c

Log Message:
Move machine-specific fixes into separate functions to improve readability.


To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/sys/arch/sparc64/sparc64/autoconf.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.221 src/sys/arch/sparc64/sparc64/autoconf.c:1.222
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.221	Sun Jul  5 09:56:06 2020
+++ src/sys/arch/sparc64/sparc64/autoconf.c	Thu Jul 23 16:08:02 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.221 2020/07/05 09:56:06 martin Exp $ */
+/*	$NetBSD: autoconf.c,v 1.222 2020/07/23 16:08:02 jdc Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.221 2020/07/05 09:56:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.222 2020/07/23 16:08:02 jdc Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -,6 +,101 @@ add_drivebay_props_v210(device_t dev, in
 }
 
 /*
+ * Add SPARCle spdmem devices (0x50 and 0x51) that are not in the OFW tree
+ */
+static void
+add_spdmem_props_sparcle(device_t busdev)
+{
+	prop_dictionary_t props = device_properties(busdev);
+	prop_array_t cfg = prop_array_create();
+	int i;
+
+	DPRINTF(ACDB_PROBE, ("\nAdding spdmem for SPARCle "));
+	for (i = 0x50; i <= 0x51; i++) {
+		prop_dictionary_t spd = prop_dictionary_create();
+		prop_dictionary_set_string(spd, "name", "dimm-spd");
+		prop_dictionary_set_uint32(spd, "addr", i);
+		prop_dictionary_set_uint64(spd, "cookie", 0);
+		prop_array_add(cfg, spd);
+		prop_object_release(spd);
+	}
+	prop_dictionary_set(props, "i2c-child-devices", cfg);
+	prop_object_release(cfg);
+}
+
+/*
+ * Add V210/V240 environmental sensors that are not in the OFW tree.
+ */
+static void
+add_env_sensors_v210(device_t busdev)
+{
+	prop_dictionary_t props = device_properties(busdev);
+	prop_array_t cfg = NULL;
+	prop_dictionary_t sens;
+	prop_data_t data;
+	const char name_lm[] = "i2c-lm75";
+	const char name_adm[] = "i2c-adm1026";
+
+	DPRINTF(ACDB_PROBE, ("\nAdding sensors for %s ", machine_model));
+	cfg = prop_dictionary_get(props, "i2c-child-devices");
+ 	if (!cfg) {
+		cfg = prop_array_create();
+		prop_dictionary_set(props, "i2c-child-devices", cfg);
+		prop_dictionary_set_bool(props, "i2c-indirect-config", false);
+	}
+
+	/* ADM1026 at 0x2e */
+	sens = prop_dictionary_create();
+	prop_dictionary_set_uint32(sens, "addr", 0x2e);
+	prop_dictionary_set_uint64(sens, "cookie", 0);
+	prop_dictionary_set_string(sens, "name", "hardware-monitor");
+	data = prop_data_create_copy(_adm[0], sizeof(name_adm));
+	prop_dictionary_set(sens, "compatible", data);
+	prop_object_release(data);
+	prop_array_add(cfg, sens);
+	prop_object_release(sens);
+
+	/* LM75 at 0x4e */
+	sens = prop_dictionary_create();
+	prop_dictionary_set_uint32(sens, "addr", 0x4e);
+	prop_dictionary_set_uint64(sens, "cookie", 0);
+	prop_dictionary_set_string(sens, "name", "temperature-sensor");
+	data = prop_data_create_copy(_lm[0], sizeof(name_lm));
+	prop_dictionary_set(sens, "compatible", data);
+	prop_object_release(data);
+	prop_array_add(cfg, sens);
+	prop_object_release(sens);
+}
+
+/* Hardware specific device properties */
+static void
+set_hw_props(device_t dev)
+{
+	device_t busdev = device_parent(dev);
+
+	if ((!strcmp(machine_model, "SUNW,Sun-Fire-V240") ||
+	!strcmp(machine_model, "SUNW,Sun-Fire-V210"))) {
+		device_t busparent = device_parent(busdev);
+		prop_dictionary_t props = device_properties(dev);
+
+		if (busparent != NULL && device_is_a(busparent, "pcfiic") &&
+		device_is_a(dev, "adm1026hm") && props != NULL) {
+			prop_dictionary_set_uint8(props, "fan_div2", 0x55);
+			prop_dictionary_set_bool(props, "multi_read", true);
+		}
+	}
+
+	if (!strcmp(machine_model, "SUNW,Sun-Fire-V440")) {
+		device_t busparent = device_parent(busdev);
+		prop_dictionary_t props = device_properties(dev);
+		if (busparent != NULL && device_is_a(busparent, "pcfiic") &&
+		device_is_a(dev, "adm1026hm") && props != NULL) {
+			prop_dictionary_set_bool(props, "multi_read", true);
+		}
+	}
+}
+
+/*
  * Called back during autoconfiguration for each device found
  */
 void
@@ -1155,7 +1250,8 @@ device_register(device_t dev, void *aux)
 
 		ofnode = (int)ia->ia_cookie;
 		if (device_is_a(dev, "pcagpio")) {
-			if (strcmp(machine_model, "SUNW,Sun-Fire-V210") == 0) {
+			if (!strcmp(machine_model, "SUNW,Sun-Fire-V240") ||
+			!strcmp(machine_model, "SUNW,Sun-Fire-V210")) {
 add_gpio_props_v210(dev, aux);
 			}
 		} 
@@ -1344,82 +1440,13 @@ noether:
 			}
 		}
 
-		/*
-		 * Add SPARCle spdmem devices (0x50 and 0x51) that the
-		 * firmware does not know about.
-		 */
-		if (!strcmp(machine_model,

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 15:24:37 UTC 2020

Modified Files:
src/sys/arch/mips/include: mips_param.h

Log Message:
Add a comment to CACHE_LINE_SIZE / COHERENCY_UNIT size defines


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/mips/include/mips_param.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/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.42 src/sys/arch/mips/include/mips_param.h:1.43
--- src/sys/arch/mips/include/mips_param.h:1.42	Thu Jul 23 12:15:59 2020
+++ src/sys/arch/mips/include/mips_param.h	Thu Jul 23 15:24:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_param.h,v 1.42 2020/07/23 12:15:59 skrll Exp $	*/
+/*	$NetBSD: mips_param.h,v 1.43 2020/07/23 15:24:37 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -80,6 +80,10 @@
 #define MSGBUFSIZE	NBPG		/* default message buffer size */
 #endif
 
+/*
+ * Most MIPS have a cache line size of 32 bytes, but Cavium chips
+ * have a line size 128bytes and we need to cover the larger size.
+ */
 #define COHERENCY_UNIT	128
 #define CACHE_LINE_SIZE	128

CVS commit: src/distrib/notes/evbarm

2020-07-23 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Thu Jul 23 14:09:31 UTC 2020

Modified Files:
src/distrib/notes/evbarm: hardware

Log Message:
more 9.0 hardware


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/notes/evbarm/hardware

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

Modified files:

Index: src/distrib/notes/evbarm/hardware
diff -u src/distrib/notes/evbarm/hardware:1.14 src/distrib/notes/evbarm/hardware:1.15
--- src/distrib/notes/evbarm/hardware:1.14	Sat Jul 18 18:11:46 2020
+++ src/distrib/notes/evbarm/hardware	Thu Jul 23 14:09:31 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hardware,v 1.14 2020/07/18 18:11:46 nia Exp $
+.\"	$NetBSD: hardware,v 1.15 2020/07/23 14:09:31 nia Exp $
 .\"
 .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -40,6 +40,8 @@ Samsung Exynos 5422 (e.g. ODROID-XU3/XU-
 .It
 Texas Instruments OMAP3 (e.g. BeagleBoard, BeagleBone Black...)
 .It
+Xilinx Zynq (e.g. Zedboard, Parallella...)
+.It
 NVIDIA Tegra K1
 .El
 .Ss2 64-bit SoCs supported by GENERIC64 kernels
@@ -56,6 +58,8 @@ Amlogic S905 (e.g. ODROID-C2, Le Potato,
 .It
 Broadcom BCM2837 (e.g. Raspberry Pi 3)
 .It
+Marvell ThunderX
+.It
 Rockchip RK3328, RK3328 (e.g. Pinebook Pro, RockPro64, Firefly...)
 .It
 NVIDIA Tegra X1

CVS commit: src/distrib/notes/evbarm

2020-07-23 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Thu Jul 23 14:10:25 UTC 2020

Modified Files:
src/distrib/notes/evbarm: hardware

Log Message:
freescale support in GENERIC


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/notes/evbarm/hardware

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

Modified files:

Index: src/distrib/notes/evbarm/hardware
diff -u src/distrib/notes/evbarm/hardware:1.15 src/distrib/notes/evbarm/hardware:1.16
--- src/distrib/notes/evbarm/hardware:1.15	Thu Jul 23 14:09:31 2020
+++ src/distrib/notes/evbarm/hardware	Thu Jul 23 14:10:25 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hardware,v 1.15 2020/07/23 14:09:31 nia Exp $
+.\"	$NetBSD: hardware,v 1.16 2020/07/23 14:10:25 nia Exp $
 .\"
 .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -36,6 +36,8 @@ Amlogic S805 (e.g. ODROID-C1)
 .It
 Broadcom BCM2836 (e.g. Raspberry Pi 2)
 .It
+Freescale i.MX6 Dual/DualLite/Quad, i.MX7 Dual (e.g. Wandboard, UDOO, Hummingboard...)
+.It
 Samsung Exynos 5422 (e.g. ODROID-XU3/XU-4)
 .It
 Texas Instruments OMAP3 (e.g. BeagleBoard, BeagleBone Black...)

CVS commit: src/sys/arch/aarch64/aarch64

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 13:12:54 UTC 2020

Modified Files:
src/sys/arch/aarch64/aarch64: cpuswitch.S

Log Message:
Reduce the window of having interrupts disabled in cpu_switchto{,_softint}
and ensure astpending is checked with interrupts disabled.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/aarch64/aarch64/cpuswitch.S

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

Modified files:

Index: src/sys/arch/aarch64/aarch64/cpuswitch.S
diff -u src/sys/arch/aarch64/aarch64/cpuswitch.S:1.21 src/sys/arch/aarch64/aarch64/cpuswitch.S:1.22
--- src/sys/arch/aarch64/aarch64/cpuswitch.S:1.21	Sat May 23 18:08:59 2020
+++ src/sys/arch/aarch64/aarch64/cpuswitch.S	Thu Jul 23 13:12:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.21 2020/05/23 18:08:59 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.22 2020/07/23 13:12:54 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
 #include "opt_ddb.h"
 #include "opt_kasan.h"
 
-RCSID("$NetBSD: cpuswitch.S,v 1.21 2020/05/23 18:08:59 ryo Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.22 2020/07/23 13:12:54 skrll Exp $")
 
 	ARMV8_DEFINE_OPTIONS
 
@@ -76,16 +76,18 @@ ENTRY_NP(cpu_switchto)
 	str	x4, [x6, #PCB_TF]
 
 	/* We are done with the old lwp */
-
-	DISABLE_INTERRUPT
 	ldr	x6, [x1, #L_PCB]	/* x6 = lwp_getpcb(newlwp) */
 	ldr	x4, [x6, #PCB_TF]	/* get trapframe ptr (aka SP) */
 #ifdef DDB
 	str	xzr, [x6, #PCB_TF]	/* clear l->l_addr->pcb_tf */
 #endif
 	ldr	x5, [x1, #L_MD_CPACR]	/* get cpacr_el1 */
+
+	mrs	x3, tpidr_el1
+	DISABLE_INTERRUPT
 	mov	sp, x4			/* restore stack pointer */
 	msr	cpacr_el1, x5		/* restore cpacr_el1 */
+	str	x1, [x3, #CI_CURLWP]	/* switch curlwp to new lwp */
 
 #ifdef ARMV83_PAC
 	/* Switch the PAC key. */
@@ -116,8 +118,6 @@ ENTRY_NP(cpu_switchto)
 1:
 #endif
 
-	mrs	x3, tpidr_el1
-	str	x1, [x3, #CI_CURLWP]	/* switch curlwp to new lwp */
 	ENABLE_INTERRUPT
 
 	/*
@@ -161,26 +161,14 @@ ENTRY_NP(cpu_switchto_softint)
 	stp	x27, x28, [sp, #TF_X27]
 	stp	x29, x2, [sp, #TF_X29]	/* tf->lr = softint_cleanup; */
 
-	mrs	x3, tpidr_el1		/* x3 := curcpu() */
-	DISABLE_INTERRUPT
-	ldr	x19, [x3, #CI_CURLWP]	/* x19 := curcpu()->ci_curlwp */
+	mrs	x20, tpidr_el1		/* x20 := curcpu() */
+	ldr	x19, [x20, #CI_CURLWP]	/* x19 := curcpu()->ci_curlwp */
 	mov	x4, sp
+
 	mrs	x5, cpacr_el1
 	ldr	x6, [x19, #L_PCB]	/* x6 = lwp_getpcb(curlwp) */
 	str	x4, [x6, #PCB_TF]
 	str	x5, [x19, #L_MD_CPACR]
-	str	x0, [x3, #CI_CURLWP]	/* curcpu()->ci_curlwp = softlwp; */
-
-#ifdef ARMV83_PAC
-	/* Switch the PAC key. */
-	adrl	x4, _C_LABEL(aarch64_pac_enabled)
-	ldr	w4, [x4]
-	cbz	w4, 1f
-	ldp	x5, x6, [x0, #L_MD_IA_KERN]
-	msr	APIAKeyLo_EL1, x5
-	msr	APIAKeyHi_EL1, x6
-1:
-#endif
 
 #ifdef KASAN
 	/* clear the new stack */
@@ -189,26 +177,42 @@ ENTRY_NP(cpu_switchto_softint)
 	ldp	x0, x1, [sp], #16
 #endif
 
-	/* onto new stack */
 	ldr	x4, [x0, #L_MD_UTF]
+
+	DISABLE_INTERRUPT
+	/* onto new stack */
 	sub	sp, x4, #TF_SIZE	/* new sp := softlwp->l_md_utf - 1 */
+	str	x0, [x20, #CI_CURLWP]	/* curcpu()->ci_curlwp = softlwp; */
+
 	mov	x5, #CPACR_FPEN_NONE
 	msr	cpacr_el1, x5		/* cpacr_el1 = CPACR_FPEN_NONE */
+
+#ifdef ARMV83_PAC
+	/* Switch the PAC key. */
+	adrl	x4, _C_LABEL(aarch64_pac_enabled)
+	ldr	w4, [x4]
+	cbz	w4, 1f
+	ldp	x5, x6, [x0, #L_MD_IA_KERN]
+	msr	APIAKeyLo_EL1, x5
+	msr	APIAKeyHi_EL1, x6
+1:
+#endif
 	ENABLE_INTERRUPT
 
 	/* softint_dispatch(pinned_lwp, ipl) */
 	mov	x0, x19			/* x0 := pinned_lwp */
 	bl	_C_LABEL(softint_dispatch)
 
-	mrs	x3, tpidr_el1
-	DISABLE_INTERRUPT
-	str	x19, [x3, #CI_CURLWP]	/* curcpu()->ci_curlwp := x19 */
+	mrs	x20, tpidr_el1
 	ldr	x6, [x19, #L_PCB]	/* x6 = lwp_getpcb(curlwp) */
 	ldr	x4, [x6, #PCB_TF]	/* x4 := pinned_lwp->l_addr->pcb_tf */
 #ifdef DDB
 	str	xzr, [x6, #PCB_TF]	/* clear l->l_addr->pcb_tf */
 #endif
 	ldr	x5, [x19, #L_MD_CPACR]	/* x5 := pinned_lwp->l_md_cpacr */
+
+	DISABLE_INTERRUPT
+	str	x19, [x20, #CI_CURLWP]	/* curcpu()->ci_curlwp := x19 */
 	mov	sp, x4			/* restore pinned_lwp sp */
 	msr	cpacr_el1, x5		/* restore pinned_lwp cpacr */
 
@@ -245,10 +249,10 @@ END(cpu_switchto_softint)
 ENTRY_NP(softint_cleanup)
 	mov	lr, x20			/* restore original lr */
 
-	mrs	x3, tpidr_el1		/* curcpu() */
-	ldr	w2, [x3, #CI_MTX_COUNT]	/* ->ci_mtx_count */
+	mrs	x20, tpidr_el1		/* curcpu() */
+	ldr	w2, [x20, #CI_MTX_COUNT]/* ->ci_mtx_count */
 	add	w2, w2, #1
-	str	w2, [x3, #CI_MTX_COUNT]
+	str	w2, [x20, #CI_MTX_COUNT]
 
 	msr	daif, x19		/* restore interrupt mask */
 	ldp	x19, x20, [sp], #16	/* restore */
@@ -360,6 +364,7 @@ ENTRY_NP(el0_trap)
 	nop/* dummy for DDB backtrace (for lr-4) */
 #endif
 ENTRY_NP(el0_trap_exit)
+	DISABLE_INTERRUPT		/* make sure I|F marked */
 1:
 	/* while (curcpu()->ci_astpending & __BIT(0)) { */
 	mrs	x8, tpidr_el1
@@ -379,8 +384,6 @@ ENTRY_NP(el0_trap_exit)
 	b	1b
 	/* } */
 9:
-	DISABLE_INTERRUPT		/* make sure I|F marked */
-
 	mrs	x8,

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 12:15:59 UTC 2020

Modified Files:
src/sys/arch/mips/include: mips_param.h

Log Message:
On second thoughts this can't be conditional so define CACHE_LINE_SIZE /
COHERENCY_UNIT as 128 for all mips.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mips/include/mips_param.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/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.41 src/sys/arch/mips/include/mips_param.h:1.42
--- src/sys/arch/mips/include/mips_param.h:1.41	Thu Jul 23 12:13:25 2020
+++ src/sys/arch/mips/include/mips_param.h	Thu Jul 23 12:15:59 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_param.h,v 1.41 2020/07/23 12:13:25 skrll Exp $	*/
+/*	$NetBSD: mips_param.h,v 1.42 2020/07/23 12:15:59 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -80,13 +80,8 @@
 #define MSGBUFSIZE	NBPG		/* default message buffer size */
 #endif
 
-#ifdef MIPS64_OCTEON
 #define COHERENCY_UNIT	128
 #define CACHE_LINE_SIZE	128
-#endif
-#ifndef COHERENCY_UNIT
-#define COHERENCY_UNIT	32	/* MIPS cachelines are usually 32 bytes */
-#endif
 
 #ifdef ENABLE_MIPS_16KB_PAGE
 #define	PGSHIFT		14		/* LOG2(NBPG) */

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

2020-07-23 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Thu Jul 23 12:13:25 UTC 2020

Modified Files:
src/sys/arch/mips/include: mips_param.h

Log Message:
Define CACHE_LINE_SIZE / COHERENCY_UNIT as 128 for MIPS64_OCTEON


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/mips/include/mips_param.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/mips/include/mips_param.h
diff -u src/sys/arch/mips/include/mips_param.h:1.40 src/sys/arch/mips/include/mips_param.h:1.41
--- src/sys/arch/mips/include/mips_param.h:1.40	Wed Jun 19 09:55:27 2019
+++ src/sys/arch/mips/include/mips_param.h	Thu Jul 23 12:13:25 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_param.h,v 1.40 2019/06/19 09:55:27 skrll Exp $	*/
+/*	$NetBSD: mips_param.h,v 1.41 2020/07/23 12:13:25 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -80,6 +80,10 @@
 #define MSGBUFSIZE	NBPG		/* default message buffer size */
 #endif
 
+#ifdef MIPS64_OCTEON
+#define COHERENCY_UNIT	128
+#define CACHE_LINE_SIZE	128
+#endif
 #ifndef COHERENCY_UNIT
 #define COHERENCY_UNIT	32	/* MIPS cachelines are usually 32 bytes */
 #endif

CVS commit: src/sys/crypto/aes/arch/arm

2020-07-23 Thread Ryo Shimizu 
Module Name:src
Committed By:   ryo
Date:   Thu Jul 23 11:33:01 UTC 2020

Modified Files:
src/sys/crypto/aes/arch/arm: arm_neon.h

Log Message:
fix build with llvm/clang.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/crypto/aes/arch/arm/arm_neon.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/crypto/aes/arch/arm/arm_neon.h
diff -u src/sys/crypto/aes/arch/arm/arm_neon.h:1.2 src/sys/crypto/aes/arch/arm/arm_neon.h:1.3
--- src/sys/crypto/aes/arch/arm/arm_neon.h:1.2	Tue Jun 30 21:24:00 2020
+++ src/sys/crypto/aes/arch/arm/arm_neon.h	Thu Jul 23 11:33:01 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: arm_neon.h,v 1.2 2020/06/30 21:24:00 riastradh Exp $	*/
+/*	$NetBSD: arm_neon.h,v 1.3 2020/07/23 11:33:01 ryo Exp $	*/
 
 /*-
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@ typedef struct { uint8x8_t val[2]; } uin
 #elif defined(__clang__)
 
 #define	_INTRINSATTR			  \
-	__attribute__((__always_inline__, __nodebug))
+	__attribute__((__always_inline__, __nodebug__))
 
 typedef __attribute__((neon_vector_type(16))) int8_t int8x16_t;
 typedef __attribute__((neon_vector_type(2))) int64_t int64x2_t;

CVS commit: src/external/mit/xorg/server/xorg-server/hw/sun

2020-07-23 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Thu Jul 23 09:59:36 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/sun: Makefile.Xsun

Log Message:
fix build:
- add .../xorg subdir to the path
- add dbe and present extensions, both wanted via linkage

.. but maybe these shouldn't be built?  they're not in sets.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun

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/server/xorg-server/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.2
--- src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun:1.1	Wed Jul 22 20:54:08 2020
+++ src/external/mit/xorg/server/xorg-server/hw/sun/Makefile.Xsun	Thu Jul 23 09:59:36 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.Xsun,v 1.1 2020/07/22 20:54:08 tsutsui Exp $
+#	$NetBSD: Makefile.Xsun,v 1.2 2020/07/23 09:59:36 mrg Exp $
 
 .include 
 
@@ -73,6 +73,7 @@ SRCS+=  stubs.c
 SRCS+=	fbcmap_mi.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/sun \
+		-I${DESTDIR}${X11INCDIR}/xorg \
 		${X11INCS.DIX}
 
 CPPFLAGS+=	-UHAVE_XORG_CONFIG_H
@@ -89,6 +90,7 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xkbstubs} \
 	${LDADD.randr} \
 	${LDADD.Xext} \
+	${LDADD.dbe} \
 	${LDADD.composite} \
 	${LDADD.record} \
 	${LDADD.render} \
@@ -98,9 +100,9 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.miext/damage} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
+	${LDADD.present} \
 	-lXfont2 \
 	-lpixman-1 \
-	-lXext \
 	-lX11 \
 	-lz \
 	-lm
@@ -111,6 +113,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xkb} \
 	${DPADD.randr} \
 	${DPADD.Xext} \
+	${DPADD.dbe} \
 	${DPADD.composite} \
 	${DPADD.record} \
 	${DPADD.render} \
@@ -120,6 +123,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.miext/damage} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
+	${DPADD.present} \
 	${LIBXFONT2} \
 	${LIBPIXMAN-1} \
 	${LIBXEXT} \

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

2020-07-23 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 23 09:46:50 UTC 2020

Added Files:
src/distrib/sets/lists/xdebug: md.sun3

Log Message:
Add .debug binaries for Xsun servers.

Note daily build.sh on releng.netbsd.org has MKDEBUG=yes
so local test builds should also include it.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.4 src/distrib/sets/lists/xdebug/md.sun3

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

Added files:

Index: src/distrib/sets/lists/xdebug/md.sun3
diff -u /dev/null src/distrib/sets/lists/xdebug/md.sun3:1.4
--- /dev/null	Thu Jul 23 09:46:50 2020
+++ src/distrib/sets/lists/xdebug/md.sun3	Thu Jul 23 09:46:49 2020
@@ -0,0 +1,3 @@
+# $NetBSD: md.sun3,v 1.4 2020/07/23 09:46:49 tsutsui Exp $
+./usr/libdata/debug/usr/X11R7/bin/Xsun.debug	xdebug-xorg-server-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/XsunMono.debug	xdebug-xorg-server-debug	xorg,debug

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

2020-07-23 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 23 09:13:18 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw: Makefile
src/external/mit/xorg/server/xorg-server/hw: Makefile

Log Message:
Remove duplicated (and .if 0'ed out) ${XSERVER_XFREE86} checks.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/hw/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/server/xorg-server/hw/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/server/xorg-server.old/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3	Thu Jul 23 09:09:12 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile	Thu Jul 23 09:13:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.4 2020/07/23 09:13:18 tsutsui Exp $
 
 .include "../Makefile.common"
 
@@ -34,10 +34,6 @@ SUBDIR+=netbsd/arm32vidc
 SUBDIR+=netbsd/dec
 .endif
 
-.if ${XSERVER_XFREE86} != "no"
-SUBDIR+=xfree86
-.endif
-
 .if ${XSERVER_XMAC68K} != "no"
 SUBDIR+=netbsd/mac68k
 .endif

Index: src/external/mit/xorg/server/xorg-server/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/Makefile:1.7	Thu Jul 23 09:09:13 2020
+++ src/external/mit/xorg/server/xorg-server/hw/Makefile	Thu Jul 23 09:13:18 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2020/07/23 09:09:13 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.8 2020/07/23 09:13:18 tsutsui Exp $
 
 .include "../Makefile.common"
 
@@ -34,10 +34,6 @@ SUBDIR+=netbsd/arm32vidc
 SUBDIR+=netbsd/dec
 .endif
 
-.if ${XSERVER_XFREE86} != "no"
-SUBDIR+=xfree86
-.endif
-
 .if ${XSERVER_XMAC68K} != "no"
 SUBDIR+=netbsd/mac68k
 .endif

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

2020-07-23 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 23 09:09:13 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server.old: Makefile.common
src/external/mit/xorg/server/xorg-server.old/hw: Makefile
src/external/mit/xorg/server/xorg-server/hw: Makefile

Log Message:
Remove definitions for Xdreamcast, Xhpc, Xmacppc, and Xnewsmips.

All these port specific X11R6 servers just used MI wscons, and
all of them have been switched to Xorg servers with wsfb driver etc.
Even if someone wants a smaller monolithic server, it should be
written as a MI "Xwscons" server.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/Makefile.common
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/hw/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/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.28 src/external/mit/xorg/server/xorg-server/Makefile.common:1.29
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.28	Thu Jul 23 08:34:33 2020
+++ src/external/mit/xorg/server/xorg-server/Makefile.common	Thu Jul 23 09:09:12 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $
+#	$NetBSD: Makefile.common,v 1.29 2020/07/23 09:09:12 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -33,10 +33,6 @@ XSERVER_XAMIGA=		yes
 XSERVER_XMAC68K=	yes
 .endif
 
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC=	yes
-.endif
-
 .if ${MACHINE} == "pmax"
 XSERVER_XDECNETBSD=	yes
 XSERVER_XPMAX=		no # XXX should be yes but may be obsoleted
@@ -73,10 +69,6 @@ XSERVER_XDECNETBSD?=	no
 XSERVER_XFREE68?=	no
 # Does this platform build the Xmac68k X server?
 XSERVER_XMAC68K?=	no
-# Does this platform build Xmacppc X server?
-XSERVER_XMACPPC?=	no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?=	no
 # Does this platform build Xpmax X servers?
 XSERVER_XPMAX?=		no
 # Does this platform build Xsun* X servers?

Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.4
--- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3	Thu Jul 23 08:34:33 2020
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.common	Thu Jul 23 09:09:12 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $
+#	$NetBSD: Makefile.common,v 1.4 2020/07/23 09:09:12 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -32,10 +32,6 @@ XSERVER_XAMIGA=		yes
 XSERVER_XMAC68K=	yes
 .endif
 
-.if ${MACHINE} == "macppc"
-XSERVER_XMACPPC=	yes
-.endif
-
 .if ${MACHINE} == "pmax"
 XSERVER_XDECNETBSD=	yes
 XSERVER_XPMAX=		no # XXX should be yes but may be obsoleted
@@ -72,10 +68,6 @@ XSERVER_XDECNETBSD?=	no
 XSERVER_XFREE68?=	no
 # Does this platform build the Xmac68k X server?
 XSERVER_XMAC68K?=	no
-# Does this platform build Xmacppc X server?
-XSERVER_XMACPPC?=	no
-# Does this platform build the Xnewsmips server?
-XSERVER_XNEWSMIPS?=	no
 # Does this platform build Xpmax X servers?
 XSERVER_XPMAX?=		no
 # Does this platform build Xsun* X servers?

Index: src/external/mit/xorg/server/xorg-server.old/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2	Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile	Thu Jul 23 09:09:12 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.3 2020/07/23 09:09:12 tsutsui Exp $
 
 .include "../Makefile.common"
 
@@ -34,30 +34,14 @@ SUBDIR+=netbsd/arm32vidc
 SUBDIR+=netbsd/dec
 .endif
 
-.if ${XSERVER_XDREAMCAST} != "no"
-SUBDIR+=netbsd/dreamcast
-.endif
-
 .if ${XSERVER_XFREE86} != "no"
 SUBDIR+=xfree86
 .endif
 
-.if ${XSERVER_XHPC} != "no"
-SUBDIR+=netbsd/hpc
-.endif
-
 .if ${XSERVER_XMAC68K} != "no"
 SUBDIR+=netbsd/mac68k
 .endif
 
-.if ${XSERVER_XMACPPC} != "no"
-SUBDIR+=netbsd/macppc
-.endif
-
-.if ${XSERVER_XNEWSMIPS} != "no"
-SUBDIR+=netbsd/newsmips
-.endif
-
 .if ${XSERVER_XVFB} != "no"
 SUBDIR+=vfb
 .endif

Index: src/external/mit/xorg/server/xorg-server/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.6

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

2020-07-23 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Thu Jul 23 08:34:33 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server.old: Makefile.common

Log Message:
Don't build Xsun servers for sparc and sparc64.

Not tested, and maybe not worth for wscons'fied ports.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/Makefile.common

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/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.27 src/external/mit/xorg/server/xorg-server/Makefile.common:1.28
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.27	Fri Aug 19 03:59:30 2016
+++ src/external/mit/xorg/server/xorg-server/Makefile.common	Thu Jul 23 08:34:33 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.27 2016/08/19 03:59:30 mrg Exp $
+#	$NetBSD: Makefile.common,v 1.28 2020/07/23 08:34:33 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -43,9 +43,9 @@ XSERVER_XPMAX=		no # XXX should be yes b
 .endif
 
 .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN=		yes
-XSERVER_XSUNMONO=	yes
-XSERVER_XSUN24=		yes
+#XSERVER_XSUN=		yes
+#XSERVER_XSUNMONO=	yes
+#XSERVER_XSUN24=		yes
 .endif
 
 .if ${MACHINE} == "sun3"

Index: src/external/mit/xorg/server/xorg-server.old/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2 src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.3
--- src/external/mit/xorg/server/xorg-server.old/Makefile.common:1.2	Fri Aug 19 03:59:31 2016
+++ src/external/mit/xorg/server/xorg-server.old/Makefile.common	Thu Jul 23 08:34:33 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.2 2016/08/19 03:59:31 mrg Exp $
+#	$NetBSD: Makefile.common,v 1.3 2020/07/23 08:34:33 tsutsui Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -42,9 +42,9 @@ XSERVER_XPMAX=		no # XXX should be yes b
 .endif
 
 .if ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-XSERVER_XSUN=		yes
-XSERVER_XSUNMONO=	yes
-XSERVER_XSUN24=		yes
+#XSERVER_XSUN=		yes
+#XSERVER_XSUNMONO=	yes
+#XSERVER_XSUN24=		yes
 .endif
 
 .if ${MACHINE} == "sun3"

CVS commit: src/crypto/external/bsd/heimdal

2020-07-23 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Thu Jul 23 07:53:35 UTC 2020

Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile

Log Message:
move $VERSION from Makefile.inc into the single Makefile that uses it.

this should do two nice things:
- eliminate "nbsed" missing messages in builds
- slightly speed up the build by removing a few dozen exec sed calls


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile

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

Modified files:

Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.5	Tue Dec 17 00:17:00 2019
+++ src/crypto/external/bsd/heimdal/Makefile.inc	Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
 
 HEIMBASE?=	${NETBSDSRCDIR}/crypto/external/bsd/heimdal
 HEIMDIST=	${HEIMBASE}/dist
@@ -16,8 +16,6 @@ LIBIPC_PIC=	${LIBIPCDIR}/libipc.a
 LIBIPC_PIC=	${LIBIPCDIR}/libipc_pic.a
 .endif
 
-VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ 	]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
-
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 TOOL_COMPILE_ET=   ${COMPILEETOBJ}/compile_et

Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4	Tue Dec 17 00:16:26 2019
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile	Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2020/07/23 07:53:35 mrg Exp $
 
 .include 
 .include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,8 @@ MAN=		krb5-config.1
 
 CLEANFILES+=	krb5-config
 
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ 	]*"\([0-9.]*\)"/\1/p' ${HEIMBASE}/include/config.h
+
 krb5-config: krb5-config.in
 	${TOOL_SED} \
 		-e "s!@PACKAGE\@!heimdal!g" \