CVS commit: src

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Mar 21 05:23:39 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
Install ftttdrv.h, which was apparently overlooked at some point
(probably because it contains little of substance...) PR 50902.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/lib/freetype/freetype/Makefile

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

Modified files:

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.175 src/distrib/sets/lists/xcomp/mi:1.176
--- src/distrib/sets/lists/xcomp/mi:1.175	Tue Oct 13 03:32:28 2015
+++ src/distrib/sets/lists/xcomp/mi	Mon Mar 21 05:23:39 2016
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.175 2015/10/13 03:32:28 mrg Exp $
+#	 $NetBSD: mi,v 1.176 2016/03/21 05:23:39 dholland Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5783,6 +5783,7 @@
 ./usr/X11R7/include/freetype2/ftsystem.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/ftfntfmt.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/fttrigon.h		-unknown-	xorg
+./usr/X11R7/include/freetype2/ftttdrv.h			-unknown-	xorg
 ./usr/X11R7/include/freetype2/fttypes.h			-unknown-	xorg
 ./usr/X11R7/include/freetype2/ftwinfnt.h		-unknown-	xorg
 ./usr/X11R7/include/freetype2/ftxf86.h			-unknown-	obsolete

Index: src/external/mit/xorg/lib/freetype/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/Makefile:1.20 src/external/mit/xorg/lib/freetype/freetype/Makefile:1.21
--- src/external/mit/xorg/lib/freetype/freetype/Makefile:1.20	Mon Jul 20 04:10:40 2015
+++ src/external/mit/xorg/lib/freetype/freetype/Makefile	Mon Mar 21 05:23:39 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2015/07/20 04:10:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.21 2016/03/21 05:23:39 dholland Exp $
 
 .include 
 
@@ -13,7 +13,7 @@ INCS=	freetype.h ftadvanc.h ftbbox.h ftb
 	ftglyph.h ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h \
 	ftlzw.h ftmac.h ftmm.h ftmodapi.h ftmoderr.h ftotval.h ftoutln.h \
 	ftpfr.h ftrender.h ftsizes.h ftsnames.h ftstroke.h ftsynth.h \
-	ftsystem.h fttrigon.h fttypes.h ftwinfnt.h \
+	ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h \
 	t1tables.h ttnameid.h tttables.h tttags.h ttunpat.h \
 	ftautoh.h ftcffdrv.h ft2build.h
 

CVS commit: src

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Mar 21 05:23:39 UTC 2016

Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype: Makefile

Log Message:
Install ftttdrv.h, which was apparently overlooked at some point
(probably because it contains little of substance...) PR 50902.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/lib/freetype/freetype/Makefile

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

CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 21 02:37:26 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
fix constness (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/bin/sh/parser.c

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

CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 21 02:37:26 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
fix constness (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/bin/sh/parser.c

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

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.106 src/bin/sh/parser.c:1.107
--- src/bin/sh/parser.c:1.106	Sun Mar 20 18:56:39 2016
+++ src/bin/sh/parser.c	Sun Mar 20 22:37:26 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.106 2016/03/20 22:56:39 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.107 2016/03/21 02:37:26 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.106 2016/03/20 22:56:39 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.107 2016/03/21 02:37:26 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1089,13 +1089,13 @@ cleanup_state_stack(VSS *stack)
  * characters on the top of the stack which must be preserved.
  */
 static char *
-parsebackq(VSS *const stack, const char *in,
+parsebackq(VSS *const stack, char * const in,
 struct nodelist **const pbqlist, const int oldstyle)
 {
 	struct nodelist **nlpp;
 	int savepbq;
 	union node *n;
-	const char *out;
+	char *out;
 	char *str = NULL;
 	char *pout;
 	char *volatile sstr = str;

Re: CVS commit: src/sys/sys

[Joerg Sonnenberger]

On Sun, Mar 20, 2016 at 04:13:25PM +, Nick Hudson wrote:
> On 03/20/16 14:41, Joerg Sonnenberger wrote:
> >On Fri, Mar 18, 2016 at 04:29:15PM +, Nick Hudson wrote:
> 
> >>Is there a PR that describes the clang problem?
> >I gave you a detailed explination why the old version is a problem. So
> >far I have seen no real justification for the change, other than some
> >mumblings about ld mishandling weak symbols. That seems to be a pretty
> >clear cut case for a revert and going back to the design board to
> >understand why rump started failing with new binutils.
> 
> I'm old and forgetful and need a PR.
> 
> I think at the moment it's a case of least used gets left broken until all
> problems are understood

Here is a trivial test case showing that the basic problem exists for
both clang and gcc:

   int a, b

   int f(void) {
 return  != 
   }

When compiling with -O2, both return the function to "return 1". The
linker set iteration typically looks something like:
   for (iter =  iter !=  ++iter)
  ...

Depending on the phase of the moon, the compiler will therefore turn
this into a do-while loop as the condition is initially false.

In short, this is a real problem and the assumption is not specific to
clang. Revert now, please.

Joerg

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:57:49 UTC 2016

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
Add command substitution test.


To generate a diff of this commit:
cvs rdiff -u -r1.668 -r1.669 src/distrib/sets/lists/tests/mi

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

CVS commit: src/tests/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:57:04 UTC 2016

Modified Files:
src/tests/bin/sh: Makefile
Added Files:
src/tests/bin/sh: t_cmdsub.sh

Log Message:
new command substitution test from kre


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/bin/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/sh/t_cmdsub.sh

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:57:49 UTC 2016

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
Add command substitution test.


To generate a diff of this commit:
cvs rdiff -u -r1.668 -r1.669 src/distrib/sets/lists/tests/mi

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.668 src/distrib/sets/lists/tests/mi:1.669
--- src/distrib/sets/lists/tests/mi:1.668	Wed Mar 16 17:14:35 2016
+++ src/distrib/sets/lists/tests/mi	Sun Mar 20 18:57:49 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.668 2016/03/16 21:14:35 christos Exp $
+# $NetBSD: mi,v 1.669 2016/03/20 22:57:49 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1256,6 +1256,7 @@
 ./usr/tests/bin/sh/dotcmd/while_return_while	tests-bin-tests	compattestfile,atf
 ./usr/tests/bin/sh/t_compexit			tests-obsolete		obsolete
 ./usr/tests/bin/sh/t_arith			tests-bin-tests		compattestfile,atf
+./usr/tests/bin/sh/t_cmdsub			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_evaltested			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_exit			tests-bin-tests		compattestfile,atf
 ./usr/tests/bin/sh/t_expand			tests-bin-tests		compattestfile,atf

CVS commit: src/tests/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:57:04 UTC 2016

Modified Files:
src/tests/bin/sh: Makefile
Added Files:
src/tests/bin/sh: t_cmdsub.sh

Log Message:
new command substitution test from kre


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/bin/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/sh/t_cmdsub.sh

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

Modified files:

Index: src/tests/bin/sh/Makefile
diff -u src/tests/bin/sh/Makefile:1.10 src/tests/bin/sh/Makefile:1.11
--- src/tests/bin/sh/Makefile:1.10	Wed Mar 16 17:13:51 2016
+++ src/tests/bin/sh/Makefile	Sun Mar 20 18:57:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/03/16 21:13:51 christos Exp $
+# $NetBSD: Makefile,v 1.11 2016/03/20 22:57:04 christos Exp $
 #
 
 .include 
@@ -8,6 +8,7 @@ TESTSDIR = ${TESTSBASE}/bin/sh
 TESTS_SUBDIRS += dotcmd
 
 TESTS_SH+=	t_arith
+TESTS_SH+=	t_cmdsub
 TESTS_SH+=	t_evaltested
 TESTS_SH+=	t_exit
 TESTS_SH+=	t_expand

Added files:

Index: src/tests/bin/sh/t_cmdsub.sh
diff -u /dev/null src/tests/bin/sh/t_cmdsub.sh:1.1
--- /dev/null	Sun Mar 20 18:57:04 2016
+++ src/tests/bin/sh/t_cmdsub.sh	Sun Mar 20 18:57:04 2016
@@ -0,0 +1,500 @@
+# $NetBSD: t_cmdsub.sh,v 1.1 2016/03/20 22:57:04 christos Exp $
+#
+# Copyright (c) 2016 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# the implementation of "sh" to test
+: ${TEST_SH:="/bin/sh"}
+
+#
+# This file tests command substitutions ( `...` and $( ... ) )
+#
+# CAUTION:
+#	Be careful attempting running these tests outside the ATF environment
+#	Some of the tests run "rm *" in the current directory to clean up
+#	An ATF test directory should be empty already, outside ATF, anything
+
+atf_test_case a_basic_cmdsub
+a_basic_cmdsub_head() {
+	atf_set "descr" 'Test operation of simple $( ) substitutions'
+}
+a_basic_cmdsub_body() {
+	atf_check -s exit:0 -o match:'Result is true today' -e empty \
+	${TEST_SH} -c \
+		'echo Result is $( true && echo true || echo false ) today'
+
+	atf_check -s exit:0 -o match:'Result is false today' -e empty \
+	${TEST_SH} -c \
+		'echo Result is $( false && echo true || echo false ) today'
+
+	atf_check -s exit:0 -o match:'aaabbbccc' -e empty \
+	${TEST_SH} -c 'echo aaa$( echo bbb )ccc'
+	atf_check -s exit:0 -o match:'aaabbb cccddd' -e empty \
+	${TEST_SH} -c 'echo aaa$( echo bbb ccc )ddd'
+	atf_check -s exit:0 -o inline:'aaabbb cccddd\n' -e empty \
+	${TEST_SH} -c 'echo aaa$( echo bbb; echo ccc )ddd'
+	atf_check -s exit:0 -o inline:'aaabbb\ncccddd\n' -e empty \
+	${TEST_SH} -c 'echo "aaa$( echo bbb; echo ccc )ddd"'
+
+	atf_check -s exit:0 -o inline:'some string\n' -e empty \
+	${TEST_SH} -c 'X=$( echo some string ); echo "$X"'
+	atf_check -s exit:0 -o inline:'weird; string *\n' -e empty \
+	${TEST_SH} -c 'X=$( echo "weird; string *" ); echo "$X"'
+
+	rm -f * 2>/dev/null || :
+	for f in file-1 file-2
+	do
+		cp /dev/null "$f"
+	done
+
+	atf_check -s exit:0 -o match:'Found file-1 file-2' -e empty \
+	${TEST_SH} -c 'echo Found $( echo * )'
+	atf_check -s exit:0 -o match:'Found file-1 file-2' -e empty \
+	${TEST_SH} -c 'echo Found "$( echo * )"'
+	atf_check -s exit:0 -o match:'Found file-1 file-2' -e empty \
+	${TEST_SH} -c 'echo Found $('" echo '*' )"
+	atf_check -s exit:0 -o match:'Found \*' -e empty \
+	${TEST_SH} -c 'echo Found "$('" echo '*' "')"'
+	atf_check -s exit:0 -o match:'Found file-1 file-2' -e empty \
+	${TEST_SH} -c 'echo Found $('" echo \\* )"
+	atf_check -s exit:0 -o match:'Found \*' -e empty \
+	${TEST_SH} -c 'echo Found "$('" echo \\* )"\"

CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:56:39 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
Move the command substitution "internal subroutine" part of
readtoken1() into a real function of its own (inspired by a
similar change made by FreeBSD - the other internal routines
they moved out are expected to move out here as well soon.)
This change helps avoid gcc 5.3 demanded (not required!) volatile
noise which would slow down parsing. (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/bin/sh/parser.c

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

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.105 src/bin/sh/parser.c:1.106
--- src/bin/sh/parser.c:1.105	Fri Mar 18 14:07:28 2016
+++ src/bin/sh/parser.c	Sun Mar 20 18:56:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.105 2016/03/18 18:07:28 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.106 2016/03/20 22:56:39 christos Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.105 2016/03/18 18:07:28 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.106 2016/03/20 22:56:39 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -948,7 +948,7 @@ breakloop:
  * quoted is special - we need to know 2 things ... are we inside "..."
  * (even if inherited from some previous nesting level) and was there
  * an opening '"' at this level (so the next will be closing).
- * "..." can span nexting levels, but cannot be opened in one and
+ * "..." can span nesting levels, but cannot be opened in one and
  * closed in a different one.
  * To handle this, "quoted" has two fields, the bottom 4 (really 2)
  * bits are 0, 1, or 2, for un, single, and double quoted (single quoted
@@ -964,15 +964,14 @@ struct tokenstate {
 	unsigned short ts_quoted;	/* 1 -> single, 2 -> double */
 };
 
-#define	NQ	0x00
-#define	SQ	0x01
-#define	DQ	0x02
-#define	QF	0x0F
-#define	QS	0x10
+#define	NQ	0x00	/* Unquoted */
+#define	SQ	0x01	/* Single Quotes */
+#define	DQ	0x02	/* Double Quotes (or equivalent) */
+#define	QF	0x0F		/* Mask to extract previous values */
+#define	QS	0x10	/* Quoting started at this level in stack */
 
 #define	LEVELS_PER_BLOCK	8
 #define	VSS			struct statestack
-#define	VVSS			volatile VSS
 
 struct statestack {
 	VSS *prev;		/* previous block in list */
@@ -1034,7 +1033,7 @@ drop_state_level(VSS *stack)
 		stack = ss->prev;
 		if (stack == NULL)
 			return ss;
-		ckfree(__UNVOLATILE(ss));
+		ckfree(ss);
 	}
 	--stack->cur;
 	return stack;
@@ -1052,8 +1051,6 @@ cleanup_state_stack(VSS *stack)
 #define	CHECKEND()	{goto checkend; checkend_return:;}
 #define	PARSEREDIR()	{goto parseredir; parseredir_return:;}
 #define	PARSESUB()	{goto parsesub; parsesub_return:;}
-#define	PARSEBACKQOLD()	{oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
-#define	PARSEBACKQNEW()	{oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
 #define	PARSEARITH()	{goto parsearith; parsearith_return:;}
 
 /*
@@ -1080,8 +1077,171 @@ cleanup_state_stack(VSS *stack)
 #define	varnest		(currentstate(stack)->ts_varnest)
 #define	arinest		(currentstate(stack)->ts_arinest)
 #define	quoted		(currentstate(stack)->ts_quoted)
-#define	TS_PUSH()	(vstack = stack = bump_state_level(stack))
-#define	TS_POP()	(vstack = stack = drop_state_level(stack))
+#define	TS_PUSH()	(stack = bump_state_level(stack))
+#define	TS_POP()	(stack = drop_state_level(stack))
+
+/*
+ * Called to parse command substitutions.  oldstyle is true if the command
+ * is enclosed inside `` (otherwise it was enclosed in "$( )")
+ *
+ * Internally nlpp is a pointer to the head of the linked
+ * list of commands (passed by reference), and savelen is the number of
+ * characters on the top of the stack which must be preserved.
+ */
+static char *
+parsebackq(VSS *const stack, const char *in,
+struct nodelist **const pbqlist, const int oldstyle)
+{
+	struct nodelist **nlpp;
+	int savepbq;
+	union node *n;
+	const char *out;
+	char *str = NULL;
+	char *pout;
+	char *volatile sstr = str;
+	struct jmploc jmploc;
+	struct jmploc *const savehandler = handler;
+	int savelen;
+	int saveprompt;
+
+	savepbq = parsebackquote;
+	if (setjmp(jmploc.loc)) {
+		if (sstr)
+			ckfree(__UNVOLATILE(sstr));
+		cleanup_state_stack(stack);
+		parsebackquote = 0;
+		handler = savehandler;
+		longjmp(handler->loc, 1);
+	}
+	INTOFF;
+	out = in;
+	sstr = str = NULL;
+	savelen = out - stackblock();
+	if (savelen > 0) {
+		sstr = str = ckmalloc(savelen);
+		memcpy(str, stackblock(), savelen);
+	}
+	handler = 
+	INTON;
+if (oldstyle) {
+/* We must read until the closing backquote, giving special
+   treatment to some slashes, and then push the string and
+   reread it as input, interpreting it normally.  */
+int pc;
+   

CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:56:39 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
Move the command substitution "internal subroutine" part of
readtoken1() into a real function of its own (inspired by a
similar change made by FreeBSD - the other internal routines
they moved out are expected to move out here as well soon.)
This change helps avoid gcc 5.3 demanded (not required!) volatile
noise which would slow down parsing. (from kre)


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/bin/sh/parser.c

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

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:27:44 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64:
sha1-x86_64.S x86_64cpuid.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S

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/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.8	Sun Mar 20 18:18:43 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S	Sun Mar 20 18:27:44 2016
@@ -6,27 +6,37 @@
 .type	sha1_block_data_order,@function
 .align	16
 sha1_block_data_order:
-	movq	OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r8
-	movl	4(%r8),%r8d
-	btl	$9,%r8d
-	jnc	.Lialu
-	btl	$28,%r8d
-	jc	_avx_shortcut
+	movl	OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r9d
+	movl	OPENSSL_ia32cap_P+4@GOTPCREL(%rip),%r8d
+	movl	OPENSSL_ia32cap_P+8@GOTPCREL(%rip),%r10d
+	testl	$512,%r8d
+	jz	.Lialu
+	testl	$536870912,%r10d
+	jnz	_shaext_shortcut
+	andl	$296,%r10d
+	cmpl	$296,%r10d
+	je	_avx2_shortcut
+	andl	$268435456,%r8d
+	andl	$1073741824,%r9d
+	orl	%r9d,%r8d
+	cmpl	$1342177280,%r8d
+	je	_avx_shortcut
 	jmp	_ssse3_shortcut
 
 .align	16
 .Lialu:
+	movq	%rsp,%rax
 	pushq	%rbx
 	pushq	%rbp
 	pushq	%r12
 	pushq	%r13
-	movq	%rsp,%r11
+	pushq	%r14
 	movq	%rdi,%r8
 	subq	$72,%rsp
 	movq	%rsi,%r9
 	andq	$-64,%rsp
 	movq	%rdx,%r10
-	movq	%r11,64(%rsp)
+	movq	%rax,64(%rsp)
 .Lprologue:
 
 	movl	0(%r8),%esi
@@ -40,1230 +50,1168 @@ sha1_block_data_order:
 .Lloop:
 	movl	0(%r9),%edx
 	bswapl	%edx
-	movl	%edx,0(%rsp)
-	movl	%r11d,%eax
 	movl	4(%r9),%ebp
+	movl	%r12d,%eax
+	movl	%edx,0(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%ebp
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%ebp,4(%rsp)
+	leal	1518500249(%rdx,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
-	movl	8(%r9),%edx
+	movl	8(%r9),%r14d
+	movl	%r11d,%eax
+	movl	%ebp,4(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%edx,8(%rsp)
+	leal	1518500249(%rbp,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	12(%r9),%ebp
+	movl	12(%r9),%edx
+	movl	%edi,%eax
+	movl	%r14d,8(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%ebp
+	bswapl	%edx
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%ebp,12(%rsp)
+	leal	1518500249(%r14,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	16(%r9),%edx
+	movl	16(%r9),%ebp
+	movl	%esi,%eax
+	movl	%edx,12(%rsp)
 	movl	%r11d,%ecx
-	xorl	%esi,%eax
-	bswapl	%edx
+	bswapl	%ebp
+	xorl	%r13d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%rdi,1),%edi
 	andl	%r12d,%eax
-	movl	%edx,16(%rsp)
+	leal	1518500249(%rdx,%rdi,1),%edi
 	addl	%ecx,%edi
 	xorl	%esi,%eax
 	roll	$30,%r12d
 	addl	%eax,%edi
-	movl	%r12d,%eax
-	movl	20(%r9),%ebp
+	movl	20(%r9),%r14d
+	movl	%r13d,%eax
+	movl	%ebp,16(%rsp)
 	movl	%edi,%ecx
-	xorl	%r13d,%eax
-	bswapl	%ebp
+	bswapl	%r14d
+	xorl	%r12d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%rsi,1),%esi
 	andl	%r11d,%eax
-	movl	%ebp,20(%rsp)
+	leal	1518500249(%rbp,%rsi,1),%esi
 	addl	%ecx,%esi
 	xorl	%r13d,%eax
 	roll	$30,%r11d
 	addl	%eax,%esi
-	movl	%r11d,%eax
 	movl	24(%r9),%edx
+	movl	%r12d,%eax
+	movl	%r14d,20(%rsp)
 	movl	%esi,%ecx
-	xorl	%r12d,%eax
 	bswapl	%edx
+	xorl	%r11d,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r13,1),%r13d
 	andl	%edi,%eax
-	movl	%edx,24(%rsp)
+	leal	1518500249(%r14,%r13,1),%r13d
 	addl	%ecx,%r13d
 	xorl	%r12d,%eax
 	roll	$30,%edi
 	addl	%eax,%r13d
-	movl	%edi,%eax
 	movl	28(%r9),%ebp
+	movl	%r11d,%eax
+	movl	%edx,24(%rsp)
 	movl	%r13d,%ecx
-	xorl	%r11d,%eax
 	bswapl	%ebp
+	xorl	%edi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rdx,%r12,1),%r12d
 	andl	%esi,%eax
-	movl	%ebp,28(%rsp)
+	leal	1518500249(%rdx,%r12,1),%r12d
 	addl	%ecx,%r12d
 	xorl	%r11d,%eax
 	roll	$30,%esi
 	addl	%eax,%r12d
-	movl	%esi,%eax
-	movl	32(%r9),%edx
+	movl	32(%r9),%r14d
+	movl	%edi,%eax
+	movl	%ebp,28(%rsp)
 	movl	%r12d,%ecx
-	xorl	%edi,%eax
-	bswapl	%edx
+	bswapl	%r14d
+	xorl	%esi,%eax
 	roll	$5,%ecx
-	leal	1518500249(%rbp,%r11,1),%r11d
 	andl	%r13d,%eax
-	movl	%edx,32(%rsp)
+	leal	1518500249(%rbp,%r11,1),%r11d
 	addl	%ecx,%r11d
 	xorl	%edi,%eax
 	roll	$30,%r13d
 	addl	%eax,%r11d
-	movl	%r13d,%eax
-	movl	36(%r9),%ebp
+	movl	

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:27:31 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile

Log Message:
elide bug with new cpuid code.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/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/openssl/lib/libcrypto/arch/x86_64/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.8	Sat May 16 18:23:31 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile	Sun Mar 20 18:27:31 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2015/05/16 22:23:31 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2016/03/20 22:27:31 christos Exp $
 
 .include "bsd.own.mk"
 
@@ -16,6 +16,7 @@ regen:
 (echo "#include "; CC=${CC:Q} perl $$i elf | sed \
 		-e 's/\(OPENSSL[A-Za-z0-9_+]*\)(%rip)/\1@GOTPCREL(%rip)/' \
 		-e 's/.hidden	OPENSSL_cpuid_setup/.globl	OPENSSL_cpuid_setup/' \
-		-e 's/call	OPENSSL_cpuid_setup/call	PIC_PLT(OPENSSL_cpuid_setup)/') \
+		-e 's/call	OPENSSL_cpuid_setup/call	PIC_PLT(OPENSSL_cpuid_setup)/' \
+		-e 's/rdseedq/rdseed/') \
 		> $$(basename $$i .pl).S; \
 	done

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:27:44 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64:
sha1-x86_64.S x86_64cpuid.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S

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

CVS commit: src/crypto/external/bsd/openssl/dist/crypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:26:56 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: x86_64cpuid.pl
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl

Log Message:
bring newer versions from 1.1.0-pre4


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl

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/openssl/dist/crypto/x86_64cpuid.pl
diff -u src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl:1.1.1.4 src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl:1.2
--- src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl:1.1.1.4	Tue Feb  5 14:04:18 2013
+++ src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl	Sun Mar 20 18:26:56 2016
@@ -24,7 +24,7 @@ print<<___;
 	call	OPENSSL_cpuid_setup
 
 .hidden	OPENSSL_ia32cap_P
-.comm	OPENSSL_ia32cap_P,8,4
+.comm	OPENSSL_ia32cap_P,16,4
 
 .text
 
@@ -53,12 +53,13 @@ OPENSSL_rdtsc:
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
-.type	OPENSSL_ia32_cpuid,\@abi-omnipotent
+.type	OPENSSL_ia32_cpuid,\@function,1
 .align	16
 OPENSSL_ia32_cpuid:
 	mov	%rbx,%r8		# save %rbx
 
 	xor	%eax,%eax
+	mov	%eax,8(%rdi)		# clear 3rd word
 	cpuid
 	mov	%eax,%r11d		# max value for standard query level
 
@@ -126,6 +127,14 @@ OPENSSL_ia32_cpuid:
 	shr	\$14,%r10d
 	and	\$0xfff,%r10d		# number of cores -1 per L1D
 
+	cmp	\$7,%r11d
+	jb	.Lnocacheinfo
+
+	mov	\$7,%eax
+	xor	%ecx,%ecx
+	cpuid
+	mov	%ebx,8(%rdi)
+
 .Lnocacheinfo:
 	mov	\$1,%eax
 	cpuid
@@ -165,6 +174,7 @@ OPENSSL_ia32_cpuid:
 .Lclear_avx:
 	mov	\$0xefffe7ff,%eax	# ~(1<<28|1<<12|1<<11)
 	and	%eax,%r9d		# clear AVX, FMA and AMD XOP bits
+	andl	\$0xffdf,8(%rdi)	# cleax AVX2, ~(1<<5)
 .Ldone:
 	shl	\$32,%r9
 	mov	%r10d,%eax
@@ -263,6 +273,96 @@ OPENSSL_wipe_cpu:
 	ret
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 ___
+{
+my $out="%r10";
+my $cnt="%rcx";
+my $max="%r11";
+my $lasttick="%r8d";
+my $lastdiff="%r9d";
+my $redzone=win64?8:-8;
+
+print<<___;
+.globl	OPENSSL_instrument_bus
+.type	OPENSSL_instrument_bus,\@abi-omnipotent
+.align	16
+OPENSSL_instrument_bus:
+	mov	$arg1,$out	# tribute to Win64
+	mov	$arg2,$cnt
+	mov	$arg2,$max
+
+	rdtsc			# collect 1st tick
+	mov	%eax,$lasttick	# lasttick = tick
+	mov	\$0,$lastdiff	# lastdiff = 0
+	clflush	($out)
+	.byte	0xf0		# lock
+	add	$lastdiff,($out)
+	jmp	.Loop
+.align	16
+.Loop:	rdtsc
+	mov	%eax,%edx
+	sub	$lasttick,%eax
+	mov	%edx,$lasttick
+	mov	%eax,$lastdiff
+	clflush	($out)
+	.byte	0xf0		# lock
+	add	%eax,($out)
+	lea	4($out),$out
+	sub	\$1,$cnt
+	jnz	.Loop
+
+	mov	$max,%rax
+	ret
+.size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
+
+.globl	OPENSSL_instrument_bus2
+.type	OPENSSL_instrument_bus2,\@abi-omnipotent
+.align	16
+OPENSSL_instrument_bus2:
+	mov	$arg1,$out	# tribute to Win64
+	mov	$arg2,$cnt
+	mov	$arg3,$max
+	mov	$cnt,$redzone(%rsp)
+
+	rdtsc			# collect 1st tick
+	mov	%eax,$lasttick	# lasttick = tick
+	mov	\$0,$lastdiff	# lastdiff = 0
+
+	clflush	($out)
+	.byte	0xf0		# lock
+	add	$lastdiff,($out)
+
+	rdtsc			# collect 1st diff
+	mov	%eax,%edx
+	sub	$lasttick,%eax	# diff
+	mov	%edx,$lasttick	# lasttick = tick
+	mov	%eax,$lastdiff	# lastdiff = diff
+.Loop2:
+	clflush	($out)
+	.byte	0xf0		# lock
+	add	%eax,($out)	# accumulate diff
+
+	sub	\$1,$max
+	jz	.Ldone2
+
+	rdtsc
+	mov	%eax,%edx
+	sub	$lasttick,%eax	# diff
+	mov	%edx,$lasttick	# lasttick = tick
+	cmp	$lastdiff,%eax
+	mov	%eax,$lastdiff	# lastdiff = diff
+	mov	\$0,%edx
+	setne	%dl
+	sub	%rdx,$cnt	# conditional --$cnt
+	lea	($out,%rdx,4),$out	# conditional ++$out
+	jnz	.Loop2
+
+.Ldone2:
+	mov	$redzone(%rsp),%rax
+	sub	$cnt,%rax
+	ret
+.size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
+___
+}
 
 print<<___;
 .globl	OPENSSL_ia32_rdrand
@@ -279,6 +379,21 @@ OPENSSL_ia32_rdrand:
 	cmove	%rcx,%rax
 	ret
 .size	OPENSSL_ia32_rdrand,.-OPENSSL_ia32_rdrand
+
+.globl	OPENSSL_ia32_rdseed
+.type	OPENSSL_ia32_rdseed,\@abi-omnipotent
+.align	16
+OPENSSL_ia32_rdseed:
+	mov	\$8,%ecx
+.Loop_rdseed:
+	rdseed	%rax
+	jc	.Lbreak_rdseed
+	loop	.Loop_rdseed
+.Lbreak_rdseed:
+	cmp	\$0,%rax
+	cmove	%rcx,%rax
+	ret
+.size	OPENSSL_ia32_rdseed,.-OPENSSL_ia32_rdseed
 ___
 
 close STDOUT;	# flush

Index: src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl
diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.3 src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.4
--- src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.3	Sun Mar 20 18:17:13 2016
+++ src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl	Sun Mar 20 18:26:56 2016
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #
 # 

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:27:31 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile

Log Message:
elide bug with new cpuid code.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile

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

CVS commit: src/crypto/external/bsd/openssl/dist/crypto

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:26:56 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: x86_64cpuid.pl
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl

Log Message:
bring newer versions from 1.1.0-pre4


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl

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

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:18:43 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64:
sha1-x86_64.S x86_64-mont5.S

Log Message:
re-gen to fix sha1. there were also improvements for montgomery multiplications
that we did not have from a previous change.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S

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

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:18:43 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64:
sha1-x86_64.S x86_64-mont5.S

Log Message:
re-gen to fix sha1. there were also improvements for montgomery multiplications
that we did not have from a previous change.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S

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/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.7	Thu May 28 15:13:53 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S	Sun Mar 20 18:18:43 2016
@@ -1298,7 +1298,7 @@ _ssse3_shortcut:
 	pushq	%rbx
 	pushq	%rbp
 	pushq	%r12
-	leaq	-64(%rsp),%rsp
+	leaq	-72(%rsp),%rsp
 	movq	%rdi,%r8
 	movq	%rsi,%r9
 	movq	%rdx,%r10
@@ -2470,7 +2470,7 @@ _ssse3_shortcut:
 	movl	%ecx,8(%r8)
 	movl	%edx,12(%r8)
 	movl	%ebp,16(%r8)
-	leaq	64(%rsp),%rsi
+	leaq	72(%rsp),%rsi
 	movq	0(%rsi),%r12
 	movq	8(%rsi),%rbp
 	movq	16(%rsi),%rbx
@@ -2485,7 +2485,7 @@ _avx_shortcut:
 	pushq	%rbx
 	pushq	%rbp
 	pushq	%r12
-	leaq	-64(%rsp),%rsp
+	leaq	-72(%rsp),%rsp
 	movq	%rdi,%r8
 	movq	%rsi,%r9
 	movq	%rdx,%r10
@@ -3621,7 +3621,7 @@ _avx_shortcut:
 	movl	%ecx,8(%r8)
 	movl	%edx,12(%r8)
 	movl	%ebp,16(%r8)
-	leaq	64(%rsp),%rsi
+	leaq	72(%rsp),%rsi
 	movq	0(%rsi),%r12
 	movq	8(%rsi),%rbp
 	movq	16(%rsi),%rbx

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S:1.1	Sat May 16 18:23:31 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-mont5.S	Sun Mar 20 18:18:43 2016
@@ -14,47 +14,153 @@ bn_mul_mont_gather5:
 .align	16
 .Lmul_enter:
 	movl	%r9d,%r9d
-	movl	8(%rsp),%r10d
+	movd	8(%rsp),%xmm5
+	leaq	.Linc(%rip),%r10
 	pushq	%rbx
 	pushq	%rbp
 	pushq	%r12
 	pushq	%r13
 	pushq	%r14
 	pushq	%r15
+
+.Lmul_alloca:
 	movq	%rsp,%rax
 	leaq	2(%r9),%r11
 	negq	%r11
-	leaq	(%rsp,%r11,8),%rsp
+	leaq	-264(%rsp,%r11,8),%rsp
 	andq	$-1024,%rsp
 
 	movq	%rax,8(%rsp,%r9,8)
 .Lmul_body:
-	movq	%rdx,%r12
-	movq	%r10,%r11
-	shrq	$3,%r10
-	andq	$7,%r11
-	notq	%r10
-	leaq	.Lmagic_masks(%rip),%rax
-	andq	$3,%r10
-	leaq	96(%r12,%r11,8),%r12
-	movq	0(%rax,%r10,8),%xmm4
-	movq	8(%rax,%r10,8),%xmm5
-	movq	16(%rax,%r10,8),%xmm6
-	movq	24(%rax,%r10,8),%xmm7
-
-	movq	-96(%r12),%xmm0
-	movq	-32(%r12),%xmm1
-	pand	%xmm4,%xmm0
-	movq	32(%r12),%xmm2
-	pand	%xmm5,%xmm1
-	movq	96(%r12),%xmm3
-	pand	%xmm6,%xmm2
-	por	%xmm1,%xmm0
-	pand	%xmm7,%xmm3
+	leaq	128(%rdx),%r12
+	movdqa	0(%r10),%xmm0
+	movdqa	16(%r10),%xmm1
+	leaq	24-112(%rsp,%r9,8),%r10
+	andq	$-16,%r10
+
+	pshufd	$0,%xmm5,%xmm5
+	movdqa	%xmm1,%xmm4
+	movdqa	%xmm1,%xmm2
+	paddd	%xmm0,%xmm1
+	pcmpeqd	%xmm5,%xmm0
+.byte	0x67
+	movdqa	%xmm4,%xmm3
+	paddd	%xmm1,%xmm2
+	pcmpeqd	%xmm5,%xmm1
+	movdqa	%xmm0,112(%r10)
+	movdqa	%xmm4,%xmm0
+
+	paddd	%xmm2,%xmm3
+	pcmpeqd	%xmm5,%xmm2
+	movdqa	%xmm1,128(%r10)
+	movdqa	%xmm4,%xmm1
+
+	paddd	%xmm3,%xmm0
+	pcmpeqd	%xmm5,%xmm3
+	movdqa	%xmm2,144(%r10)
+	movdqa	%xmm4,%xmm2
+
+	paddd	%xmm0,%xmm1
+	pcmpeqd	%xmm5,%xmm0
+	movdqa	%xmm3,160(%r10)
+	movdqa	%xmm4,%xmm3
+	paddd	%xmm1,%xmm2
+	pcmpeqd	%xmm5,%xmm1
+	movdqa	%xmm0,176(%r10)
+	movdqa	%xmm4,%xmm0
+
+	paddd	%xmm2,%xmm3
+	pcmpeqd	%xmm5,%xmm2
+	movdqa	%xmm1,192(%r10)
+	movdqa	%xmm4,%xmm1
+
+	paddd	%xmm3,%xmm0
+	pcmpeqd	%xmm5,%xmm3
+	movdqa	%xmm2,208(%r10)
+	movdqa	%xmm4,%xmm2
+
+	paddd	%xmm0,%xmm1
+	pcmpeqd	%xmm5,%xmm0
+	movdqa	%xmm3,224(%r10)
+	movdqa	%xmm4,%xmm3
+	paddd	%xmm1,%xmm2
+	pcmpeqd	%xmm5,%xmm1
+	movdqa	%xmm0,240(%r10)
+	movdqa	%xmm4,%xmm0
+
+	paddd	%xmm2,%xmm3
+	pcmpeqd	%xmm5,%xmm2
+	movdqa	%xmm1,256(%r10)
+	movdqa	%xmm4,%xmm1
+
+	paddd	%xmm3,%xmm0
+	pcmpeqd	%xmm5,%xmm3
+	movdqa	%xmm2,272(%r10)
+	movdqa	%xmm4,%xmm2
+
+	paddd	%xmm0,%xmm1
+	pcmpeqd	%xmm5,%xmm0
+	movdqa	%xmm3,288(%r10)
+	movdqa	%xmm4,%xmm3
+	paddd	%xmm1,%xmm2
+	pcmpeqd	%xmm5,%xmm1
+	movdqa	%xmm0,304(%r10)
+
+	paddd	%xmm2,%xmm3
+.byte	0x67
+	pcmpeqd	%xmm5,%xmm2
+	movdqa	%xmm1,320(%r10)
+
+	pcmpeqd	%xmm5,%xmm3
+	movdqa	%xmm2,336(%r10)
+	pand	64(%r12),%xmm0
+
+	pand	80(%r12),%xmm1
+	pand	96(%r12),%xmm2
+	movdqa	%xmm3,352(%r10)
+	pand	112(%r12),%xmm3
+	por	%xmm2,%xmm0
+	por	%xmm3,%xmm1
+	movdqa	-128(%r12),%xmm4
+	movdqa	-112(%r12),%xmm5
+	movdqa	-96(%r12),%xmm2
+	pand	

CVS commit: src/crypto/external/bsd/openssl/dist/crypto/sha/asm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:17:13 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl

Log Message:
move scratch stack offset from 64 to 72 bytes so that it is aligned properly.
We core-dump using xmm instructions with gcc-5.3 otherwise. This is all
fixed a lot better in openssl-1.1.0-pre4 and I am tempted


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl

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/openssl/dist/crypto/sha/asm/sha1-x86_64.pl
diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.2 src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.2	Thu May 28 15:13:33 2015
+++ src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl	Sun Mar 20 18:17:13 2016
@@ -308,7 +308,7 @@ _ssse3_shortcut:
 	push	%rbx
 	push	%rbp
 	push	%r12
-	lea	`-64-($win64?5*16:0)`(%rsp),%rsp
+	lea	`-64-($win64?5*16:8)`(%rsp),%rsp
 ___
 $code.=<<___ if ($win64);
 	movaps	%xmm6,64+0(%rsp)
@@ -698,7 +698,7 @@ $code.=<<___ if ($win64);
 	movaps	64+64(%rsp),%xmm10
 ___
 $code.=<<___;
-	lea	`64+($win64?5*16:0)`(%rsp),%rsi
+	lea	`64+($win64?5*16:8)`(%rsp),%rsi
 	mov	0(%rsi),%r12
 	mov	8(%rsi),%rbp
 	mov	16(%rsi),%rbx
@@ -728,7 +728,7 @@ _avx_shortcut:
 	push	%rbx
 	push	%rbp
 	push	%r12
-	lea	`-64-($win64?5*16:0)`(%rsp),%rsp
+	lea	`-64-($win64?5*16:8)`(%rsp),%rsp
 ___
 $code.=<<___ if ($win64);
 	movaps	%xmm6,64+0(%rsp)
@@ -1056,7 +1056,7 @@ $code.=<<___ if ($win64);
 	movaps	64+64(%rsp),%xmm10
 ___
 $code.=<<___;
-	lea	`64+($win64?5*16:0)`(%rsp),%rsi
+	lea	`64+($win64?5*16:8)`(%rsp),%rsi
 	mov	0(%rsi),%r12
 	mov	8(%rsi),%rbp
 	mov	16(%rsi),%rbx

CVS commit: src/crypto/external/bsd/openssl/dist/crypto/sha/asm

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 22:17:13 UTC 2016

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl

Log Message:
move scratch stack offset from 64 to 72 bytes so that it is aligned properly.
We core-dump using xmm instructions with gcc-5.3 otherwise. This is all
fixed a lot better in openssl-1.1.0-pre4 and I am tempted


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl

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

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 20 21:27:27 UTC 2016

Modified Files:
src/external/gpl3/gcc: README.gcc53

Log Message:
update alpha (mostly working) and hppa (mknative-gcc works)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/README.gcc53

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

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 20 21:27:27 UTC 2016

Modified Files:
src/external/gpl3/gcc: README.gcc53

Log Message:
update alpha (mostly working) and hppa (mknative-gcc works)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/README.gcc53

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

Modified files:

Index: src/external/gpl3/gcc/README.gcc53
diff -u src/external/gpl3/gcc/README.gcc53:1.5 src/external/gpl3/gcc/README.gcc53:1.6
--- src/external/gpl3/gcc/README.gcc53:1.5	Sat Mar 19 20:53:46 2016
+++ src/external/gpl3/gcc/README.gcc53	Sun Mar 20 21:27:27 2016
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc53,v 1.5 2016/03/19 20:53:46 mrg Exp $
+$NetBSD: README.gcc53,v 1.6 2016/03/20 21:27:27 mrg Exp $
 
 lib:
 	libasan is disabled currently (haven't tried yet)
@@ -26,7 +26,7 @@ arch/feature list.  anything not here ha
 
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 	-	---	--	--			---
-alpha		y	y	y	y		y		y	?[10]
+alpha		y	y	y	y		y		y[6]	?[10]
 arm		y	?	y	y
 armeb		y	?	y	y
 earm		y	?	y	y
@@ -43,7 +43,7 @@ earmv7		y	?	y	y
 earmv7eb	y	?	y	y
 earmv7hf	y	?	y	y
 earmv7hfeb	y	?	y	y
-hppa		y	?	y	n[6]
+hppa		y	?	y	y
 i386		y	y	y	y		y[4]		y	
 m68000		y	?	y	n[8]
 m68k		y	?	y	n[8]
@@ -69,7 +69,7 @@ x86_64		y	y	y	y		y		y
 [4] - really, this is 'distribution sets' and a kernel
 [5] - libgcc fails to build, multiply defined symbols.  probably some libgcc
   makefile change needing re-doing.
-[6] - libc fenv.c fails to build
+[6] - sshd is broken, regardless of compiler options
 [7] - GCC fails to build
 [8] - GCC fails with eg: error: stack protector not protecting local variables: variable length buffer [-Werror=stack-protector]
 [9] - with a 4.8 base.tgz and 5.3 everythingelse.tgz, about 60 additional failures out of ~3800

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 20 21:14:21 UTC 2016

Modified Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa: backtrace-supported.h
config.h
src/external/gpl3/gcc/lib/libgcc/arch/hppa: defs.mk
src/external/gpl3/gcc/lib/libgomp/arch/hppa: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/hppa: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa: auto-host.h bversion.h
configargs.h defs.mk gtyp-input.list plugin-version.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/hppa: config.h

Log Message:
mknative-gcc for HPPA and GCC 5.3.  thanks for fixing fenv.c, nick!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/hppa/defs.mk
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgomp/arch/hppa/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgomp/arch/hppa/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/hppa/libgomp_f.h \
src/external/gpl3/gcc/lib/libgomp/arch/hppa/omp.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libiberty/arch/hppa/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/cxxabi_tweaks.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/defs.mk \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr-posix.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr-single.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gstdint.h
cvs rdiff -u -r1.16 -r1.17 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/bversion.h
cvs rdiff -u -r1.18 -r1.19 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/configargs.h
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/gtyp-input.list
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/plugin-version.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/hppa/config.h

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

Modified files:

Index: src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h:1.4
--- src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h:1.3	Sat Jan 10 22:59:34 2015
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h	Sun Mar 20 21:14:20 2016
@@ -1,9 +1,9 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* backtrace-supported.h.in -- Whether stack backtrace is supported.
-   Copyright (C) 2012-2013 Free Software Foundation, Inc.
+   Copyright (C) 2012-2015 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
 
 Redistribution and use in source and binary forms, with or without
Index: src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h
diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h:1.4
--- src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h:1.3	Sat Jan 10 22:59:34 2015
+++ src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h	Sun Mar 20 21:14:20 2016
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp  */
+/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp  */
 /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
 
 /* config.h.  Generated from config.h.in by configure.  */
@@ -8,6 +8,9 @@
 /* ELF size: 32 or 64 */
 #define BACKTRACE_ELF_SIZE 32
 
+/* Define to 1 if you have the __atomic functions */
+#define HAVE_ATOMIC_FUNCTIONS 1
+
 /* Define to 1 if you have the 

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 20 21:14:21 UTC 2016

Modified Files:
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa: backtrace-supported.h
config.h
src/external/gpl3/gcc/lib/libgcc/arch/hppa: defs.mk
src/external/gpl3/gcc/lib/libgomp/arch/hppa: config.h libgomp.spec
libgomp_f.h omp.h
src/external/gpl3/gcc/lib/libiberty/arch/hppa: config.h
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: c++config.h
cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa: auto-host.h bversion.h
configargs.h defs.mk gtyp-input.list plugin-version.h
src/external/gpl3/gcc/usr.bin/libcpp/arch/hppa: config.h

Log Message:
mknative-gcc for HPPA and GCC 5.3.  thanks for fixing fenv.c, nick!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/backtrace-supported.h \
src/external/gpl3/gcc/lib/libbacktrace/arch/hppa/config.h
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/hppa/defs.mk
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libgomp/arch/hppa/config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libgomp/arch/hppa/libgomp.spec \
src/external/gpl3/gcc/lib/libgomp/arch/hppa/libgomp_f.h \
src/external/gpl3/gcc/lib/libgomp/arch/hppa/omp.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libiberty/arch/hppa/config.h
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/cxxabi_tweaks.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/defs.mk \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr-posix.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr-single.h \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gstdint.h
cvs rdiff -u -r1.16 -r1.17 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h
cvs rdiff -u -r1.5 -r1.6 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/bversion.h
cvs rdiff -u -r1.18 -r1.19 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/configargs.h
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/defs.mk
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/gtyp-input.list
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/usr.bin/gcc/arch/hppa/plugin-version.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/libcpp/arch/hppa/config.h

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

CVS commit: src/lib/libc/sys

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Mar 20 20:09:49 UTC 2016

Modified Files:
src/lib/libc/sys: ktrace.2

Log Message:
Sort errors. Improve markup.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/sys/ktrace.2

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

CVS commit: src/lib/libc/sys

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Sun Mar 20 20:09:49 UTC 2016

Modified Files:
src/lib/libc/sys: ktrace.2

Log Message:
Sort errors. Improve markup.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/sys/ktrace.2

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

Modified files:

Index: src/lib/libc/sys/ktrace.2
diff -u src/lib/libc/sys/ktrace.2:1.20 src/lib/libc/sys/ktrace.2:1.21
--- src/lib/libc/sys/ktrace.2:1.20	Sat Mar 19 17:15:13 2016
+++ src/lib/libc/sys/ktrace.2	Sun Mar 20 20:09:49 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ktrace.2,v 1.20 2016/03/19 17:15:13 dholland Exp $
+.\"	$NetBSD: ktrace.2,v 1.21 2016/03/20 20:09:49 wiz Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -139,7 +139,7 @@ bytes of a
 record of version
 .Nm ktr_version .
 The type specific records are defined in the
-.Pa \*[Lt]sys/ktrace.h\*[Gt]
+.Aq Pa sys/ktrace.h
 include file.
 .Sh RETURN VALUES
 On successful completion a value of 0 is returned.
@@ -150,10 +150,14 @@ is set to show the error.
 .Fn ktrace
 will fail if:
 .Bl -tag -width ENAMETOOLONGAA
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
+.It Bq Er EACCES
+Search permission is denied for a component of the path prefix.
 .It Bq Er EINVAL
 The pathname contains a character with the high-order bit set.
+.It Bq Er EIO
+An I/O error occurred while reading from or writing to the file system.
+.It Bq Er ELOOP
+Too many symbolic links were encountered in translating the pathname.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
 .Brq Dv NAME_MAX
@@ -163,12 +167,8 @@ or an entire path name exceeded
 characters.
 .It Bq Er ENOENT
 The named tracefile does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
+.It Bq Er ENOTDIR
+A component of the path prefix is not a directory.
 .El
 .Sh SEE ALSO
 .Xr kdump 1 ,

CVS commit: src/usr.sbin/makemandb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 17:31:09 UTC 2016

Modified Files:
src/usr.sbin/makemandb: apropos-utils.c

Log Message:
PR/50460: Abhinav Upadhyay: Fix legacy apropos query to match both the name
and the one line description and delete extra args.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/makemandb/apropos-utils.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/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.19 src/usr.sbin/makemandb/apropos-utils.c:1.20
--- src/usr.sbin/makemandb/apropos-utils.c:1.19	Thu Dec  3 16:01:50 2015
+++ src/usr.sbin/makemandb/apropos-utils.c	Sun Mar 20 13:31:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: apropos-utils.c,v 1.19 2015/12/03 21:01:50 christos Exp $	*/
+/*	$NetBSD: apropos-utils.c,v 1.20 2016/03/20 17:31:09 christos Exp $	*/
 /*-
  * Copyright (c) 2011 Abhinav Upadhyay 
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: apropos-utils.c,v 1.19 2015/12/03 21:01:50 christos Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.20 2016/03/20 17:31:09 christos Exp $");
 
 #include 
 #include 
@@ -559,9 +559,7 @@ run_query_internal(sqlite3 *db, const ch
 		"%s"
 		"%s",
 		snippet_args[0], snippet_args[1], snippet_args[2],
-		wild,
-		section_clause ? section_clause : "",
-		snippet_args[0], snippet_args[1], snippet_args[2],
+		wild, wild,
 		section_clause ? section_clause : "",
 		limit_clause ? limit_clause : "");
 		free(wild);

CVS commit: src/usr.sbin/makemandb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 17:31:09 UTC 2016

Modified Files:
src/usr.sbin/makemandb: apropos-utils.c

Log Message:
PR/50460: Abhinav Upadhyay: Fix legacy apropos query to match both the name
and the one line description and delete extra args.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/makemandb/apropos-utils.c

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

Re: CVS commit: src/sys/sys

[Nick Hudson]

On 03/20/16 14:41, Joerg Sonnenberger wrote:

On Fri, Mar 18, 2016 at 04:29:15PM +, Nick Hudson wrote:



Is there a PR that describes the clang problem?

I gave you a detailed explination why the old version is a problem. So
far I have seen no real justification for the change, other than some
mumblings about ld mishandling weak symbols. That seems to be a pretty
clear cut case for a revert and going back to the design board to
understand why rump started failing with new binutils.


I'm old and forgetful and need a PR.

I think at the moment it's a case of least used gets left broken until 
all problems are understood




Joerg


Nick

Re: CVS commit: src/sys

[Martin Husemann]

On Sun, Mar 20, 2016 at 02:58:11PM +, Pierre Pronchery wrote:
> Module Name:  src
> Committed By: khorben
> Date: Sun Mar 20 14:58:11 UTC 2016
> 
> Modified Files:
>   src/sys/kern: kern_exec.c kern_pax.c
>   src/sys/sys: pax.h
> 
> Log Message:
> Let PaX ASLR know about the current emulation

Why are you commiting this while disucssion is still ongoing?
This is not the correct fix and also breaks the build for all 32bit
architectures.

Martin

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 16:39:36 UTC 2016

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

Log Message:
simplify.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/kern_pax.c

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

Modified files:

Index: src/sys/kern/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.35 src/sys/kern/kern_pax.c:1.36
--- src/sys/kern/kern_pax.c:1.35	Sun Mar 20 10:58:10 2016
+++ src/sys/kern/kern_pax.c	Sun Mar 20 12:39:36 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_pax.c,v 1.35 2016/03/20 14:58:10 khorben Exp $	*/
+/*	$NetBSD: kern_pax.c,v 1.36 2016/03/20 16:39:36 christos Exp $	*/
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.35 2016/03/20 14:58:10 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.36 2016/03/20 16:39:36 christos Exp $");
 
 #include "opt_pax.h"
 
@@ -86,7 +86,6 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v
 
 #ifdef PAX_ASLR
 #include 
-#include 
 
 int pax_aslr_enabled = 1;
 int pax_aslr_global = PAX_ASLR;
@@ -97,6 +96,9 @@ int pax_aslr_global = PAX_ASLR;
 #ifndef PAX_ASLR_DELTA_MMAP_LEN
 #define PAX_ASLR_DELTA_MMAP_LEN		((sizeof(void *) * NBBY) / 2)
 #endif
+#ifndef PAX_ASLR_DELTA_MMAP_LEN32
+#define PAX_ASLR_DELTA_MMAP_LEN32	((sizeof(uint32_t) * NBBY) / 2)
+#endif
 #ifndef PAX_ASLR_DELTA_STACK_LSB
 #define PAX_ASLR_DELTA_STACK_LSB	PGSHIFT
 #endif
@@ -405,14 +407,13 @@ pax_aslr_init_vm(struct lwp *l, struct v
 	if (!pax_aslr_active(l))
 		return;
 
-	if (ep->ep_flags & EXEC_32)
-		vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
-		PAX_ASLR_DELTA_MMAP_LSB,
-		(sizeof(netbsd32_pointer_t) * NBBY) / 2);
-	else
-		vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
-		PAX_ASLR_DELTA_MMAP_LSB, PAX_ASLR_DELTA_MMAP_LEN);
-	PAX_DPRINTF("delta_mmap=%#jx", vm->vm_aslr_delta_mmap);
+	uint32_t len = (ep->ep_flags & EXEC_32) ?
+	PAX_ASLR_DELTA_MMAP_LEN32 : PAX_ASLR_DELTA_MMAP_LEN;
+
+	vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
+	PAX_ASLR_DELTA_MMAP_LSB, len);
+
+	PAX_DPRINTF("delta_mmap=%#jx/%u", vm->vm_aslr_delta_mmap, len);
 }
 
 void

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 16:39:36 UTC 2016

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

Log Message:
simplify.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/kern_pax.c

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

CVS commit: src/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 16:26:06 UTC 2016

Modified Files:
src/include: stddef.h

Log Message:
use foo - 0 instead of testing for defined(foo); from joerg@


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/include/stddef.h

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

Modified files:

Index: src/include/stddef.h
diff -u src/include/stddef.h:1.19 src/include/stddef.h:1.20
--- src/include/stddef.h:1.19	Sun Mar 20 10:11:49 2016
+++ src/include/stddef.h	Sun Mar 20 12:26:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: stddef.h,v 1.19 2016/03/20 14:11:49 christos Exp $	*/
+/*	$NetBSD: stddef.h,v 1.20 2016/03/20 16:26:06 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -67,8 +67,7 @@ typedef	_BSD_WCHAR_T_	wchar_t;
 (_cast(static_cast(0)->member
 #endif  
 
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) \
-  || (defined(__cplusplus) && __cplusplus >= 201103L)
+#if (__STDC_VERSION__ - 0) >= 201112L || (__cplusplus - 0) >= 201103L
 typedef union {
 	void *_v;
 	long double _ld;

Re: CVS commit: src/include

[Christos Zoulas]

In article <20160320144155.gb29...@britannica.bec.de>,
Joerg Sonnenberger   wrote:
>On Sun, Mar 20, 2016 at 10:11:50AM -0400, Christos Zoulas wrote:
>> Module Name: src
>> Committed By:christos
>> Date:Sun Mar 20 14:11:50 UTC 2016
>> 
>> Modified Files:
>>  src/include: stddef.h
>> 
>> Log Message:
>> PR/50983: David Shao: Protect stddef;
>> also make the pointer void *.
>
>It would be much nicer to cut out the defined(foo) checks and just use
>foo - 0 > ...

Indeed.

christos

CVS commit: src/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 16:26:06 UTC 2016

Modified Files:
src/include: stddef.h

Log Message:
use foo - 0 instead of testing for defined(foo); from joerg@


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/include/stddef.h

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

CVS commit: src/bin/csh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Mar 16 22:35:45 UTC 2016

Modified Files:
src/bin/csh: exec.c

Log Message:
add Will Robinson comment.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/bin/csh/exec.c

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

CVS commit: src/sys

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sun Mar 20 14:58:11 UTC 2016

Modified Files:
src/sys/kern: kern_exec.c kern_pax.c
src/sys/sys: pax.h

Log Message:
Let PaX ASLR know about the current emulation

This effectively fixes PaX ASLR with 32-bits emulation on 64-bits
platforms. Without this knowledge, the offset applied for 32-bits
programs was really meant for a 64-bits address space - thus
shifting the address up to 12 bits, with a success rate of about
1/4096. This offset is calculated once in the lifetime of the
process, which therefore behaved normally when able to start.

Fixes kern/50469, probably also kern/50986

Tested on NetBSD/amd64 (emul_netbsd32)


To generate a diff of this commit:
cvs rdiff -u -r1.423 -r1.424 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/kern_pax.c
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/pax.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.423 src/sys/kern/kern_exec.c:1.424
--- src/sys/kern/kern_exec.c:1.423	Mon Nov 30 22:47:19 2015
+++ src/sys/kern/kern_exec.c	Sun Mar 20 14:58:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.423 2015/11/30 22:47:19 pgoyette Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.424 2016/03/20 14:58:10 khorben Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.423 2015/11/30 22:47:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.424 2016/03/20 14:58:10 khorben Exp $");
 
 #include "opt_exec.h"
 #include "opt_execfmt.h"
@@ -1160,7 +1160,7 @@ execve_runproc(struct lwp *l, struct exe
 	vm->vm_minsaddr = (void *)epp->ep_minsaddr;
 
 #ifdef PAX_ASLR
-	pax_aslr_init_vm(l, vm);
+	pax_aslr_init_vm(l, vm, epp);
 #endif /* PAX_ASLR */
 
 	/* Now map address space. */

Index: src/sys/kern/kern_pax.c
diff -u src/sys/kern/kern_pax.c:1.34 src/sys/kern/kern_pax.c:1.35
--- src/sys/kern/kern_pax.c:1.34	Sat Mar 19 18:56:37 2016
+++ src/sys/kern/kern_pax.c	Sun Mar 20 14:58:10 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_pax.c,v 1.34 2016/03/19 18:56:37 christos Exp $	*/
+/*	$NetBSD: kern_pax.c,v 1.35 2016/03/20 14:58:10 khorben Exp $	*/
 
 /*
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.34 2016/03/19 18:56:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v 1.35 2016/03/20 14:58:10 khorben Exp $");
 
 #include "opt_pax.h"
 
@@ -86,6 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_pax.c,v
 
 #ifdef PAX_ASLR
 #include 
+#include 
 
 int pax_aslr_enabled = 1;
 int pax_aslr_global = PAX_ASLR;
@@ -399,13 +400,18 @@ pax_aslr_active(struct lwp *l)
 }
 
 void
-pax_aslr_init_vm(struct lwp *l, struct vmspace *vm)
+pax_aslr_init_vm(struct lwp *l, struct vmspace *vm, struct exec_package *ep)
 {
 	if (!pax_aslr_active(l))
 		return;
 
-	vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
-	PAX_ASLR_DELTA_MMAP_LSB, PAX_ASLR_DELTA_MMAP_LEN);
+	if (ep->ep_flags & EXEC_32)
+		vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
+		PAX_ASLR_DELTA_MMAP_LSB,
+		(sizeof(netbsd32_pointer_t) * NBBY) / 2);
+	else
+		vm->vm_aslr_delta_mmap = PAX_ASLR_DELTA(cprng_fast32(),
+		PAX_ASLR_DELTA_MMAP_LSB, PAX_ASLR_DELTA_MMAP_LEN);
 	PAX_DPRINTF("delta_mmap=%#jx", vm->vm_aslr_delta_mmap);
 }
 

Index: src/sys/sys/pax.h
diff -u src/sys/sys/pax.h:1.17 src/sys/sys/pax.h:1.18
--- src/sys/sys/pax.h:1.17	Sat Mar 19 18:56:37 2016
+++ src/sys/sys/pax.h	Sun Mar 20 14:58:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.h,v 1.17 2016/03/19 18:56:37 christos Exp $ */
+/* $NetBSD: pax.h,v 1.18 2016/03/20 14:58:11 khorben Exp $ */
 
 /*-
  * Copyright (c) 2006 Elad Efrat 
@@ -62,7 +62,7 @@ int pax_segvguard(struct lwp *, struct v
 
 bool pax_aslr_epp_active(struct exec_package *);
 bool pax_aslr_active(struct lwp *);
-void pax_aslr_init_vm(struct lwp *, struct vmspace *);
+void pax_aslr_init_vm(struct lwp *, struct vmspace *, struct exec_package *);
 void pax_aslr_stack(struct exec_package *, u_long *);
 void pax_aslr_mmap(struct lwp *, vaddr_t *, vaddr_t, int);
 

CVS commit: src/sys

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sun Mar 20 14:58:11 UTC 2016

Modified Files:
src/sys/kern: kern_exec.c kern_pax.c
src/sys/sys: pax.h

Log Message:
Let PaX ASLR know about the current emulation

This effectively fixes PaX ASLR with 32-bits emulation on 64-bits
platforms. Without this knowledge, the offset applied for 32-bits
programs was really meant for a 64-bits address space - thus
shifting the address up to 12 bits, with a success rate of about
1/4096. This offset is calculated once in the lifetime of the
process, which therefore behaved normally when able to start.

Fixes kern/50469, probably also kern/50986

Tested on NetBSD/amd64 (emul_netbsd32)


To generate a diff of this commit:
cvs rdiff -u -r1.423 -r1.424 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.34 -r1.35 src/sys/kern/kern_pax.c
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/pax.h

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

Re: CVS commit: src/include

[Joerg Sonnenberger]

On Sun, Mar 20, 2016 at 10:11:50AM -0400, Christos Zoulas wrote:
> Module Name:  src
> Committed By: christos
> Date: Sun Mar 20 14:11:50 UTC 2016
> 
> Modified Files:
>   src/include: stddef.h
> 
> Log Message:
> PR/50983: David Shao: Protect stddef;
> also make the pointer void *.

It would be much nicer to cut out the defined(foo) checks and just use
foo - 0 > ...

Joerg

Re: CVS commit: src/sys/sys

[Joerg Sonnenberger]

On Fri, Mar 18, 2016 at 04:29:15PM +, Nick Hudson wrote:
> On 03/18/16 16:19, Joerg Sonnenberger wrote:
> >On Fri, Mar 18, 2016 at 10:52:27AM +, Christos Zoulas wrote:
> >>In article <20160318030154.gb12...@britannica.bec.de>,
> >>Joerg Sonnenberger   wrote:
> >>>On Thu, Mar 10, 2016 at 07:44:57PM -0500, Christos Zoulas wrote:
> Module Name:  src
> Committed By: christos
> Date: Fri Mar 11 00:44:56 UTC 2016
> 
> Modified Files:
>   src/sys/sys: cdefs_elf.h
> 
> Log Message:
> Undo weak here to fix the tests; will revisit soon.
> >>>Can you revert this now as it is broken and should not be used to work
> >>>around binutils bugs?
> >>Did something change? If I revert it all the rump tests fail...
> >So we are breaking clang for bugs in binutils now?
> >
> >Joerg
> >
> 
> Is there a PR that describes the clang problem?

I gave you a detailed explination why the old version is a problem. So
far I have seen no real justification for the change, other than some
mumblings about ld mishandling weak symbols. That seems to be a pretty
clear cut case for a revert and going back to the design board to
understand why rump started failing with new binutils.

Joerg

CVS commit: src/lib/libm/arch/hppa

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 14:22:46 UTC 2016

Modified Files:
src/lib/libm/arch/hppa: fenv.c

Log Message:
Update {read,write}fpsr to work everywhere


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/arch/hppa/fenv.c

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

Modified files:

Index: src/lib/libm/arch/hppa/fenv.c
diff -u src/lib/libm/arch/hppa/fenv.c:1.2 src/lib/libm/arch/hppa/fenv.c:1.3
--- src/lib/libm/arch/hppa/fenv.c:1.2	Tue Jan 13 11:16:06 2015
+++ src/lib/libm/arch/hppa/fenv.c	Sun Mar 20 14:22:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: fenv.c,v 1.2 2015/01/13 11:16:06 martin Exp $	*/
+/*	$NetBSD: fenv.c,v 1.3 2016/03/20 14:22:46 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2004-2005 David Schultz 
@@ -24,7 +24,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  */
 #include 
-__RCSID("$NetBSD: fenv.c,v 1.2 2015/01/13 11:16:06 martin Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.3 2016/03/20 14:22:46 skrll Exp $");
 
 #include 
 #include 
@@ -47,7 +47,7 @@ readfpsr(void)
 {
 	uint32_t rv;
 
-	__asm__	__volatile__ ("fstws	%%fr0, %0" : "=m"(rv));
+	__asm__	__volatile__ ("fstw	%%fr0, 0(%1)" : "=m" (rv) : "r"());
 	return rv;
 }
 
@@ -55,7 +55,7 @@ readfpsr(void)
 static inline void
 writefpsr(uint32_t val)
 {
-	__asm__	__volatile__("fldws	%0,%%fr0" : : "m"(val));
+	__asm__	__volatile__("fldw	0(%1),%%fr0" : : "m" (val), "r"());
 }
 
 /*

CVS commit: src/lib/libm/arch/hppa

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 14:22:46 UTC 2016

Modified Files:
src/lib/libm/arch/hppa: fenv.c

Log Message:
Update {read,write}fpsr to work everywhere


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/arch/hppa/fenv.c

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

CVS commit: src/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 14:11:50 UTC 2016

Modified Files:
src/include: stddef.h

Log Message:
PR/50983: David Shao: Protect stddef;
also make the pointer void *.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/include/stddef.h

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

Modified files:

Index: src/include/stddef.h
diff -u src/include/stddef.h:1.18 src/include/stddef.h:1.19
--- src/include/stddef.h:1.18	Wed Mar 16 20:03:38 2016
+++ src/include/stddef.h	Sun Mar 20 10:11:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: stddef.h,v 1.18 2016/03/17 00:03:38 mrg Exp $	*/
+/*	$NetBSD: stddef.h,v 1.19 2016/03/20 14:11:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -67,10 +67,13 @@ typedef	_BSD_WCHAR_T_	wchar_t;
 (_cast(static_cast(0)->member
 #endif  
 
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) \
+  || (defined(__cplusplus) && __cplusplus >= 201103L)
 typedef union {
-	char *_c;
+	void *_v;
 	long double _ld;
 	long long int _ll;
 } max_align_t;
+#endif
  
 #endif /* _STDDEF_H_ */

CVS commit: src/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Sun Mar 20 14:11:50 UTC 2016

Modified Files:
src/include: stddef.h

Log Message:
PR/50983: David Shao: Protect stddef;
also make the pointer void *.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/include/stddef.h

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Thu Mar 17 07:59:45 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: uhci.c

Log Message:
Protect read of isoc->next with bus lock


To generate a diff of this commit:
cvs rdiff -u -r1.264.4.66 -r1.264.4.67 src/sys/dev/usb/uhci.c

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

Modified files:

Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264.4.66 src/sys/dev/usb/uhci.c:1.264.4.67
--- src/sys/dev/usb/uhci.c:1.264.4.66	Sun Mar 13 08:09:00 2016
+++ src/sys/dev/usb/uhci.c	Thu Mar 17 07:59:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.264.4.66 2016/03/13 08:09:00 skrll Exp $	*/
+/*	$NetBSD: uhci.c,v 1.264.4.67 2016/03/17 07:59:45 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.66 2016/03/13 08:09:00 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.264.4.67 2016/03/17 07:59:45 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -3062,6 +3062,7 @@ uhci_device_isoc_enter(struct usbd_xfer 
 		printf("%s: overflow!\n", __func__);
 #endif
 
+	mutex_enter(>sc_lock);
 	next = isoc->next;
 	if (next == -1) {
 		/* Not in use yet, schedule it a few frames ahead. */
@@ -3078,7 +3079,6 @@ uhci_device_isoc_enter(struct usbd_xfer 
  UHCI_TD_ACTIVE |
  UHCI_TD_IOS);
 	nframes = xfer->ux_nframes;
-	mutex_enter(>sc_lock);
 	for (i = 0; i < nframes; i++) {
 		std = isoc->stds[next];
 		if (++next >= UHCI_VFRAMELIST_COUNT)

CVS commit: src/tests/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Mar 16 15:49:20 UTC 2016

Modified Files:
src/tests/bin/sh: Makefile
Added Files:
src/tests/bin/sh: t_arith.sh t_varval.sh

Log Message:
New tests from kre


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/bin/sh/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/bin/sh/t_arith.sh \
src/tests/bin/sh/t_varval.sh

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

CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Mar 18 17:07:23 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctftools.h dwarf.c merge.c
output.c tdata.c traverse.c

Log Message:
Add support for c++ classes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
cvs rdiff -u -r1.21 -r1.22 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dist/tools/ctf/cvt/output.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c

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

Modified files:

Index: src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.6 src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.7
--- src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h:1.6	Fri Mar 18 10:55:34 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h	Fri Mar 18 13:07:23 2016
@@ -142,6 +142,7 @@ typedef enum stabtype {
 	FUNCTION,
 	STRUCT,
 	UNION,
+	CLASS,
 	ENUM,
 	FORWARD,
 	TYPEDEF,

Index: src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.21 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.22
--- src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c:1.21	Fri Mar 18 12:32:03 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c	Fri Mar 18 13:07:23 2016
@@ -186,6 +186,7 @@ tdesc_size(tdesc_t *tdp)
 		case FUNCTION:
 		case STRUCT:
 		case UNION:
+		case CLASS:
 		case ENUM:
 			return (tdp->t_size);
 
@@ -223,6 +224,7 @@ tdesc_bitsize(tdesc_t *tdp)
 		case FUNCTION:
 		case STRUCT:
 		case UNION:
+		case CLASS:
 		case ENUM:
 		case POINTER:
 		case REFERENCE:
@@ -1162,6 +1164,12 @@ die_union_create(dwarf_t *dw, Dwarf_Die 
 	die_sou_create(dw, die, off, tdp, UNION, "union");
 }
 
+static void
+die_class_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
+{
+	die_sou_create(dw, die, off, tdp, CLASS, "class");
+}
+
 /*ARGSUSED1*/
 static int
 die_sou_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private)
@@ -1196,7 +1204,8 @@ die_sou_resolve(tdesc_t *tdp, tdesc_t **
 			if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
 continue;
 			if ((mt->t_flags & TDESC_F_RESOLVED) != 0 &&
-			(mt->t_type == STRUCT || mt->t_type == UNION))
+			(mt->t_type == STRUCT || mt->t_type == UNION ||
+			 mt->t_type == CLASS))
 continue;
 
 			if (mt->t_type == STRUCT && 
@@ -1819,6 +1828,7 @@ static const die_creator_t die_creators[
 	{ DW_TAG_subroutine_type,	0,		die_funcptr_create },
 	{ DW_TAG_typedef,		0,		die_typedef_create },
 	{ DW_TAG_union_type,		0,		die_union_create },
+	{ DW_TAG_class_type,		0,		die_class_create },
 	{ DW_TAG_base_type,		0,		die_base_create },
 	{ DW_TAG_const_type,		0,		die_const_create },
 	{ DW_TAG_subprogram,		DW_F_NOTDP,	die_function_create },
@@ -1895,6 +1905,7 @@ static tdtrav_cb_f die_resolvers[] = {
 	NULL,			/* function */
 	die_sou_resolve,	/* struct */
 	die_sou_resolve,	/* union */
+	die_sou_resolve,	/* class */
 	die_enum_resolve,	/* enum */
 	die_fwd_resolve,	/* forward */
 	NULL,			/* typedef */
@@ -1913,6 +1924,7 @@ static tdtrav_cb_f die_fail_reporters[] 
 	NULL,			/* function */
 	die_sou_failed,		/* struct */
 	die_sou_failed,		/* union */
+	die_sou_failed,		/* class */
 	NULL,			/* enum */
 	NULL,			/* forward */
 	NULL,			/* typedef */

Index: src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c
diff -u src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.6
--- src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c:1.5	Fri Mar 18 10:55:34 2016
+++ src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c	Fri Mar 18 13:07:23 2016
@@ -548,6 +548,7 @@ static tdtrav_cb_f map_pre[] = {
 	map_td_tree_pre,	/* function */
 	map_td_tree_pre,	/* struct */
 	map_td_tree_pre,	/* union */
+	map_td_tree_pre,	/* class */
 	map_td_tree_pre,	/* enum */
 	map_td_tree_pre,	/* forward */
 	map_td_tree_pre,	/* typedef */
@@ -566,6 +567,7 @@ static tdtrav_cb_f map_post[] = {
 	map_td_tree_post,	/* function */
 	map_td_tree_post,	/* struct */
 	map_td_tree_post,	/* union */
+	map_td_tree_post,	/* class */
 	map_td_tree_post,	/* enum */
 	map_td_tree_post,	/* forward */
 	map_td_tree_post,	/* typedef */
@@ -584,6 +586,7 @@ static tdtrav_cb_f map_self_post[] = {
 	map_td_tree_self_post,	/* function */
 	map_td_tree_self_post,	/* struct */
 	map_td_tree_self_post,	/* union */
+	map_td_tree_self_post,	/* class */
 	map_td_tree_self_post,	/* enum */
 	map_td_tree_self_post,	/* forward */
 	map_td_tree_self_post,	/* typedef */
@@ -901,6 +904,7 @@ static tdtrav_cb_f fwd_redir_cbs[] = {
 	NULL,			/* function */
 	NULL,			

CVS commit: src/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Mar 17 00:42:49 UTC 2016

Modified Files:
src/include: stdio.h

Log Message:
gcc 5, my patience is waning.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/include/stdio.h

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

CVS commit: src/sys/dev/scsipi

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Mar 20 10:29:12 UTC 2016

Modified Files:
src/sys/dev/scsipi: atapi_wdc.c

Log Message:
Pass a correct residual size to wdcbit_bucket() that drains extra bytes.

Seems broken (but almost harmless?) since rev 1.101 committed ~10 years ago:
 http://mail-index.netbsd.org/source-changes/2006/09/07/0043.html


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/scsipi/atapi_wdc.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/scsipi

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Mar 20 10:29:12 UTC 2016

Modified Files:
src/sys/dev/scsipi: atapi_wdc.c

Log Message:
Pass a correct residual size to wdcbit_bucket() that drains extra bytes.

Seems broken (but almost harmless?) since rev 1.101 committed ~10 years ago:
 http://mail-index.netbsd.org/source-changes/2006/09/07/0043.html


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/sys/dev/scsipi/atapi_wdc.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/scsipi/atapi_wdc.c
diff -u src/sys/dev/scsipi/atapi_wdc.c:1.120 src/sys/dev/scsipi/atapi_wdc.c:1.121
--- src/sys/dev/scsipi/atapi_wdc.c:1.120	Sun Mar 20 09:47:58 2016
+++ src/sys/dev/scsipi/atapi_wdc.c	Sun Mar 20 10:29:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: atapi_wdc.c,v 1.120 2016/03/20 09:47:58 tsutsui Exp $	*/
+/*	$NetBSD: atapi_wdc.c,v 1.121 2016/03/20 10:29:12 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.120 2016/03/20 09:47:58 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.121 2016/03/20 10:29:12 tsutsui Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -930,7 +930,7 @@ again:
 	end_piobm_datain:
 #endif
 		if (xfer->c_lenoff > 0)
-			wdcbit_bucket(chp, len - xfer->c_bcount);
+			wdcbit_bucket(chp, xfer->c_lenoff);
 
 		xfer->c_skip += len;
 		xfer->c_bcount -= len;

CVS commit: src/sys/dev/scsipi

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Mar 20 09:47:58 UTC 2016

Modified Files:
src/sys/dev/scsipi: atapi_wdc.c

Log Message:
Remove extra spaces.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/scsipi/atapi_wdc.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/scsipi/atapi_wdc.c
diff -u src/sys/dev/scsipi/atapi_wdc.c:1.119 src/sys/dev/scsipi/atapi_wdc.c:1.120
--- src/sys/dev/scsipi/atapi_wdc.c:1.119	Tue Jul 31 15:59:57 2012
+++ src/sys/dev/scsipi/atapi_wdc.c	Sun Mar 20 09:47:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: atapi_wdc.c,v 1.119 2012/07/31 15:59:57 bouyer Exp $	*/
+/*	$NetBSD: atapi_wdc.c,v 1.120 2016/03/20 09:47:58 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.119 2012/07/31 15:59:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.120 2016/03/20 09:47:58 tsutsui Exp $");
 
 #ifndef ATADEBUG
 #define ATADEBUG
@@ -476,7 +476,7 @@ wdc_atapi_start(struct ata_channel *chp,
 		 * disable interrupts, all commands here should be quick
 		 * enough to be able to poll, and we don't go here that often
 		 */
-		 bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
+		bus_space_write_1(wdr->ctl_iot, wdr->ctl_ioh, wd_aux_ctlr,
 		 WDCTL_4BIT | WDCTL_IDS);
 		if (wdc->select)
 			wdc->select(chp, xfer->c_drive);
@@ -873,7 +873,7 @@ again:
 		}
 #endif
 		wdc->dataout_pio(chp, drvp->drive_flags,
-		(char *)xfer->c_databuf + xfer->c_skip, len);
+		(char *)xfer->c_databuf + xfer->c_skip, len);
 
 #if NATA_PIOBM
 	end_piobm_dataout:

CVS commit: src/sys/dev/scsipi

[Izumi Tsutsui]

Module Name:src
Committed By:   tsutsui
Date:   Sun Mar 20 09:47:58 UTC 2016

Modified Files:
src/sys/dev/scsipi: atapi_wdc.c

Log Message:
Remove extra spaces.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/scsipi/atapi_wdc.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 09:15:07 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: emdtv_dtv.c if_athn_usb.c uchcom.c
udsir.c uhso.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.10.14.5 -r1.10.14.6 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.6.8.8 -r1.6.8.9 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.13.6.6 -r1.13.6.7 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.1.14.8 -r1.1.14.9 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.7 -r1.17.2.8 src/sys/dev/usb/uhso.c

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

Modified files:

Index: src/sys/dev/usb/emdtv_dtv.c
diff -u src/sys/dev/usb/emdtv_dtv.c:1.10.14.5 src/sys/dev/usb/emdtv_dtv.c:1.10.14.6
--- src/sys/dev/usb/emdtv_dtv.c:1.10.14.5	Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/emdtv_dtv.c	Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.10.14.5 2015/12/28 09:26:33 skrll Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.10.14.6 2016/03/20 09:15:07 skrll Exp $ */
 
 /*-
  * Copyright (c) 2008, 2011 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.10.14.5 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.10.14.6 2016/03/20 09:15:07 skrll Exp $");
 
 #include 
 #include 
@@ -408,7 +408,7 @@ emdtv_dtv_isoc(struct usbd_xfer *xfer, v
 	struct emdtv_isoc_xfer *ix = priv;
 	struct emdtv_softc *sc = ix->ix_sc;
 	struct dtv_payload payload;
-	struct usbd_pipe * isoc = sc->sc_isoc_pipe;
+	struct usbd_pipe *isoc = sc->sc_isoc_pipe;
 	uint32_t len;
 	uint8_t *buf;
 	int i;

Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.6.8.8 src/sys/dev/usb/if_athn_usb.c:1.6.8.9
--- src/sys/dev/usb/if_athn_usb.c:1.6.8.8	Mon Dec 28 09:26:33 2015
+++ src/sys/dev/usb/if_athn_usb.c	Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_athn_usb.c,v 1.6.8.8 2015/12/28 09:26:33 skrll Exp $	*/
+/*	$NetBSD: if_athn_usb.c,v 1.6.8.9 2016/03/20 09:15:07 skrll Exp $	*/
 /*	$OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.8.8 2015/12/28 09:26:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.6.8.9 2016/03/20 09:15:07 skrll Exp $");
 
 #ifdef	_KERNEL_OPT
 #include "opt_inet.h"
@@ -562,9 +562,9 @@ athn_usb_open_pipes(struct athn_usb_soft
 }
 
 static inline void
-athn_usb_kill_pipe(struct usbd_pipe * *pipeptr)
+athn_usb_kill_pipe(struct usbd_pipe **pipeptr)
 {
-	struct usbd_pipe * pipe;
+	struct usbd_pipe *pipe;
 
 	CTASSERT(sizeof(pipe) == sizeof(void *));
 	pipe = atomic_swap_ptr(pipeptr, NULL);

Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.13.6.6 src/sys/dev/usb/uchcom.c:1.13.6.7
--- src/sys/dev/usb/uchcom.c:1.13.6.6	Tue Sep 29 11:38:29 2015
+++ src/sys/dev/usb/uchcom.c	Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uchcom.c,v 1.13.6.6 2015/09/29 11:38:29 skrll Exp $	*/
+/*	$NetBSD: uchcom.c,v 1.13.6.7 2016/03/20 09:15:07 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.6 2015/09/29 11:38:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.6.7 2016/03/20 09:15:07 skrll Exp $");
 
 /*
  * driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -188,7 +188,7 @@ Static void	uchcom_intr(struct usbd_xfer
 			usbd_status);
 
 static int	set_config(struct uchcom_softc *);
-static int	find_ifaces(struct uchcom_softc *, struct usbd_interface * *);
+static int	find_ifaces(struct uchcom_softc *, struct usbd_interface **);
 static int	find_endpoints(struct uchcom_softc *,
 			   struct uchcom_endpoints *);
 static void	close_intr_pipe(struct uchcom_softc *);
@@ -369,7 +369,7 @@ set_config(struct uchcom_softc *sc)
 }
 
 static int
-find_ifaces(struct uchcom_softc *sc, struct usbd_interface * *riface)
+find_ifaces(struct uchcom_softc *sc, struct usbd_interface **riface)
 {
 	usbd_status err;
 

Index: src/sys/dev/usb/udsir.c
diff -u src/sys/dev/usb/udsir.c:1.1.14.8 src/sys/dev/usb/udsir.c:1.1.14.9
--- src/sys/dev/usb/udsir.c:1.1.14.8	Sun Mar 20 08:42:19 2016
+++ src/sys/dev/usb/udsir.c	Sun Mar 20 09:15:07 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: udsir.c,v 1.1.14.8 2016/03/20 08:42:19 skrll Exp $	*/
+/*	$NetBSD: udsir.c,v 1.1.14.9 2016/03/20 09:15:07 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.8 2016/03/20 08:42:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsir.c,v 1.1.14.9 2016/03/20 09:15:07 skrll Exp $");
 
 #include 
 #include 
@@ -175,7 +175,7 @@ udsir_attach(device_t parent, device_t s
 	struct udsir_softc *sc = device_private(self);
 	struct usbif_attach_arg *uiaa = aux;
 	struct usbd_device *dev = 

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 09:15:07 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: emdtv_dtv.c if_athn_usb.c uchcom.c
udsir.c uhso.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.10.14.5 -r1.10.14.6 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.6.8.8 -r1.6.8.9 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.13.6.6 -r1.13.6.7 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.1.14.8 -r1.1.14.9 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.7 -r1.17.2.8 src/sys/dev/usb/uhso.c

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 08:42:19 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_axereg.h if_cdcereg.h if_cuereg.h
if_kuereg.h if_otusvar.h if_rumvar.h if_runvar.h if_smscvar.h
if_udavreg.h if_upgtvar.h if_upl.c if_uralvar.h if_urlreg.h
if_urndisreg.h if_urtwnvar.h if_urtwreg.h if_zydreg.h ubt.c udl.h
udsir.c uhso.c uirdavar.h umassvar.h uscanner.c usscanner.c ustir.c
uvideo.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/sys/dev/usb/if_axereg.h
cvs rdiff -u -r1.7.24.3 -r1.7.24.4 src/sys/dev/usb/if_cdcereg.h
cvs rdiff -u -r1.18.24.3 -r1.18.24.4 src/sys/dev/usb/if_cuereg.h
cvs rdiff -u -r1.18.24.2 -r1.18.24.3 src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.7.12.3 -r1.7.12.4 src/sys/dev/usb/if_otusvar.h
cvs rdiff -u -r1.9.34.1 -r1.9.34.2 src/sys/dev/usb/if_rumvar.h
cvs rdiff -u -r1.1.20.2 -r1.1.20.3 src/sys/dev/usb/if_runvar.h
cvs rdiff -u -r1.3.4.2 -r1.3.4.3 src/sys/dev/usb/if_smscvar.h
cvs rdiff -u -r1.9.16.3 -r1.9.16.4 src/sys/dev/usb/if_udavreg.h \
src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.1.44.1 -r1.1.44.2 src/sys/dev/usb/if_upgtvar.h \
src/sys/dev/usb/udl.h
cvs rdiff -u -r1.47.4.10 -r1.47.4.11 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.11.38.1 -r1.11.38.2 src/sys/dev/usb/if_uralvar.h
cvs rdiff -u -r1.1.32.1 -r1.1.32.2 src/sys/dev/usb/if_urndisreg.h
cvs rdiff -u -r1.8.4.2 -r1.8.4.3 src/sys/dev/usb/if_urtwnvar.h
cvs rdiff -u -r1.1.22.2 -r1.1.22.3 src/sys/dev/usb/if_urtwreg.h
cvs rdiff -u -r1.7.16.3 -r1.7.16.4 src/sys/dev/usb/if_zydreg.h
cvs rdiff -u -r1.51.4.9 -r1.51.4.10 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.1.14.7 -r1.1.14.8 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.6 -r1.17.2.7 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.5.38.3 -r1.5.38.4 src/sys/dev/usb/uirdavar.h
cvs rdiff -u -r1.35.6.3 -r1.35.6.4 src/sys/dev/usb/umassvar.h
cvs rdiff -u -r1.75.4.9 -r1.75.4.10 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.38.6.11 -r1.38.6.12 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.33.10.10 -r1.33.10.11 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.41.2.10 -r1.41.2.11 src/sys/dev/usb/uvideo.c

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

Modified files:

Index: src/sys/dev/usb/if_axereg.h
diff -u src/sys/dev/usb/if_axereg.h:1.16.6.2 src/sys/dev/usb/if_axereg.h:1.16.6.3
--- src/sys/dev/usb/if_axereg.h:1.16.6.2	Sat Jun  6 14:40:13 2015
+++ src/sys/dev/usb/if_axereg.h	Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axereg.h,v 1.16.6.2 2015/06/06 14:40:13 skrll Exp $	*/
+/*	$NetBSD: if_axereg.h,v 1.16.6.3 2016/03/20 08:42:19 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -220,7 +220,7 @@ struct axe_softc;
 
 struct axe_chain {
 	struct axe_softc	*axe_sc;
-	struct usbd_xfer *	axe_xfer;
+	struct usbd_xfer	*axe_xfer;
 	uint8_t			*axe_buf;
 	int			axe_accum;
 	int			axe_idx;

Index: src/sys/dev/usb/if_cdcereg.h
diff -u src/sys/dev/usb/if_cdcereg.h:1.7.24.3 src/sys/dev/usb/if_cdcereg.h:1.7.24.4
--- src/sys/dev/usb/if_cdcereg.h:1.7.24.3	Sat Jun  6 14:40:13 2015
+++ src/sys/dev/usb/if_cdcereg.h	Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cdcereg.h,v 1.7.24.3 2015/06/06 14:40:13 skrll Exp $ */
+/*	$NetBSD: if_cdcereg.h,v 1.7.24.4 2016/03/20 08:42:19 skrll Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul 
@@ -51,7 +51,7 @@ struct cdce_softc;
 
 struct cdce_chain {
 	struct cdce_softc	*cdce_sc;
-	struct usbd_xfer *	 cdce_xfer;
+	struct usbd_xfer	*cdce_xfer;
 	char			*cdce_buf;
 	struct mbuf		*cdce_mbuf;
 	int			 cdce_accum;

Index: src/sys/dev/usb/if_cuereg.h
diff -u src/sys/dev/usb/if_cuereg.h:1.18.24.3 src/sys/dev/usb/if_cuereg.h:1.18.24.4
--- src/sys/dev/usb/if_cuereg.h:1.18.24.3	Sat Jun  6 14:40:13 2015
+++ src/sys/dev/usb/if_cuereg.h	Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_cuereg.h,v 1.18.24.3 2015/06/06 14:40:13 skrll Exp $	*/
+/*	$NetBSD: if_cuereg.h,v 1.18.24.4 2016/03/20 08:42:19 skrll Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul .  All rights reserved.
@@ -150,7 +150,7 @@ struct cue_softc;
 
 struct cue_chain {
 	struct cue_softc	*cue_sc;
-	struct usbd_xfer *	cue_xfer;
+	struct usbd_xfer	*cue_xfer;
 	char			*cue_buf;
 	struct mbuf		*cue_mbuf;
 	int			cue_idx;

Index: src/sys/dev/usb/if_kuereg.h
diff -u src/sys/dev/usb/if_kuereg.h:1.18.24.2 src/sys/dev/usb/if_kuereg.h:1.18.24.3
--- src/sys/dev/usb/if_kuereg.h:1.18.24.2	Sat Jun  6 14:40:13 2015
+++ src/sys/dev/usb/if_kuereg.h	Sun Mar 20 08:42:19 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_kuereg.h,v 1.18.24.2 2015/06/06 14:40:13 skrll Exp $	*/
+/*	$NetBSD: if_kuereg.h,v 1.18.24.3 2016/03/20 08:42:19 skrll Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *	Bill Paul .  All rights reserved.
@@ -146,7 +146,7 @@ struct kue_softc;
 
 struct kue_chain {
 	

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 08:42:19 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_axereg.h if_cdcereg.h if_cuereg.h
if_kuereg.h if_otusvar.h if_rumvar.h if_runvar.h if_smscvar.h
if_udavreg.h if_upgtvar.h if_upl.c if_uralvar.h if_urlreg.h
if_urndisreg.h if_urtwnvar.h if_urtwreg.h if_zydreg.h ubt.c udl.h
udsir.c uhso.c uirdavar.h umassvar.h uscanner.c usscanner.c ustir.c
uvideo.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/sys/dev/usb/if_axereg.h
cvs rdiff -u -r1.7.24.3 -r1.7.24.4 src/sys/dev/usb/if_cdcereg.h
cvs rdiff -u -r1.18.24.3 -r1.18.24.4 src/sys/dev/usb/if_cuereg.h
cvs rdiff -u -r1.18.24.2 -r1.18.24.3 src/sys/dev/usb/if_kuereg.h
cvs rdiff -u -r1.7.12.3 -r1.7.12.4 src/sys/dev/usb/if_otusvar.h
cvs rdiff -u -r1.9.34.1 -r1.9.34.2 src/sys/dev/usb/if_rumvar.h
cvs rdiff -u -r1.1.20.2 -r1.1.20.3 src/sys/dev/usb/if_runvar.h
cvs rdiff -u -r1.3.4.2 -r1.3.4.3 src/sys/dev/usb/if_smscvar.h
cvs rdiff -u -r1.9.16.3 -r1.9.16.4 src/sys/dev/usb/if_udavreg.h \
src/sys/dev/usb/if_urlreg.h
cvs rdiff -u -r1.1.44.1 -r1.1.44.2 src/sys/dev/usb/if_upgtvar.h \
src/sys/dev/usb/udl.h
cvs rdiff -u -r1.47.4.10 -r1.47.4.11 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.11.38.1 -r1.11.38.2 src/sys/dev/usb/if_uralvar.h
cvs rdiff -u -r1.1.32.1 -r1.1.32.2 src/sys/dev/usb/if_urndisreg.h
cvs rdiff -u -r1.8.4.2 -r1.8.4.3 src/sys/dev/usb/if_urtwnvar.h
cvs rdiff -u -r1.1.22.2 -r1.1.22.3 src/sys/dev/usb/if_urtwreg.h
cvs rdiff -u -r1.7.16.3 -r1.7.16.4 src/sys/dev/usb/if_zydreg.h
cvs rdiff -u -r1.51.4.9 -r1.51.4.10 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.1.14.7 -r1.1.14.8 src/sys/dev/usb/udsir.c
cvs rdiff -u -r1.17.2.6 -r1.17.2.7 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.5.38.3 -r1.5.38.4 src/sys/dev/usb/uirdavar.h
cvs rdiff -u -r1.35.6.3 -r1.35.6.4 src/sys/dev/usb/umassvar.h
cvs rdiff -u -r1.75.4.9 -r1.75.4.10 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.38.6.11 -r1.38.6.12 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.33.10.10 -r1.33.10.11 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.41.2.10 -r1.41.2.11 src/sys/dev/usb/uvideo.c

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

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

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Mar 18 18:24:25 UTC 2016

Modified Files:
src/distrib/sets/lists/debug: mi shl.mi

Log Message:
kill more mudflap for gcc-5.3


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.127 -r1.128 src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.146 src/distrib/sets/lists/debug/mi:1.147
--- src/distrib/sets/lists/debug/mi:1.146	Wed Mar 16 01:32:10 2016
+++ src/distrib/sets/lists/debug/mi	Fri Mar 18 14:24:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.146 2016/03/16 05:32:10 mrg Exp $
+# $NetBSD: mi,v 1.147 2016/03/18 18:24:25 christos Exp $
 ./etc/mtree/set.debug   comp-sys-root
 ./usr/lib	comp-sys-usr		compatdir
 ./usr/lib/i18n/libBIG5_g.a			comp-c-debuglib		debuglib,compatfile
@@ -103,8 +103,8 @@
 ./usr/lib/libmagic_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libmenu_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libmj_g.acomp-c-debuglib		debuglib,compatfile
-./usr/lib/libmudflap_g.a			comp-c-debuglib		debuglib,compatfile,gcc
-./usr/lib/libmudflapth_g.a			comp-c-debuglib		debuglib,compatfile,gcc
+./usr/lib/libmudflap_g.a			comp-c-debuglib		debuglib,compatfile,gcc=48
+./usr/lib/libmudflapth_g.a			comp-c-debuglib		debuglib,compatfile,gcc=48
 ./usr/lib/libnetpgp_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libnetpgpverify_g.a			comp-c-debuglib		debuglib,compatfile
 ./usr/lib/libnpf_g.acomp-c-debuglib		debuglib,compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.127 src/distrib/sets/lists/debug/shl.mi:1.128
--- src/distrib/sets/lists/debug/shl.mi:1.127	Wed Mar 16 01:32:10 2016
+++ src/distrib/sets/lists/debug/shl.mi	Fri Mar 18 14:24:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.127 2016/03/16 05:32:10 mrg Exp $
+# $NetBSD: shl.mi,v 1.128 2016/03/18 18:24:25 christos Exp $
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libc.so.12.200.debug			comp-sys-debug	debug,dynamicroot
@@ -137,8 +137,8 @@
 ./usr/libdata/debug/usr/lib/libmj.so.1.0.debug			comp-crypto-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libmpc.so.2.0.debug			comp-c-shlib	debug,compatfile,obsolete
 ./usr/libdata/debug/usr/lib/libmpfr.so.4.1.debug		comp-c-shlib	debug,compatfile,obsolete
-./usr/libdata/debug/usr/lib/libmudflap.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc
-./usr/libdata/debug/usr/lib/libmudflapth.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc
+./usr/libdata/debug/usr/lib/libmudflap.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
+./usr/libdata/debug/usr/lib/libmudflapth.so.0.0.debug		comp-sys-debug	debug,compatfile,gcc=48
 ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug		comp-crypto-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libnetpgpverify.so.4.0.debug	comp-crypto-debug	debug,compatfile,crypto
 ./usr/libdata/debug/usr/lib/libnpf.so.0.0.debug			comp-npf-debug	debug,compatfile,npf

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 08:21:30 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: emdtvvar.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.3.32.1 -r1.3.32.2 src/sys/dev/usb/emdtvvar.h

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

Modified files:

Index: src/sys/dev/usb/emdtvvar.h
diff -u src/sys/dev/usb/emdtvvar.h:1.3.32.1 src/sys/dev/usb/emdtvvar.h:1.3.32.2
--- src/sys/dev/usb/emdtvvar.h:1.3.32.1	Thu Mar 19 17:26:42 2015
+++ src/sys/dev/usb/emdtvvar.h	Sun Mar 20 08:21:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtvvar.h,v 1.3.32.1 2015/03/19 17:26:42 skrll Exp $ */
+/* $NetBSD: emdtvvar.h,v 1.3.32.2 2016/03/20 08:21:30 skrll Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill 
@@ -55,7 +55,7 @@ struct emdtv_softc;
 
 struct emdtv_isoc_xfer {
 	struct emdtv_softc	*ix_sc;
-	struct usbd_xfer *	ix_xfer;
+	struct usbd_xfer	*ix_xfer;
 	uint8_t			*ix_buf;
 	uint16_t		ix_frlengths[EMDTV_NFRAMES];
 	struct emdtv_isoc_xfer	*ix_altix;

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 08:21:30 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: emdtvvar.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.3.32.1 -r1.3.32.2 src/sys/dev/usb/emdtvvar.h

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

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 08:06:15 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Provide and use DPRINTF{,N} macros in the same way as all other HCDs.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.92 -r1.234.2.93 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.92 src/sys/dev/usb/ehci.c:1.234.2.93
--- src/sys/dev/usb/ehci.c:1.234.2.92	Thu Mar 17 09:04:53 2016
+++ src/sys/dev/usb/ehci.c	Sun Mar 20 08:06:15 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.92 2016/03/17 09:04:53 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.93 2016/03/20 08:06:15 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.92 2016/03/17 09:04:53 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.234.2.93 2016/03/20 08:06:15 skrll Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -126,6 +126,11 @@ fail:
 #endif /* EHCI_DEBUG */
 #endif /* USB_DEBUG */
 
+#define	DPRINTF(FMT,A,B,C,D)	USBHIST_LOG(ehcidebug,FMT,A,B,C,D)
+#define	DPRINTFN(N,FMT,A,B,C,D)	USBHIST_LOGN(ehcidebug,N,FMT,A,B,C,D)
+#define	EHCIHIST_FUNC()		USBHIST_FUNC()
+#define	EHCIHIST_CALLED()	USBHIST_CALLED(ehcidebug)
+
 struct ehci_pipe {
 	struct usbd_pipe pipe;
 	int nexttoggle;
@@ -400,7 +405,7 @@ ehci_init(ehci_softc_t *sc)
 	ehci_soft_qh_t *sqh;
 	u_int ncomp;
 
-	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
+	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 #ifdef EHCI_DEBUG
 	theehci = sc;
 #endif
@@ -427,7 +432,7 @@ ehci_init(ehci_softc_t *sc)
 	vers >> 8, vers & 0xff);
 
 	sparams = EREAD4(sc, EHCI_HCSPARAMS);
-	USBHIST_LOG(ehcidebug, "sparams=%#x", sparams, 0, 0, 0);
+	DPRINTF("sparams=%#x", sparams, 0, 0, 0);
 	sc->sc_npcomp = EHCI_HCS_N_PCC(sparams);
 	ncomp = EHCI_HCS_N_CC(sparams);
 	if (ncomp != sc->sc_ncomp) {
@@ -452,7 +457,7 @@ ehci_init(ehci_softc_t *sc)
 	}
 	sc->sc_noport = EHCI_HCS_N_PORTS(sparams);
 	cparams = EREAD4(sc, EHCI_HCCPARAMS);
-	USBHIST_LOG(ehcidebug, "cparams=%#x", cparams, 0, 0, 0);
+	DPRINTF("cparams=%#x", cparams, 0, 0, 0);
 	sc->sc_hasppc = EHCI_HCS_PPC(sparams);
 
 	if (EHCI_HCC_64BIT(cparams)) {
@@ -465,7 +470,7 @@ ehci_init(ehci_softc_t *sc)
 	sc->sc_bus.ub_dmaflags = USBMALLOC_MULTISEG;
 
 	/* Reset the controller */
-	USBHIST_LOG(ehcidebug, "resetting", 0, 0, 0, 0);
+	DPRINTF("resetting", 0, 0, 0, 0);
 	EOWRITE4(sc, EHCI_USBCMD, 0);	/* Halt controller */
 	usb_delay_ms(>sc_bus, 1);
 	EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
@@ -496,7 +501,7 @@ ehci_init(ehci_softc_t *sc)
 	EHCI_FLALIGN_ALIGN, >sc_fldma);
 	if (err)
 		return err;
-	USBHIST_LOG(ehcidebug, "flsize=%d", sc->sc_flsize, 0, 0, 0);
+	DPRINTF("flsize=%d", sc->sc_flsize, 0, 0, 0);
 	sc->sc_flist = KERNADDR(>sc_fldma, 0);
 
 	for (i = 0; i < sc->sc_flsize; i++) {
@@ -587,9 +592,9 @@ ehci_init(ehci_softc_t *sc)
 	usb_syncmem(>dma, sqh->offs, sizeof(sqh->qh),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef EHCI_DEBUG
-	USBHIST_LOGN(ehcidebug, 5, "--- dump start ---", 0, 0, 0, 0);
+	DPRINTFN(5, "--- dump start ---", 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
-	USBHIST_LOGN(ehcidebug, 5, "--- dump end ---", 0, 0, 0, 0);
+	DPRINTFN(5, "--- dump end ---", 0, 0, 0, 0);
 #endif
 
 	/* Point to async list */
@@ -621,7 +626,7 @@ ehci_init(ehci_softc_t *sc)
 	}
 
 	/* Enable interrupts */
-	USBHIST_LOG(ehcidebug, "enabling interupts", 0, 0, 0, 0);
+	DPRINTF("enabling interupts", 0, 0, 0, 0);
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 
 	return 0;
@@ -641,7 +646,7 @@ ehci_intr(void *v)
 	ehci_softc_t *sc = v;
 	int ret = 0;
 
-	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
+	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 
 	if (sc == NULL)
 		return 0;
@@ -657,8 +662,7 @@ ehci_intr(void *v)
 
 		if (intrs)
 			EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
-		USBHIST_LOGN(ehcidebug, 16,
-		"ignored interrupt while polling", 0, 0, 0, 0);
+		DPRINTFN(16, "ignored interrupt while polling", 0, 0, 0, 0);
 		goto done;
 	}
 
@@ -674,7 +678,7 @@ ehci_intr1(ehci_softc_t *sc)
 {
 	uint32_t intrs, eintrs;
 
-	USBHIST_FUNC(); USBHIST_CALLED(ehcidebug);
+	EHCIHIST_FUNC(); EHCIHIST_CALLED();
 
 	/* In case the interrupt occurs before initialization has completed. */
 	if (sc == NULL) {
@@ -691,14 +695,14 @@ ehci_intr1(ehci_softc_t *sc)
 		return 0;
 
 	eintrs = intrs & sc->sc_eintrs;
-	USBHIST_LOG(ehcidebug, "sc=%p intrs=%#x(%#x) eintrs=%#x",
-	sc, intrs, EOREAD4(sc, EHCI_USBSTS), eintrs);
+	DPRINTF("sc=%p intrs=%#x(%#x) eintrs=%#x", sc, intrs,
+	EOREAD4(sc, EHCI_USBSTS), eintrs);
 	if (!eintrs)
 		return 0;
 
 	EOWRITE4(sc, EHCI_USBSTS, intrs); /* Acknowledge */
 	if (eintrs & EHCI_STS_IAA) {
-		USBHIST_LOG(ehcidebug, "door bell", 0, 0, 0, 0);
+		DPRINTF("door bell", 0, 0, 0, 0);
 		

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Sun Mar 20 08:06:15 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Provide and use DPRINTF{,N} macros in the same way as all other HCDs.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.92 -r1.234.2.93 src/sys/dev/usb/ehci.c

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

CVS commit: src/external/cddl/osnet/dist/tools/ctf/cvt

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Mar 18 14:55:34 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/tools/ctf/cvt: ctftools.h dwarf.c merge.c
traverse.c

Log Message:
- Add processing for c++ references.
- Make sure we load the DIE that contains the types of array elements so
  we can resolve them later.
- Print t_id (die offsets) in hex.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
cvs rdiff -u -r1.19 -r1.20 src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c \
src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c

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

CVS commit: src/external/gpl3/gcc

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Mar 17 21:46:08 UTC 2016

Added Files:
src/external/gpl3/gcc: README.gcc53

Log Message:
document the state of gcc 5.3 in src.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/README.gcc53

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

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

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Mar 18 03:08:25 UTC 2016

Modified Files:
src/distrib/sets/lists/comp: ad.arm ad.hppa ad.m68k ad.mips ad.powerpc
ad.riscv ad.sh3 md.alpha md.hppa md.or1k md.vax

Log Message:
set fixes for GCC 5.3.

(only arm is tested so far, but there's a pattern i can see :-)


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/ad.hppa
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/comp/ad.m68k
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/comp/ad.riscv
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/comp/ad.sh3
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.alpha
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/md.hppa
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/comp/md.or1k
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/comp/md.vax

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

CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Mar 16 19:02:26 UTC 2016

Modified Files:
src/bin/sh: syntax.h

Log Message:
parenthesize for safety.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/bin/sh/syntax.h

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

CVS commit: src/bin/sh

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Fri Mar 18 18:07:28 UTC 2016

Modified Files:
src/bin/sh: parser.c

Log Message:
sprinkle more volatile (needed for the rescue build with gcc-5.3)


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/bin/sh/parser.c

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