CVS commit: src/tools/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 04:24:35 UTC 2017

Modified Files:
src/tools/gdb: Makefile

Log Message:
we want no-iconv for the tools build, but we want iconv for mknative.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/tools/gdb/Makefile

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

Modified files:

Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.33 src/tools/gdb/Makefile:1.34
--- src/tools/gdb/Makefile:1.33	Tue Nov 28 22:33:01 2017
+++ src/tools/gdb/Makefile	Tue Nov 28 23:24:35 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.33 2017/11/29 03:33:01 christos Exp $
+#	$NetBSD: Makefile,v 1.34 2017/11/29 04:24:35 christos Exp $
 
 .include 
 
@@ -25,7 +25,7 @@ BUILD_MAKE=${TOOL_GMAKE}
 BINENV=		/usr/bin/env -i
 
 
-MKNATIVE_ENV=	${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
+MKNATIVE_ENV=	${BINENV} ${CONFIGURE_ENV:NC*:NLD*:Nam_cv_func_iconv*} \
 			CC_FOR_BUILD=${HOST_CC:Q} \
 			CXX_FOR_BUILD=${HOST_CXX:Q} \
 			CFLAGS_FOR_BUILD="-I${TOOLDIR}/include" \
@@ -64,7 +64,7 @@ MKNATIVE_CONFIGURE_PRESET= \
 	bash_cv_func_strcoll_broken=no \
 	bash_cv_must_reinstall_sighandlers=no
 
-#CONFIGURE_ENV+=	am_cv_func_iconv=no
+CONFIGURE_ENV+=	am_cv_func_iconv=no
 
 # Recent versions of Solaris have ncurses, but they hide the lib in an
 # odd directory. Prevent configure from finding the ncurses headers,

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 04:25:02 UTC 2017

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
switch amd64 to gdb-8.0.1


To generate a diff of this commit:
cvs rdiff -u -r1.1020 -r1.1021 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1020 src/share/mk/bsd.own.mk:1.1021
--- src/share/mk/bsd.own.mk:1.1020	Tue Nov 28 13:14:37 2017
+++ src/share/mk/bsd.own.mk	Tue Nov 28 23:25:01 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1020 2017/11/28 18:14:37 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.1021 2017/11/29 04:25:01 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -131,7 +131,11 @@ USE_SSP?=	yes
 #
 # What GDB is used?
 #
+.if ${MACHINE} == "amd64"
+HAVE_GDB?=	801
+.else
 HAVE_GDB?=	712
+.endif
 
 .if ${HAVE_GDB} == 801
 EXTERNAL_GDB_SUBDIR=		gdb

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 04:09:01 UTC 2017

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new gdb


To generate a diff of this commit:
cvs rdiff -u -r1.1486 -r1.1487 src/doc/3RDPARTY
cvs rdiff -u -r1.2335 -r1.2336 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1486 src/doc/3RDPARTY:1.1487
--- src/doc/3RDPARTY:1.1486	Sun Nov 26 07:48:44 2017
+++ src/doc/3RDPARTY	Tue Nov 28 23:09:01 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1486 2017/11/26 12:48:44 hauke Exp $
+#	$NetBSD: 3RDPARTY,v 1.1487 2017/11/29 04:09:01 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -482,7 +482,7 @@ Before importing a new version of extern
 	  into gcc/dist/gcc/doc: cpp.1 cpp.info gcc.1 gcc.info gcov.1
 
 Package:	gdb
-Version:	7.12
+Version:	8.0.1
 Current Vers:	8.0.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gdb/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2335 src/doc/CHANGES:1.2336
--- src/doc/CHANGES:1.2335	Sat Nov 25 11:33:59 2017
+++ src/doc/CHANGES	Tue Nov 28 23:09:01 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2335 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2336 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -88,3 +88,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0:
 	libtre: Update to the latest git source. [rin 20171117]
 	qemufwcfg(4): Add driver for QEMU Firmware Configuration device.
 		[jmcneill 20171125]
+	gdb(1): Updated to 8.0.1.  [christos 20171128]

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 03:58:17 UTC 2017

Modified Files:
src/external/gpl3/gdb/bin/gdbtui: Makefile
src/external/gpl3/gdb/lib/libbfd/arch/x86_64: defs.mk
src/external/gpl3/gdb/lib/libgdb: Makefile
src/external/gpl3/gdb/lib/libgdb/arch/x86_64: config.h defs.mk init.c
src/external/gpl3/gdb/lib/libreadline/arch/x86_64: defs.mk

Log Message:
fixes for gdb-8.0.1 on x86_64


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/bin/gdbtui/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/lib/libbfd/arch/x86_64/defs.mk
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gdb/lib/libgdb/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gdb/lib/libgdb/arch/x86_64/defs.mk \
src/external/gpl3/gdb/lib/libgdb/arch/x86_64/init.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/lib/libreadline/arch/x86_64/defs.mk

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

Modified files:

Index: src/external/gpl3/gdb/bin/gdbtui/Makefile
diff -u src/external/gpl3/gdb/bin/gdbtui/Makefile:1.7 src/external/gpl3/gdb/bin/gdbtui/Makefile:1.8
--- src/external/gpl3/gdb/bin/gdbtui/Makefile:1.7	Tue Feb  7 17:53:20 2017
+++ src/external/gpl3/gdb/bin/gdbtui/Makefile	Tue Nov 28 22:58:17 2017
@@ -1,5 +1,5 @@
-#	$NetBSD: Makefile,v 1.7 2017/02/07 22:53:20 kamil Exp $
-
+#	$NetBSD: Makefile,v 1.8 2017/11/29 03:58:17 christos Exp $
+NOCTF=
 .include "../Makefile.inc"
 
 GDBARCHDIR=${.CURDIR}/../../lib/libgdb/arch/${GDB_MACHINE_ARCH}
@@ -25,6 +25,10 @@ NOMAN=		# defined
 
 .include 
 
+# Force c++
+HOST_CC:=   ${HOST_CXX} -std=gnu++11 -Wno-error=stack-protector
+CC:=${CXX} -std=gnu++11 -Wno-error=stack-protector
+CFLAGS:=${CXXFLAGS}
 
 LIBOPCODESDIR!=   cd ${.CURDIR}/../../lib/libopcodes   && ${PRINTOBJDIR}
 LIBBFDDIR!=   cd ${.CURDIR}/../../lib/libbfd   && ${PRINTOBJDIR}

Index: src/external/gpl3/gdb/lib/libbfd/arch/x86_64/defs.mk
diff -u src/external/gpl3/gdb/lib/libbfd/arch/x86_64/defs.mk:1.5 src/external/gpl3/gdb/lib/libbfd/arch/x86_64/defs.mk:1.6
--- src/external/gpl3/gdb/lib/libbfd/arch/x86_64/defs.mk:1.5	Tue Nov 28 17:04:55 2017
+++ src/external/gpl3/gdb/lib/libbfd/arch/x86_64/defs.mk	Tue Nov 28 22:58:17 2017
@@ -1,6 +1,6 @@
 # This file is automatically generated.  DO NOT EDIT!
 # Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp 
-# Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp 
+# Generated from: NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp 
 #
 G_libbfd_la_DEPENDENCIES=elf64-x86-64.lo elf-ifunc.lo elf-nacl.lo elf64.lo elf.lo elflink.lo elf-attrs.lo elf-strtab.lo elf-properties.lo elf-eh-frame.lo dwarf1.lo dwarf2.lo elf32-i386.lo elf-vxworks.lo elf32.lo i386netbsd.lo aout32.lo coff-i386.lo cofflink.lo coffgen.lo pei-i386.lo peigen.lo pei-x86_64.lo pex64igen.lo elf64-gen.lo elf32-gen.lo plugin.lo cpu-i386.lo cpu-iamcu.lo cpu-l1om.lo cpu-k1om.lo cpu-plugin.lo netbsd-core.lo archive64.lo ofiles
 G_libbfd_la_OBJECTS=archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo binary.lo ihex.lo srec.lo tekhex.lo verilog.lo

Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.12 src/external/gpl3/gdb/lib/libgdb/Makefile:1.13
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.12	Tue Nov 28 17:04:55 2017
+++ src/external/gpl3/gdb/lib/libgdb/Makefile	Tue Nov 28 22:58:17 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2017/11/28 22:04:55 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2017/11/29 03:58:17 christos Exp $
 
 NOCTF=
 HOSTPROG_CXX=   1
@@ -55,7 +55,8 @@ CFLAGS:=${CXXFLAGS}
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/arch ${DIST}/gdb/mi ${DIST}/gdb/cli  \
 ${DIST}/gdb/tui ${DIST}/gdb/python ${DIST}/gdb/common ${DIST}/gdb/target \
-${DIST}/gdb/guile ${DIST}/gdb/compile ${DIST}/gdb/doc ${GDBARCHDIR}
+${DIST}/gdb/nat ${DIST}/gdb/guile ${DIST}/gdb/compile ${DIST}/gdb/doc \
+${GDBARCHDIR}
 
 #
 

Index: src/external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h
diff -u src/external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h:1.9 src/external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h:1.10
--- src/external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h:1.9	Tue Nov 28 17:04:55 2017
+++ src/external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h	Tue Nov 28 22:58:17 2017
@@ -1,6 +1,6 @@
 /* This file is automatically generated.  DO NOT EDIT! */
 /* Generated from: NetBSD: mknative-gdb,v 1.7 2016/10/16 04:37:42 mrg Exp  */
-/* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.12 

CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 03:35:16 UTC 2017

Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-nbsd-tdep.c amd64-nbsd-nat.c
amd64-nbsd-tdep.c arm-nbsd-nat.c arm-nbsd-tdep.c hppa-nbsd-nat.c
hppa-nbsd-tdep.c i386-nbsd-nat.c i386-nbsd-tdep.c mips-nbsd-nat.c
mips-nbsd-tdep.c mips-nbsd-tdep.h ppc-nbsd-nat.c ppc-nbsd-tdep.c
ppc-nbsd-tdep.h sh-nbsd-nat.c sh-nbsd-tdep.c sparc-nbsd-nat.c
sparc-nbsd-tdep.c sparc64-nbsd-nat.c sparc64-nbsd-tdep.c
vax-nbsd-tdep.c
src/external/gpl3/gdb/dist/gdb/config/alpha: nbsd.mh
src/external/gpl3/gdb/dist/gdb/config/arm: nbsdelf.mh
src/external/gpl3/gdb/dist/gdb/config/i386: nbsd64.mh nbsdelf.mh
src/external/gpl3/gdb/dist/gdb/config/m68k: nbsdelf.mh
src/external/gpl3/gdb/dist/gdb/config/mips: nbsd.mh
src/external/gpl3/gdb/dist/gdb/config/pa: nbsd.mh
src/external/gpl3/gdb/dist/gdb/config/powerpc: nbsd.mh ppc64-nbsd.mh
src/external/gpl3/gdb/dist/gdb/config/sh: nbsd.mh
src/external/gpl3/gdb/dist/gdb/config/sparc: nbsd64.mh nbsdelf.mh
src/external/gpl3/gdb/dist/gdb/config/vax: nbsdelf.mh

Log Message:
bring back all our foonbsd-{nat,tdep} files as foo-nbsd-{nat,tdep}. Account
for that in the config glue.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/amd64-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/amd64-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/hppa-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/hppa-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/i386-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/i386-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/mips-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/mips-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/mips-nbsd-tdep.h \
src/external/gpl3/gdb/dist/gdb/ppc-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/ppc-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/ppc-nbsd-tdep.h \
src/external/gpl3/gdb/dist/gdb/sh-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sh-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/sparc-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sparc-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/sparc64-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/vax-nbsd-tdep.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/config/alpha/nbsd.mh
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/config/arm/nbsdelf.mh
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/config/i386/nbsd64.mh
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/dist/gdb/config/i386/nbsdelf.mh
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/dist/gdb/config/m68k/nbsdelf.mh
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/dist/gdb/config/mips/nbsd.mh
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/config/pa/nbsd.mh
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/dist/gdb/config/powerpc/nbsd.mh
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gdb/dist/gdb/config/powerpc/ppc64-nbsd.mh
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/config/sh/nbsd.mh
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gdb/dist/gdb/config/sparc/nbsd64.mh \
src/external/gpl3/gdb/dist/gdb/config/sparc/nbsdelf.mh
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/config/vax/nbsdelf.mh

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/gdb/dist/gdb/alpha-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.1.1.1 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.2
--- src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.1.1.1	Tue Nov 28 13:18:04 2017
+++ src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c	Tue Nov 28 22:35:15 2017
@@ -1,6 +1,6 @@
 /* Target-dependent code for NetBSD/alpha.
 
-   Copyright (C) 2002-2017 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.
 
Contributed by Wasabi Systems, Inc.
 
@@ -28,13 +28,19 @@
 #include "value.h"
 
 #include "alpha-tdep.h"
-#include "alpha-bsd-tdep.h"
+#include "alphabsd-tdep.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
+#include "trad-frame.h"
+#include "frame-unwind.h"
+#include "tramp-frame.h"
 #include "target.h"
 
 /* Core file support.  */
 
+/* Even though NetBSD/alpha used ELF since day one, it used the
+   traditional a.out-style core dump format before NetBSD 1.6.  */
+
 /* Sizeof `struct reg' in .  */
 #define ALPHANBSD_SIZEOF_GREGS	(32 * 8)
 
@@ -168,31 +174,95 @@ alphanbsd_iterate_over_regset_sections (
 
 /* Signal trampolines.  */
 
+static void
+alphanbsd_sigtramp_cache_init (const struct tramp_frame *,
+			  

CVS commit: src/external/gpl3/gdb/dist/intl

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 03:34:22 UTC 2017

Modified Files:
src/external/gpl3/gdb/dist/intl: Makefile.in

Log Message:
Avoid building plural.c from plural.y. Since we now build with gnumake,
emptying the pattern rules is not enough.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/intl/Makefile.in

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/gdb/dist/intl/Makefile.in
diff -u src/external/gpl3/gdb/dist/intl/Makefile.in:1.2 src/external/gpl3/gdb/dist/intl/Makefile.in:1.3
--- src/external/gpl3/gdb/dist/intl/Makefile.in:1.2	Sun Sep 25 16:23:51 2011
+++ src/external/gpl3/gdb/dist/intl/Makefile.in	Tue Nov 28 22:34:22 2017
@@ -133,6 +133,8 @@ libintl.h: $(srcdir)/libgnuintl.h
 	$(COMPILE) $<
 
 .y.c:
+	@echo "Not rebuilding yacc output"
+	cp -p $(srcdir)/$@ $@
 #	$(YACC) $(YFLAGS) --output $@ $<
 #	rm -f $*.h
 

CVS commit: src/tools/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 03:33:01 UTC 2017

Modified Files:
src/tools/gdb: Makefile

Log Message:
Changes for gdb-8.0.1


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/tools/gdb/Makefile

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

Modified files:

Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.32 src/tools/gdb/Makefile:1.33
--- src/tools/gdb/Makefile:1.32	Tue Nov 28 17:25:16 2017
+++ src/tools/gdb/Makefile	Tue Nov 28 22:33:01 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2017/11/28 22:25:16 christos Exp $
+#	$NetBSD: Makefile,v 1.33 2017/11/29 03:33:01 christos Exp $
 
 .include 
 
@@ -27,13 +27,15 @@ BINENV=		/usr/bin/env -i
 
 MKNATIVE_ENV=	${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
 			CC_FOR_BUILD=${HOST_CC:Q} \
+			CXX_FOR_BUILD=${HOST_CXX:Q} \
+			CFLAGS_FOR_BUILD="-I${TOOLDIR}/include" \
 			CC=${CC:Q}' '${CCADDFLAGS:Q} \
-			CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
-			CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
-			MAKE=${BUILD_MAKE:Q} \
-			CFLAGS= CPPFLAGS= CXXFLAGS=${CXXADDFLAGS:Q} \
-			LDFLAGS=${LDADDFLAGS:Q} \
+			CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
+			CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
+			CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
+			AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \
 			MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
+			NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \
 			XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
 			LIBS=-lintl \
 			${MKNATIVE_CONFIGURE_PRESET}
@@ -62,7 +64,7 @@ MKNATIVE_CONFIGURE_PRESET= \
 	bash_cv_func_strcoll_broken=no \
 	bash_cv_must_reinstall_sighandlers=no
 
-CONFIGURE_ENV+=	am_cv_func_iconv=no
+#CONFIGURE_ENV+=	am_cv_func_iconv=no
 
 # Recent versions of Solaris have ncurses, but they hide the lib in an
 # odd directory. Prevent configure from finding the ncurses headers,

CVS commit: src/tools/gcc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 03:32:28 UTC 2017

Modified Files:
src/tools/gcc: mknative.common

Log Message:
Be more selective about what to quote-quote: only paths and version numbers.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tools/gcc/mknative.common

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

Modified files:

Index: src/tools/gcc/mknative.common
diff -u src/tools/gcc/mknative.common:1.14 src/tools/gcc/mknative.common:1.15
--- src/tools/gcc/mknative.common:1.14	Tue Nov 28 22:06:46 2017
+++ src/tools/gcc/mknative.common	Tue Nov 28 22:32:28 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $
+#	$NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp $
 #
 # from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
 #
@@ -28,7 +28,7 @@ getvars()
 	_mf=$(basename "$_TMPDIR/$_mfp")
 	env MAKEFLAGS= $MAKE -C "$_dir" --quiet -f - -f "$_mf" _x_ <$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
 	echo '' >>$_TOP/$1.tmp
 	writefile $1
 }
@@ -77,7 +77,7 @@ write_mk()
 	echo '# This file is automatically generated.  DO NOT EDIT!' >$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
 	echo '#' >>$_TOP/$1.tmp
 	writefile $1
 }

CVS commit: src/tools/gcc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 03:06:47 UTC 2017

Modified Files:
src/tools/gcc: mknative.common

Log Message:
backslash me harder!


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tools/gcc/mknative.common

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

Modified files:

Index: src/tools/gcc/mknative.common
diff -u src/tools/gcc/mknative.common:1.13 src/tools/gcc/mknative.common:1.14
--- src/tools/gcc/mknative.common:1.13	Tue Nov 28 21:10:15 2017
+++ src/tools/gcc/mknative.common	Tue Nov 28 22:06:46 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mknative.common,v 1.13 2017/11/29 02:10:15 christos Exp $
+#	$NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $
 #
 # from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
 #
@@ -28,7 +28,7 @@ getvars()
 	_mf=$(basename "$_TMPDIR/$_mfp")
 	env MAKEFLAGS= $MAKE -C "$_dir" --quiet -f - -f "$_mf" _x_ <$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.13 2017/11/29 02:10:15 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
 	echo '' >>$_TOP/$1.tmp
 	writefile $1
 }
@@ -77,7 +77,7 @@ write_mk()
 	echo '# This file is automatically generated.  DO NOT EDIT!' >$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.13 2017/11/29 02:10:15 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
 	echo '#' >>$_TOP/$1.tmp
 	writefile $1
 }

CVS commit: src/tools/gcc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 29 02:10:15 UTC 2017

Modified Files:
src/tools/gcc: mknative.common

Log Message:
since gmake does not have :Q handle it in sed...


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tools/gcc/mknative.common

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

Modified files:

Index: src/tools/gcc/mknative.common
diff -u src/tools/gcc/mknative.common:1.12 src/tools/gcc/mknative.common:1.13
--- src/tools/gcc/mknative.common:1.12	Tue Nov 28 17:05:57 2017
+++ src/tools/gcc/mknative.common	Tue Nov 28 21:10:15 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $
+#	$NetBSD: mknative.common,v 1.13 2017/11/29 02:10:15 christos Exp $
 #
 # from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
 #
@@ -28,7 +28,8 @@ getvars()
 	_mf=$(basename "$_TMPDIR/$_mfp")
 	env MAKEFLAGS= $MAKE -C "$_dir" --quiet -f - -f "$_mf" _x_ <$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.13 2017/11/29 02:10:15 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
 	echo '' >>$_TOP/$1.tmp
 	writefile $1
 }
@@ -76,7 +77,7 @@ write_mk()
 	echo '# This file is automatically generated.  DO NOT EDIT!' >$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.13 2017/11/29 02:10:15 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
 	echo '#' >>$_TOP/$1.tmp
 	writefile $1
 }

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Nov 29 01:56:59 UTC 2017

Modified Files:
xsrc/external/mit/libXcursor/include: config.h
xsrc/external/mit/libXfont/dist/src/bitmap: pcfread.c
xsrc/external/mit/libXfont/dist/src/fontfile: dirfile.c fileio.c
xsrc/external/mit/libXfont/include: config.h
Removed Files:
xsrc/external/mit/libXfont2/dist/m4: attributes.m4

Log Message:
merge libXcursor 1.1.15, libXfont 1.5.4 and libXfont2 2.0.3.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXcursor/include/config.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libXfont/include/config.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXfont2/dist/m4/attributes.m4

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

Modified files:

Index: xsrc/external/mit/libXcursor/include/config.h
diff -u xsrc/external/mit/libXcursor/include/config.h:1.3 xsrc/external/mit/libXcursor/include/config.h:1.4
--- xsrc/external/mit/libXcursor/include/config.h:1.3	Sun Nov 21 06:40:44 2010
+++ xsrc/external/mit/libXcursor/include/config.h	Wed Nov 29 01:56:58 2017
@@ -48,7 +48,7 @@
 #define PACKAGE_NAME "libXcursor"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libXcursor 1.1.11"
+#define PACKAGE_STRING "libXcursor 1.1.15"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libXcursor"
@@ -57,7 +57,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.11"
+#define PACKAGE_VERSION "1.1.15"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
@@ -66,10 +66,10 @@
 #define PACKAGE_VERSION_MINOR 1
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 11
+#define PACKAGE_VERSION_PATCHLEVEL 15
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.1.11"
+#define VERSION "1.1.15"

Index: xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c
diff -u xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.4 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.5
--- xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.4	Sun Mar  5 01:07:05 2017
+++ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c	Wed Nov 29 01:56:58 2017
@@ -44,6 +44,7 @@ from The Open Group.
 
 #include 
 #include 
+#include 
 
 void
 pcfError(const char* message, ...)
@@ -310,11 +311,19 @@ pcfGetProperties(FontInfoPtr pFontInfo, 
 if (IS_EOF(file)) goto Bail;
 position += string_size;
 for (i = 0; i < nprops; i++) {
+	if (props[i].name >= string_size) {
+	pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].name, string_size);
+	goto Bail;
+	}
 	props[i].name = MakeAtom(strings + props[i].name,
- strlen(strings + props[i].name), TRUE);
+ strnlen(strings + props[i].name, string_size - props[i].name), TRUE);
 	if (isStringProp[i]) {
+	if (props[i].value >= string_size) {
+		pcfError("pcfGetProperties(): String starts out of bounds (%ld/%d)\n", props[i].value, string_size);
+		goto Bail;
+	}
 	props[i].value = MakeAtom(strings + props[i].value,
-  strlen(strings + props[i].value), TRUE);
+  strnlen(strings + props[i].value, string_size - props[i].value), TRUE);
 	}
 }
 free(strings);

Index: xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
diff -u xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c:1.4 xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c:1.5
--- xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c:1.4	Wed Feb 25 19:59:36 2015
+++ xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c	Wed Nov 29 01:56:59 2017
@@ -41,6 +41,7 @@ in this Software without prior written a
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -60,8 +61,9 @@ FontFileReadDirectory (const char *direc
 chardir_file[MAXFONTFILENAMELEN];
 char	dir_path[MAXFONTFILENAMELEN];
 char	*ptr;
-FILE   *file;
-int count,
+FILE   *file = 0;
+int file_fd,
+count,
 num_fonts,
 status;
 struct stat	statb;
@@ -91,7 +93,14 @@ FontFileReadDirectory (const char *direc
 if (dir_file[strlen(dir_file) - 1] != '/')
 	strcat(dir_file, "/");
 strcat(dir_file, FontDirFile);
+#ifndef WIN32
+file_fd = open(dir_file, O_RDONLY | O_NOFOLLOW);
+if (file_fd >= 0) {
+	file = fdopen(file_fd, "rt");
+}
+#else
 file = fopen(dir_file, "rt");
+#endif
 if (file) {
 #ifndef WIN32
 	if (fstat (fileno(file), ) == -1)
@@ -261,7 +270,8 @@ 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Nov 29 01:53:46 UTC 2017

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

Log Message:
initial import of libXfont2-2.0.3.  this fixes CVE-2017-16611.

Status:

Vendor Tag: xorg
Release Tags:   libXfont2-2-0-3

U xsrc/external/mit/libXfont2/dist/ltmain.sh
U xsrc/external/mit/libXfont2/dist/Makefile.in
U xsrc/external/mit/libXfont2/dist/missing
U xsrc/external/mit/libXfont2/dist/depcomp
U xsrc/external/mit/libXfont2/dist/COPYING
U xsrc/external/mit/libXfont2/dist/install-sh
U xsrc/external/mit/libXfont2/dist/aclocal.m4
U xsrc/external/mit/libXfont2/dist/Makefile.am
U xsrc/external/mit/libXfont2/dist/AUTHORS
U xsrc/external/mit/libXfont2/dist/compile
U xsrc/external/mit/libXfont2/dist/config.guess
U xsrc/external/mit/libXfont2/dist/configure.ac
U xsrc/external/mit/libXfont2/dist/ChangeLog
U xsrc/external/mit/libXfont2/dist/config.h.in
U xsrc/external/mit/libXfont2/dist/README
U xsrc/external/mit/libXfont2/dist/configure
U xsrc/external/mit/libXfont2/dist/config.sub
U xsrc/external/mit/libXfont2/dist/devbook.am
U xsrc/external/mit/libXfont2/dist/xfont2.pc.in
U xsrc/external/mit/libXfont2/dist/INSTALL
U xsrc/external/mit/libXfont2/dist/doc/Makefile.am
U xsrc/external/mit/libXfont2/dist/doc/fontlib.xml
U xsrc/external/mit/libXfont2/dist/doc/Makefile.in
U xsrc/external/mit/libXfont2/dist/include/libxfontint.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfil.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfilst.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontencc.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontutil.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontshow.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fntfilio.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontmisc.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/fontxlfd.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/bufio.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/bdfint.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/bitmap.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/libxfont2.h
U xsrc/external/mit/libXfont2/dist/include/X11/fonts/pcf.h
U xsrc/external/mit/libXfont2/dist/src/fontfile/register.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontscale.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/defaults.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bufio.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/dirfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/filewr.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontfile.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontdir.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/decompress.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bunzip2.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/catalogue.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/gunzip.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/renderers.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fontencc.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/fileio.c
U xsrc/external/mit/libXfont2/dist/src/fontfile/bitsource.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfstr.h
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmap.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitscale.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/snfread.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/pcfwrite.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmaputil.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bdfutils.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/fontink.c
U xsrc/external/mit/libXfont2/dist/src/bitmap/bitmapfunc.c
U xsrc/external/mit/libXfont2/dist/src/fc/fslibos.h
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.c
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.c
U xsrc/external/mit/libXfont2/dist/src/fc/fservestr.h
U xsrc/external/mit/libXfont2/dist/src/fc/fsconvert.c
U xsrc/external/mit/libXfont2/dist/src/fc/fstrans.c
U xsrc/external/mit/libXfont2/dist/src/fc/fserve.h
U xsrc/external/mit/libXfont2/dist/src/fc/fsio.h
U xsrc/external/mit/libXfont2/dist/src/builtins/render.c
U xsrc/external/mit/libXfont2/dist/src/builtins/fpe.c
U xsrc/external/mit/libXfont2/dist/src/builtins/file.c
U xsrc/external/mit/libXfont2/dist/src/builtins/dir.c
U xsrc/external/mit/libXfont2/dist/src/builtins/builtin.h
U xsrc/external/mit/libXfont2/dist/src/builtins/buildfont
U xsrc/external/mit/libXfont2/dist/src/builtins/fonts.c
U xsrc/external/mit/libXfont2/dist/src/stubs/atom.c
U xsrc/external/mit/libXfont2/dist/src/stubs/libxfontstubs.c
U xsrc/external/mit/libXfont2/dist/src/FreeType/ft.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/xttcap.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/ftfuncs.h
U xsrc/external/mit/libXfont2/dist/src/FreeType/fttools.c
U 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Nov 29 01:53:19 UTC 2017

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

Log Message:
initial import of libXfont-1.5.4.  this fixes CVE-2017-16611.

Status:

Vendor Tag: xorg
Release Tags:   libXfont-1-5-4

U xsrc/external/mit/libXfont/dist/install-sh
U xsrc/external/mit/libXfont/dist/config.guess
U xsrc/external/mit/libXfont/dist/depcomp
U xsrc/external/mit/libXfont/dist/aclocal.m4
U xsrc/external/mit/libXfont/dist/missing
U xsrc/external/mit/libXfont/dist/COPYING
U xsrc/external/mit/libXfont/dist/ChangeLog
U xsrc/external/mit/libXfont/dist/README
U xsrc/external/mit/libXfont/dist/xfont.pc.in
U xsrc/external/mit/libXfont/dist/config.h.in
U xsrc/external/mit/libXfont/dist/AUTHORS
U xsrc/external/mit/libXfont/dist/configure
U xsrc/external/mit/libXfont/dist/compile
U xsrc/external/mit/libXfont/dist/Makefile.am
U xsrc/external/mit/libXfont/dist/config.sub
U xsrc/external/mit/libXfont/dist/devbook.am
U xsrc/external/mit/libXfont/dist/Makefile.in
U xsrc/external/mit/libXfont/dist/configure.ac
U xsrc/external/mit/libXfont/dist/ltmain.sh
U xsrc/external/mit/libXfont/dist/INSTALL
U xsrc/external/mit/libXfont/dist/doc/Makefile.am
U xsrc/external/mit/libXfont/dist/doc/fontlib.xml
U xsrc/external/mit/libXfont/dist/doc/Makefile.in
U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/bdfint.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/bitmap.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontshow.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilio.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/bufio.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontencc.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h
U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h
U xsrc/external/mit/libXfont/dist/src/Makefile.am
U xsrc/external/mit/libXfont/dist/src/dummy.c
U xsrc/external/mit/libXfont/dist/src/Makefile.in
U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c
C xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
U xsrc/external/mit/libXfont/dist/src/fontfile/register.c
U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c
U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c
C xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c
U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in
U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c
U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c
U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c
U xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c
U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am
U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c
U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c
U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c
U xsrc/external/mit/libXfont/dist/src/util/utilbitmap.c
U xsrc/external/mit/libXfont/dist/src/util/fontutil.c
U xsrc/external/mit/libXfont/dist/src/util/atom.c
U xsrc/external/mit/libXfont/dist/src/util/Makefile.am
U xsrc/external/mit/libXfont/dist/src/util/fontaccel.c
U xsrc/external/mit/libXfont/dist/src/util/patcache.c
U xsrc/external/mit/libXfont/dist/src/util/format.c
U xsrc/external/mit/libXfont/dist/src/util/Makefile.in
U xsrc/external/mit/libXfont/dist/src/util/private.c
U xsrc/external/mit/libXfont/dist/src/util/fontxlfd.c
U xsrc/external/mit/libXfont/dist/src/util/fontnames.c
U xsrc/external/mit/libXfont/dist/src/util/miscutil.c
U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am
U xsrc/external/mit/libXfont/dist/src/builtins/file.c
U xsrc/external/mit/libXfont/dist/src/builtins/fonts.c
U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in
U xsrc/external/mit/libXfont/dist/src/builtins/render.c
U xsrc/external/mit/libXfont/dist/src/builtins/buildfont
U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c
U xsrc/external/mit/libXfont/dist/src/builtins/builtin.h
U xsrc/external/mit/libXfont/dist/src/builtins/dir.c
U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h
U xsrc/external/mit/libXfont/dist/src/fc/fserve.h
U xsrc/external/mit/libXfont/dist/src/fc/fsio.h
U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in
U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am
U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c
U xsrc/external/mit/libXfont/dist/src/fc/fsio.c
U xsrc/external/mit/libXfont/dist/src/fc/fserve.c
U xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c
U 

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

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Nov 29 01:52:43 UTC 2017

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

Log Message:
initial import of libXcursor-1.1.15. this fixes CVE-2017-16612.

Status:

Vendor Tag: xorg
Release Tags:   libXcursor-1-1-15

U xsrc/external/mit/libXcursor/dist/AUTHORS
N xsrc/external/mit/libXcursor/dist/compile
U xsrc/external/mit/libXcursor/dist/COPYING
U xsrc/external/mit/libXcursor/dist/config.h.in
U xsrc/external/mit/libXcursor/dist/ltmain.sh
U xsrc/external/mit/libXcursor/dist/missing
U xsrc/external/mit/libXcursor/dist/config.guess
U xsrc/external/mit/libXcursor/dist/depcomp
U xsrc/external/mit/libXcursor/dist/install-sh
U xsrc/external/mit/libXcursor/dist/aclocal.m4
U xsrc/external/mit/libXcursor/dist/Makefile.in
U xsrc/external/mit/libXcursor/dist/INSTALL
U xsrc/external/mit/libXcursor/dist/README
U xsrc/external/mit/libXcursor/dist/configure
U xsrc/external/mit/libXcursor/dist/ChangeLog
U xsrc/external/mit/libXcursor/dist/configure.ac
U xsrc/external/mit/libXcursor/dist/Makefile.am
U xsrc/external/mit/libXcursor/dist/config.sub
U xsrc/external/mit/libXcursor/dist/xcursor.pc.in
U xsrc/external/mit/libXcursor/dist/man/Xcursor.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameSave.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadCursor.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadCursors.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoad.man
U xsrc/external/mit/libXcursor/dist/man/XcursorSetDefaultSize.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoadAllImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImageCreate.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadCursors.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImagesCreate.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImageDestroy.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorSupportsARGB.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoad.man
U xsrc/external/mit/libXcursor/dist/man/XcursorGetTheme.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorCursorsDestroy.man
U xsrc/external/mit/libXcursor/dist/man/Makefile.am
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileLoadImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorCursorsCreate.man
U xsrc/external/mit/libXcursor/dist/man/XcursorGetDefaultSize.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadImage.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameLoadAllImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorImagesDestroy.man
U xsrc/external/mit/libXcursor/dist/man/XcursorFilenameSaveImages.man
U xsrc/external/mit/libXcursor/dist/man/XcursorShapeLoadCursor.man
U xsrc/external/mit/libXcursor/dist/man/Makefile.in
U xsrc/external/mit/libXcursor/dist/man/XcursorSetTheme.man
U xsrc/external/mit/libXcursor/dist/man/XcursorXcFileSave.man
U xsrc/external/mit/libXcursor/dist/man/XcursorLibraryLoadCursor.man
U xsrc/external/mit/libXcursor/dist/include/X11/Xcursor/Xcursor.h
U xsrc/external/mit/libXcursor/dist/include/X11/Xcursor/Xcursor.h.in
U xsrc/external/mit/libXcursor/dist/src/xlib.c
U xsrc/external/mit/libXcursor/dist/src/display.c
U xsrc/external/mit/libXcursor/dist/src/Makefile.in
U xsrc/external/mit/libXcursor/dist/src/cursor.c
U xsrc/external/mit/libXcursor/dist/src/Makefile.am
U xsrc/external/mit/libXcursor/dist/src/xcursorint.h
U xsrc/external/mit/libXcursor/dist/src/file.c
U xsrc/external/mit/libXcursor/dist/src/library.c

No conflicts created by this import

CVS commit: src/tests/lib/libc/locale

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Tue Nov 28 23:26:01 UTC 2017

Modified Files:
src/tests/lib/libc/locale: t_sprintf.c

Log Message:
Revert 1.4 (perhaps temporarily) and add even more diagnostics to those
added in 1.3 to see if it is possible to determine why the strict equality
test fails on i386, yet succeeds elsewhere.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/locale/t_sprintf.c

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

Modified files:

Index: src/tests/lib/libc/locale/t_sprintf.c
diff -u src/tests/lib/libc/locale/t_sprintf.c:1.5 src/tests/lib/libc/locale/t_sprintf.c:1.6
--- src/tests/lib/libc/locale/t_sprintf.c:1.5	Fri Nov 24 21:30:43 2017
+++ src/tests/lib/libc/locale/t_sprintf.c	Tue Nov 28 23:26:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sprintf.c,v 1.5 2017/11/24 21:30:43 kre Exp $ */
+/* $NetBSD: t_sprintf.c,v 1.6 2017/11/28 23:26:01 kre Exp $ */
 
 /*-
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include 
 __COPYRIGHT("@(#) Copyright (c) 2017\
  The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sprintf.c,v 1.5 2017/11/24 21:30:43 kre Exp $");
+__RCSID("$NetBSD: t_sprintf.c,v 1.6 2017/11/28 23:26:01 kre Exp $");
 
 #include 
 #include 
@@ -134,11 +134,15 @@ h_strto(const struct test *t)
 
 	ATF_REQUIRE_EQ((int)strtol(t->int_input, NULL, 10), t->int_value);
 	d = strtod(t->double_input, NULL);
-	if ((diff = fabs(d - t->double_value)) > 1e-7)
-		ATF_REQUIRE_EQ_MSG(d, t->double_value, "In %s: d=strtod("
-		"t->double_input[%s], NULL)[%.9g] != t->double_value[%.9g]"
-		": diff=%g", t->locale, t->double_input, d,
-		t->double_value, diff);
+	diff = fabs(d - t->double_value);
+#if 0
+	if (diff >= 1e-7)
+#endif
+		ATF_REQUIRE_EQ_MSG(d, t->double_value, "In %s:"
+		" d=strtod(t->double_input[%s], NULL)[%.12g = %a] !="
+		" t->double_value[%.12g = %a]: diff=%g",
+		t->locale, t->double_input, d, d,
+		t->double_value, t->double_value, diff);
 }
 
 static void

CVS commit: src/tools/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 28 22:25:17 UTC 2017

Modified Files:
src/tools/gdb: Makefile

Log Message:
Adjust to gdb-8.0.1 which uses c++
XXX: quoting of variables that contain paths and versions is broken.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/tools/gdb/Makefile

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

Modified files:

Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.31 src/tools/gdb/Makefile:1.32
--- src/tools/gdb/Makefile:1.31	Sat Jul  1 08:23:09 2017
+++ src/tools/gdb/Makefile	Tue Nov 28 17:25:16 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.31 2017/07/01 12:23:09 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.32 2017/11/28 22:25:16 christos Exp $
 
 .include 
 
@@ -20,6 +20,25 @@ INSTALL_TARGET=	install-gdb
 #GDB_MACHINE_ARCH=   ${MACHINE_ARCH:C/e?armv[4-7]h?f?/arm/}
 
 .include "${.CURDIR}/../Makefile.gmakehost"
+BUILD_MAKE=${TOOL_GMAKE}
+
+BINENV=		/usr/bin/env -i
+
+
+MKNATIVE_ENV=	${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
+			CC_FOR_BUILD=${HOST_CC:Q} \
+			CC=${CC:Q}' '${CCADDFLAGS:Q} \
+			CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
+			CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
+			MAKE=${BUILD_MAKE:Q} \
+			CFLAGS= CPPFLAGS= CXXFLAGS=${CXXADDFLAGS:Q} \
+			LDFLAGS=${LDADDFLAGS:Q} \
+			MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
+			XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
+			LIBS=-lintl \
+			${MKNATIVE_CONFIGURE_PRESET}
+
+MKENV_BUILD_MAKE=${MKNATIVE_ENV} ${BUILD_MAKE}
 
 CCADDFLAGS+= --sysroot=${DESTDIR} -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
 LDADDFLAGS+= -L${DESTDIR}/lib -L${DESTDIR}/usr/lib
@@ -65,36 +84,28 @@ CONFIGURE_ARGS_SIM+= --disable-sim
 
 native-gdb: .native/.configure_done
 	@echo 'Extracting GDB configury for a native toolchain.'
-	MAKE=${MAKE:Q} ${HOST_SH} ${MKNATIVE} gdb \
+	MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} gdb \
 		${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
 		${GDB_MACHINE_ARCH}
 
 .native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
 	mkdir ${.OBJDIR}/.native 2>/dev/null || true
 	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
-		(cd ${.OBJDIR}/.native && ${CONFIGURE_ENV:NC*:NLD*} \
-			CC_FOR_BUILD=${HOST_CC:Q} \
-			CC=${CC:Q}' '${CCADDFLAGS:Q} \
-			CXX=${CXX:Q}' '${CCADDFLAGS:Q} \
-			CPP=${CPP:Q}' '-isystem' '${DESTDIR}/usr/include \
-			CFLAGS= CPPFLAGS= CXXFLAGS=${CXXADDFLAGS:Q} \
-			LDFLAGS=${LDADDFLAGS:Q} \
-			MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
-			XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
-			LIBS=-lintl \
-			${MKNATIVE_CONFIGURE_PRESET} \
-			${HOST_SH} ${GNUHOSTDIST}/configure \
+		(cd ${.OBJDIR}/.native && \
+			${MKNATIVE_ENV} ${HOST_SH} ${GNUHOSTDIST}/configure \
 			--prefix=/usr \
 			--with-separate-debug-dir=/usr/libdata/debug \
 			${CONFIGURE_ARGS_SIM} \
 			--build=`${GNUHOSTDIST}/config.guess` \
 			--host=${MACHINE_GNU_PLATFORM} \
-			--target=${MACHINE_GNU_PLATFORM}) && \
+			--target=${MACHINE_GNU_PLATFORM})
+	PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
 		(cd ${.OBJDIR}/.native && \
-			/usr/bin/env ${MKNATIVE_CONFIGURE_PRESET} \
-${MAKE} configure-host) && \
-		(cd ${.OBJDIR}/.native/bfd && ${MAKE} bfd.h bfdver.h) && \
-		(cd ${.OBJDIR}/.native/gdb && ${MAKE} init.c version.c)
+			${MKENV_BUILD_MAKE} configure-host) && \
+		(cd ${.OBJDIR}/.native/bfd && \
+			${MKENV_BUILD_MAKE} bfd.h bfdver.h) && \
+		(cd ${.OBJDIR}/.native/gdb && \
+			${MKENV_BUILD_MAKE} init.c version.c)
 	@touch $@
 
 clean: clean.native

CVS commit: src/tools/gcc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 28 22:05:57 UTC 2017

Modified Files:
src/tools/gcc: mknative.common

Log Message:
use make -C path/to -f Makefile instead of make -f path/to/Makefile
so that includes with relative paths work.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tools/gcc/mknative.common

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

Modified files:

Index: src/tools/gcc/mknative.common
diff -u src/tools/gcc/mknative.common:1.11 src/tools/gcc/mknative.common:1.12
--- src/tools/gcc/mknative.common:1.11	Mon Feb 17 16:39:43 2014
+++ src/tools/gcc/mknative.common	Tue Nov 28 17:05:57 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $
+#	$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $
 #
 # from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
 #
@@ -21,10 +21,12 @@ fi
 #
 getvars()
 {
-	_mf="$1"; shift
+	_mfp="$1"; shift
 	case "$MAKE" in
 	*gmake)
-	env MAKEFLAGS= $MAKE --quiet -f - -f "$_TMPDIR/$_mf" _x_ <$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
 	echo '' >>$_TOP/$1.tmp
 	writefile $1
 }
@@ -74,7 +76,7 @@ write_mk()
 	echo '# This file is automatically generated.  DO NOT EDIT!' >$_TOP/$1.tmp || \
 		bomb "cannot create $1"
 	grep '$''NetBSD' $0 | sed 's,[	#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
-	echo '$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
+	echo '$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
 	echo '#' >>$_TOP/$1.tmp
 	writefile $1
 }

CVS commit: src/external/gpl3/gdb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 28 22:04:56 UTC 2017

Modified Files:
src/external/gpl3/gdb/bin/gdb: Makefile
src/external/gpl3/gdb/dist: config.guess config.sub
src/external/gpl3/gdb/dist/bfd: bfdio.c config.bfd configure elf.c
elf32-arm.c elf32-i386.c merge.c netbsd-core.c
src/external/gpl3/gdb/dist/bfd/doc: Makefile.am Makefile.in bfd.info
src/external/gpl3/gdb/dist/gdb: ada-lang.c alpha-tdep.c arm-tdep.c
bsd-kvm.c configure configure.ac configure.host configure.tgt
dtrace-probe.c event-loop.h hppa-tdep.c hppa-tdep.h inf-ptrace.c
mips-tdep.h nbsd-tdep.c nbsd-tdep.h nbsd-thread.c objfiles.c
p-exp.y regcache.c remote.c rust-exp.c sh-tdep.c solib.c
sparc-nat.c ui-file.c user-regs.c utils.c varobj.c x86-bsd-nat.c
src/external/gpl3/gdb/dist/gdb/common: agent.c common-defs.h
src/external/gpl3/gdb/dist/gdb/tui: tui-stack.c
src/external/gpl3/gdb/dist/include/elf: common.h
src/external/gpl3/gdb/dist/include/opcode: ppc.h
src/external/gpl3/gdb/dist/libiberty: make-temp-file.c
src/external/gpl3/gdb/dist/opcodes: arm-dis.c cgen.sh configure
src/external/gpl3/gdb/dist/readline: display.c util.c
src/external/gpl3/gdb/dist/sim/common: callback.c
src/external/gpl3/gdb/dist/sim/mn10300: Makefile.in
src/external/gpl3/gdb/dist/sim/ppc: emul_netbsd.c
src/external/gpl3/gdb/dist/sim/v850: Makefile.in
src/external/gpl3/gdb/lib/libbfd/arch/x86_64: bfd-in3.h bfd.h
bfd_stdint.h bfdver.h config.h defs.mk targmatch.h
src/external/gpl3/gdb/lib/libdecnumber/arch/x86_64: config.h defs.mk
gstdint.h
src/external/gpl3/gdb/lib/libgdb: Makefile common-agent.c
src/external/gpl3/gdb/lib/libgdb/arch/x86_64: config.h defs.mk init.c
jit-reader.h observer.h observer.inc version.c xml-builtin.c
src/external/gpl3/gdb/lib/libgdb/arch/x86_64/build-gnulib: config.h
src/external/gpl3/gdb/lib/libiberty/arch/x86_64: config.h defs.mk
src/external/gpl3/gdb/lib/libopcodes/arch/x86_64: config.h defs.mk
src/external/gpl3/gdb/lib/libreadline/arch/x86_64: config.h defs.mk
Removed Files:
src/external/gpl3/gdb/dist/gdb: alphabsd-nat.c alphabsd-tdep.c
alphabsd-tdep.h alphafbsd-tdep.c alphanbsd-tdep.c alphaobsd-tdep.c
amd64bsd-nat.c amd64fbsd-nat.c amd64fbsd-tdep.c amd64nbsd-nat.c
amd64nbsd-tdep.c amd64obsd-nat.c amd64obsd-tdep.c armbsd-tdep.c
armnbsd-nat.c armnbsd-tdep.c armobsd-tdep.c build-with-cxx.m4
environ.c environ.h hppabsd-tdep.c hppabsd-tdep.h hppanbsd-nat.c
hppanbsd-tdep.c hppaobsd-nat.c hppaobsd-tdep.c i386bsd-nat.c
i386bsd-nat.h i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c
i386fbsd-tdep.h i386gnu-nat.c i386gnu-tdep.c i386nbsd-nat.c
i386nbsd-tdep.c i386obsd-nat.c i386obsd-tdep.c i386v4-nat.c
jv-exp.y jv-lang.c jv-lang.h jv-typeprint.c jv-valprint.c
jv-varobj.c m68kbsd-nat.c m68kbsd-tdep.c m68klinux-nat.c
m68klinux-tdep.c m88kbsd-nat.c mips64obsd-nat.c mips64obsd-tdep.c
mipsnbsd-nat.c mipsnbsd-tdep.c mipsnbsd-tdep.h ppcfbsd-nat.c
ppcfbsd-tdep.c ppcfbsd-tdep.h ppcnbsd-nat.c ppcnbsd-tdep.c
ppcnbsd-tdep.h ppcobsd-nat.c ppcobsd-tdep.c ppcobsd-tdep.h
shnbsd-nat.c shnbsd-tdep.c sparc64fbsd-nat.c sparc64fbsd-tdep.c
sparc64nbsd-nat.c sparc64nbsd-tdep.c sparc64obsd-nat.c
sparc64obsd-tdep.c sparcnbsd-nat.c sparcnbsd-tdep.c
sparcobsd-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c vaxobsd-tdep.c
x86bsd-nat.c x86bsd-nat.h
src/external/gpl3/gdb/dist/gdb/config/alpha: fbsd.mh
src/external/gpl3/gdb/dist/gdb/features: arm-core.xml arm-fpa.xml
arm-m-profile.xml arm-vfpv2.xml arm-vfpv3.xml arm-with-iwmmxt.c
arm-with-iwmmxt.xml arm-with-m-fpa-layout.c
arm-with-m-fpa-layout.xml arm-with-m-vfp-d16.c
arm-with-m-vfp-d16.xml arm-with-m.c arm-with-m.xml arm-with-neon.c
arm-with-neon.xml arm-with-vfpv2.c arm-with-vfpv2.xml
arm-with-vfpv3.c arm-with-vfpv3.xml xscale-iwmmxt.xml
src/external/gpl3/gdb/dist/gdb/features/i386: amd64-avx512-linux.c
amd64-avx512-linux.xml amd64-avx512.c amd64-avx512.xml
i386-avx512-linux.c i386-avx512-linux.xml i386-avx512.c
i386-avx512.xml x32-avx512-linux.c x32-avx512-linux.xml
x32-avx512.c x32-avx512.xml
src/external/gpl3/gdb/dist/gdb/gdbserver: terminal.h
src/external/gpl3/gdb/dist/gdb/regformats: arm-with-iwmmxt.dat
arm-with-neon.dat arm-with-vfpv2.dat arm-with-vfpv3.dat
src/external/gpl3/gdb/dist/gdb/regformats/i386: amd64-avx512-linux.dat
amd64-avx512.dat i386-avx512-linux.dat i386-avx512.dat
  

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 28 18:14:37 UTC 2017

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
switch everyone to gdb.old


To generate a diff of this commit:
cvs rdiff -u -r1.1019 -r1.1020 src/share/mk/bsd.own.mk

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

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1019 src/share/mk/bsd.own.mk:1.1020
--- src/share/mk/bsd.own.mk:1.1019	Sun Oct  8 11:20:32 2017
+++ src/share/mk/bsd.own.mk	Tue Nov 28 13:14:37 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1019 2017/10/08 15:20:32 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.1020 2017/11/28 18:14:37 christos Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -133,9 +133,9 @@ USE_SSP?=	yes
 #
 HAVE_GDB?=	712
 
-.if ${HAVE_GDB} == 712
+.if ${HAVE_GDB} == 801
 EXTERNAL_GDB_SUBDIR=		gdb
-.elif ${HAVE_GDB} == 710
+.elif ${HAVE_GDB} == 712
 EXTERNAL_GDB_SUBDIR=		gdb.old
 .else
 EXTERNAL_GDB_SUBDIR=		/does/not/exist

CVS commit: src/usr.bin/config

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 28 15:31:33 UTC 2017

Modified Files:
src/usr.bin/config: main.c

Log Message:
- make the level computation consistent
- keep going only if things changed.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/usr.bin/config/main.c

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

Modified files:

Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.96 src/usr.bin/config/main.c:1.97
--- src/usr.bin/config/main.c:1.96	Sun Nov 26 19:25:46 2017
+++ src/usr.bin/config/main.c	Tue Nov 28 10:31:33 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.96 2017/11/27 00:25:46 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.97 2017/11/28 15:31:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: main.c,v 1.96 2017/11/27 00:25:46 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.97 2017/11/28 15:31:33 christos Exp $");
 
 #ifndef MAKE_BOOTSTRAP
 #include 
@@ -1876,21 +1876,22 @@ addlevelparent(struct devbase *d, struct
 	struct devbase *p;
 
 	if (d == parent) {
-		if (d->d_level++ > 1)
+		if (d->d_level > 1)
 			return 0;
 		return 1;
 	}
 
 	if (d->d_levelparent) {
-		if (d->d_level++ > 1)
+		if (d->d_level > 1)
 			return 0;
 		return 1;
 	}
 
 	for (p = parent; p != NULL; p = p->d_levelparent)
-		if (d == p && d->d_level++ > 1)
+		if (d == p && d->d_level > 1)
 			return 0;
 	d->d_levelparent = p ? p :  
+	d->d_level++;
 	return 1;
 }
 
@@ -1926,6 +1927,7 @@ do_kill_orphans(struct devbase *d, struc
 		}
 	} else {
 		int seen = 0;
+		int changed = 0;
 
 		for (i = d->d_ihead; i != NULL; i = i->i_bsame) {
 			for (j = i; j != NULL; j = j->i_alias) {
@@ -1958,6 +1960,7 @@ do_kill_orphans(struct devbase *d, struc
 		seen = 1;
 		continue;
 	}
+	changed |= j->i_active != state;
 	j->i_active = active = state;
 	if (p != NULL) {
 		if (state == DEVI_ACTIVE ||
@@ -1997,8 +2000,9 @@ do_kill_orphans(struct devbase *d, struc
 CFGDBG(5, "`%s' at '%s' ignored", d->d_name,
 parent ? parent->d_name : "(root)");
 
-			}
-		}
+			} else if (!changed)
+goto out;
+		} 
 	}
 
 	for (al = d->d_attrs; al != NULL; al = al->al_next) {

CVS commit: src/lib/libc/arch/aarch64/gen

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Tue Nov 28 13:09:05 UTC 2017

Modified Files:
src/lib/libc/arch/aarch64/gen: _setjmp.S setjmp.S

Log Message:
fix to work
* no need to check x29 != NULL. fp may be NULL.
* don't break in-use register x5.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/arch/aarch64/gen/_setjmp.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/gen/setjmp.S

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/arch/aarch64/gen/_setjmp.S
diff -u src/lib/libc/arch/aarch64/gen/_setjmp.S:1.2 src/lib/libc/arch/aarch64/gen/_setjmp.S:1.3
--- src/lib/libc/arch/aarch64/gen/_setjmp.S:1.2	Tue Nov 28 09:06:25 2017
+++ src/lib/libc/arch/aarch64/gen/_setjmp.S	Tue Nov 28 13:09:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.2 2017/11/28 09:06:25 ryo Exp $ */
+/* $NetBSD: _setjmp.S,v 1.3 2017/11/28 13:09:05 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -83,7 +83,6 @@ ENTRY(_longjmp)
 	ldp	x4, x5, [x0, #_JB_X29]
 
 	cbz	x3, .Lbotch
-	cbz	x4, .Lbotch
 	cbz	x5, .Lbotch
 	cmp	x2, x7
 	b.ne	.Lbotch
@@ -94,8 +93,8 @@ ENTRY(_longjmp)
 	ldp	x25, x26, [x0, #_JB_X25]
 	ldp	x27, x28, [x0, #_JB_X27]
 
-	ldr	x5, [x0, #_JB_TPIDR]
-	msr	tpidr_el0, x5
+	ldr	x2, [x0, #_JB_TPIDR]
+	msr	tpidr_el0, x2
 
 	ldp	d8,  d9,  [x0, #_JB_D8]
 	ldp	d10, d11, [x0, #_JB_D10]

Index: src/lib/libc/arch/aarch64/gen/setjmp.S
diff -u src/lib/libc/arch/aarch64/gen/setjmp.S:1.1 src/lib/libc/arch/aarch64/gen/setjmp.S:1.2
--- src/lib/libc/arch/aarch64/gen/setjmp.S:1.1	Sun Aug 10 05:47:36 2014
+++ src/lib/libc/arch/aarch64/gen/setjmp.S	Tue Nov 28 13:09:05 2017
@@ -1,4 +1,4 @@
-/*.$NetBSD: setjmp.S,v 1.1 2014/08/10 05:47:36 matt Exp $.*/
+/*.$NetBSD: setjmp.S,v 1.2 2017/11/28 13:09:05 ryo Exp $.*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -92,7 +92,6 @@ ENTRY(__longjmp14)
 
 	ldp	x4,  x5,  [x0, #_JB_X29]
 	cbz	x3, .Lbotch
-	cbz	x4, .Lbotch
 	cbz	x5, .Lbotch
 
 	ldp	x19, x20, [x0, #_JB_X19]
@@ -101,8 +100,8 @@ ENTRY(__longjmp14)
 	ldp	x25, x26, [x0, #_JB_X25]
 	ldp	x27, x28, [x0, #_JB_X27]
 
-	ldr	x5, [x0, #_JB_TPIDR]
-	msr	tpidr_el0, x5 
+	ldr	x2, [x0, #_JB_TPIDR]
+	msr	tpidr_el0, x2
 
 	ldp	d8,  d9,  [x0, #_JB_D8]
 	ldp	d10, d11, [x0, #_JB_D10]

CVS commit: src/libexec/httpd

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Nov 28 12:22:27 UTC 2017

Modified Files:
src/libexec/httpd: bozohttpd.8

Log Message:
Document script handler issues with httpd(8).
>From martin@, addressing PR 52194.

While here, use American spelling consistently and upper-case some
abbreviations.

Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/libexec/httpd/bozohttpd.8

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

Modified files:

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.67 src/libexec/httpd/bozohttpd.8:1.68
--- src/libexec/httpd/bozohttpd.8:1.67	Fri Jul  7 07:05:49 2017
+++ src/libexec/httpd/bozohttpd.8	Tue Nov 28 12:22:27 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: bozohttpd.8,v 1.67 2017/07/07 07:05:49 mrg Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.68 2017/11/28 12:22:27 wiz Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd February 1, 2017
+.Dd November 28, 2017
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -219,7 +219,7 @@ option.
 .It Fl P Ar pidfile
 Causes
 .Nm
-to create a pid file in
+to create a PID file in
 .Ar pidfile
 when run in daemon mode with the
 .Fl b
@@ -284,7 +284,7 @@ If no directory exists in
 for the request, then
 .Ar slashdir
 will be used.
-The default behaviour is to return 404 (Not Found.)
+The default behavior is to return 404 (Not Found.)
 .It Fl v Ar virtualroot
 Enables virtual hosting support.
 Directories in
@@ -314,7 +314,7 @@ Sets the list of SSL ciphers (see
 .Xr SSL_CTX_set_cipher_list 3 ) .
 .It Fl Z Ar certificate_path privatekey_path
 Sets the path to the server certificate file and the private key file
-in pem format.
+in PEM format.
 It also causes
 .Nm
 to start SSL mode.
@@ -388,9 +388,9 @@ Lua support (NO_LUA_SUPPORT),
 and SSL support (NO_SSL_SUPPORT)
 by defining the listed macros when building
 .Nm .
-.Ss HTTP BASIC AUTHORISATION
+.Ss HTTP BASIC AUTHORIZATION
 .Nm
-has support for HTTP Basic Authorisation.
+has support for HTTP Basic Authorization.
 If a file named
 .Pa .htpasswd
 exists in the directory of the current request,
@@ -406,7 +406,7 @@ This does not recursively protect any su
 The
 .Pa .htpasswd
 file contains lines delimited with a colon containing
-usernames and passwords hashed with
+user names and passwords hashed with
 .Xr crypt 3 ,
 for example:
 .Bd -literal
@@ -424,7 +424,7 @@ While
 .Nm
 distributed with
 .Nx
-has support for HTTP Basic Authorisation enabled by default,
+has support for HTTP Basic Authorization enabled by default,
 in the portable distribution it is excluded.
 Compile
 .Nm
@@ -458,7 +458,7 @@ looks for a couple of special files in d
 to be provided on a per-directory basis.
 In addition to the
 .Pa .htpasswd
-used by HTTP basic authorisation,
+used by HTTP basic authorization,
 if a
 .Pa .bzdirect
 file is found (contents are irrelevant)
@@ -478,7 +478,7 @@ If a
 .Pa .bzabsredirect
 symbolic link is found,
 .Nm
-will redirect to the absolute url pointed to by this symlink.
+will redirect to the absolute URL pointed to by this symlink.
 This is useful to redirect to different servers.
 Two forms of redirection are supported - symbolic link without schema will use
 .Em http://
@@ -514,6 +514,29 @@ Typically this will be like:
 .Bd -literal
 httpd -C .php /usr/pkg/bin/php-cgi /var/www
 .Ed
+.Pp
+Note that a plain script interpreter can not be used directly as a cgihandler,
+as there are no command line options passed from
+.Nm
+to avoid security issues.
+.Pp
+If no CGI-aware wrapper exists, a simple shell script like the following
+might do.
+.Pp
+It would be invoked like:
+.Bd -literal
+httpd -C .pl /www-scripts/bin/run.perl /var/www
+.Ed
+and the script could look like:
+.Bd -literal
+#! /bin/sh
+
+if [ -r "$SCRIPT_FILENAME" -a -x "$SCRIPT_FILENAME" ]; then
+	exec /usr/pkg/bin/perl "$SCRIPT_FILENAME"
+fi
+
+exit 1
+.Ed
 .Sh SEE ALSO
 .Xr inetd.conf 5 ,
 .Xr inetd 8
@@ -606,11 +629,11 @@ provided cgi-bin enhancements
 .It
 .An Nicolas Jombart
 .Aq Mt e...@ipv42.net
-provided fixes for HTTP basic authorisation support
+provided fixes for HTTP basic authorization support
 .It
 .An Antti Kantee
 .Aq Mt po...@netbsd.org
-provided fixes for HTTP basic authorisation support
+provided fixes for HTTP basic authorization support
 .It
 .An Thomas Klausner
 .Aq Mt w...@netbsd.org
@@ -644,7 +667,7 @@ option (pidfile support) and provided so
 .An Luke Mewburn
 .Aq Mt lu...@netbsd.org
 provided many various fixes, including cgi-bin fixes and enhancements,
-HTTP basic authorisation support and much code clean up
+HTTP basic authorization support and much code clean up
 .It
 .An Rajeev V. Pillai
 .Aq Mt rajeev_v_pil...@yahoo.com
@@ -686,7 +709,7 @@ provided a man page fix
 .It
 .An Holger Weiss
 .Aq Mt hol...@cis.fu-berlin.de
-provided http authorisation 

CVS commit: src

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Nov 28 11:59:17 UTC 2017

Modified Files:
src/distrib/sets/lists/man: mi
src/sbin/mount_qemufwcfg: Makefile
src/share/man/man4: Makefile

Log Message:
Install qemufwcfg(4) and mount_qemufwcfg(8).


To generate a diff of this commit:
cvs rdiff -u -r1.1563 -r1.1564 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.2 -r1.3 src/sbin/mount_qemufwcfg/Makefile
cvs rdiff -u -r1.644 -r1.645 src/share/man/man4/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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1563 src/distrib/sets/lists/man/mi:1.1564
--- src/distrib/sets/lists/man/mi:1.1563	Thu Oct 26 07:29:53 2017
+++ src/distrib/sets/lists/man/mi	Tue Nov 28 11:59:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1563 2017/10/26 07:29:53 maya Exp $
+# $NetBSD: mi,v 1.1564 2017/11/28 11:59:16 wiz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1586,6 +1586,7 @@
 ./usr/share/man/cat4/pxg.0			man-sys-catman		.cat
 ./usr/share/man/cat4/qe.0			man-sys-catman		.cat
 ./usr/share/man/cat4/qec.0			man-sys-catman		.cat
+./usr/share/man/cat4/qemufwcfg.0		man-sys-catman		.cat
 ./usr/share/man/cat4/qsphy.0			man-sys-catman		.cat
 ./usr/share/man/cat4/r128drm.0			man-sys-catman		.cat
 ./usr/share/man/cat4/radeondrm.0		man-sys-catman		.cat
@@ -2736,6 +2737,7 @@
 ./usr/share/man/cat8/mount_psshfs.0		man-puffs-catman	.cat
 ./usr/share/man/cat8/mount_ptyfs.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/mount_puffs.0		man-sysutil-catman	.cat
+./usr/share/man/cat8/mount_qemufwcfg.0		man-sysutil-catman	.cat
 ./usr/share/man/cat8/mount_smbfs.0		man-smbfs-catman	.cat
 ./usr/share/man/cat8/mount_sysctlfs.0		man-puffs-catman	.cat
 ./usr/share/man/cat8/mount_sysvbfs.0		man-sysutil-catman	.cat
@@ -4641,6 +4643,7 @@
 ./usr/share/man/html4/pxg.html			man-sys-htmlman		html
 ./usr/share/man/html4/qe.html			man-sys-htmlman		html
 ./usr/share/man/html4/qec.html			man-sys-htmlman		html
+./usr/share/man/html4/qemufwcfg.html		man-sys-htmlman		html
 ./usr/share/man/html4/qsphy.html		man-sys-htmlman		html
 ./usr/share/man/html4/r128drm.html		man-sys-htmlman		html
 ./usr/share/man/html4/radeondrm.html		man-sys-htmlman		html
@@ -5651,6 +5654,7 @@
 ./usr/share/man/html8/mount_psshfs.html		man-puffs-htmlman	html
 ./usr/share/man/html8/mount_ptyfs.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/mount_puffs.html		man-sysutil-htmlman	html
+./usr/share/man/html8/mount_qemufwcfg.html	man-sysutil-htmlman	html
 ./usr/share/man/html8/mount_smbfs.html		man-smbfs-htmlman	html
 ./usr/share/man/html8/mount_sysctlfs.html	man-puffs-htmlman	html
 ./usr/share/man/html8/mount_sysvbfs.html	man-sysutil-htmlman	html
@@ -7598,6 +7602,7 @@
 ./usr/share/man/man4/pxg.4			man-sys-man		.man
 ./usr/share/man/man4/qe.4			man-sys-man		.man
 ./usr/share/man/man4/qec.4			man-sys-man		.man
+./usr/share/man/man4/qemufwcfg.4		man-sys-man		.man
 ./usr/share/man/man4/qsphy.4			man-sys-man		.man
 ./usr/share/man/man4/r128drm.4			man-sys-man		.man
 ./usr/share/man/man4/radeondrm.4		man-sys-man		.man
@@ -8748,6 +8753,7 @@
 ./usr/share/man/man8/mount_psshfs.8		man-puffs-man		.man
 ./usr/share/man/man8/mount_ptyfs.8		man-sysutil-man		.man
 ./usr/share/man/man8/mount_puffs.8		man-sysutil-man		.man
+./usr/share/man/man8/mount_qemufwcfg.8		man-sysutil-man		.man
 ./usr/share/man/man8/mount_smbfs.8		man-smbfs-man		.man
 ./usr/share/man/man8/mount_sysctlfs.8		man-puffs-man		.man
 ./usr/share/man/man8/mount_sysvbfs.8		man-sysutil-man		.man

Index: src/sbin/mount_qemufwcfg/Makefile
diff -u src/sbin/mount_qemufwcfg/Makefile:1.2 src/sbin/mount_qemufwcfg/Makefile:1.3
--- src/sbin/mount_qemufwcfg/Makefile:1.2	Sun Nov 26 03:06:24 2017
+++ src/sbin/mount_qemufwcfg/Makefile	Tue Nov 28 11:59:16 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/11/26 03:06:24 christos Exp $
+# $NetBSD: Makefile,v 1.3 2017/11/28 11:59:16 wiz Exp $
 
 WARNS=	6
 
@@ -6,7 +6,7 @@ PROG=	mount_qemufwcfg
 SRCS=	fwcfg.c virtdir.c
 DPADD+=	${LIBREFUSE} ${LIBUTIL}
 LDADD=	-lrefuse -lutil
-NOMAN=	# defined
+MAN=	mount_qemufwcfg.8
 
 CPPFLAGS+=	-D_KERNTYPES
 

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.644 src/share/man/man4/Makefile:1.645
--- src/share/man/man4/Makefile:1.644	Thu Oct 26 07:29:53 2017
+++ src/share/man/man4/Makefile	Tue Nov 28 11:59:16 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.644 2017/10/26 07:29:53 maya Exp $
+#	$NetBSD: Makefile,v 1.645 2017/11/28 11:59:16 wiz Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -52,7 +52,7 @@ MAN=	aac.4 ac97.4 acardide.4 aceride.4 a
 	piixpm.4 pim.4 plip.4 pm3fb.4 pms.4 pmu.4 pnaphy.4 ppbus.4 ppp.4 \
 	pppoe.4 \
 	pseye.4 ptcd.4 ptm.4 pty.4 puc.4 pud.4 puffs.4 pwdog.4 px.4 pxagpio.4 \
-	pxaip.4 pxg.4 qe.4 qec.4 qsphy.4 \
+	pxaip.4 pxg.4 qe.4 qec.4 qemufwcfg.4 qsphy.4 \

CVS commit: src/sbin/mount_qemufwcfg

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Nov 28 11:55:30 UTC 2017

Modified Files:
src/sbin/mount_qemufwcfg: mount_qemufwcfg.8

Log Message:
Fix typo found by jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/mount_qemufwcfg/mount_qemufwcfg.8

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

Modified files:

Index: src/sbin/mount_qemufwcfg/mount_qemufwcfg.8
diff -u src/sbin/mount_qemufwcfg/mount_qemufwcfg.8:1.1 src/sbin/mount_qemufwcfg/mount_qemufwcfg.8:1.2
--- src/sbin/mount_qemufwcfg/mount_qemufwcfg.8:1.1	Tue Nov 28 11:10:31 2017
+++ src/sbin/mount_qemufwcfg/mount_qemufwcfg.8	Tue Nov 28 11:55:30 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount_qemufwcfg.8,v 1.1 2017/11/28 11:10:31 wiz Exp $
+.\"	$NetBSD: mount_qemufwcfg.8,v 1.2 2017/11/28 11:55:30 wiz Exp $
 .\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -42,7 +42,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-command provdes the QEMU fw_cfg configuration files in a file system
+command provides the QEMU fw_cfg configuration files in a file system
 tree at point
 .Ar node .
 Both

CVS commit: src/usr.sbin/inetd

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Nov 28 11:51:11 UTC 2017

Modified Files:
src/usr.sbin/inetd: inetd.c

Log Message:
Bump MAXARGV from 20 to 64 - with bozohttpd and all config on the command
line it is easy to hit the (silent) limit.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/usr.sbin/inetd/inetd.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/inetd/inetd.c
diff -u src/usr.sbin/inetd/inetd.c:1.124 src/usr.sbin/inetd/inetd.c:1.125
--- src/usr.sbin/inetd/inetd.c:1.124	Tue Oct 17 07:13:19 2017
+++ src/usr.sbin/inetd/inetd.c	Tue Nov 28 11:51:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: inetd.c,v 1.124 2017/10/17 07:13:19 ozaki-r Exp $	*/
+/*	$NetBSD: inetd.c,v 1.125 2017/11/28 11:51:11 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
 #if 0
 static char sccsid[] = "@(#)inetd.c	8.4 (Berkeley) 4/13/94";
 #else
-__RCSID("$NetBSD: inetd.c,v 1.124 2017/10/17 07:13:19 ozaki-r Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.125 2017/11/28 11:51:11 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -101,7 +101,7 @@ __RCSID("$NetBSD: inetd.c,v 1.124 2017/1
  *	wait/nowait[:max]		single-threaded/multi-threaded, max #
  *	user[:group]			user/group to run daemon as
  *	server program			full path name
- *	server program arguments	maximum of MAXARGS (20)
+ *	server program arguments	maximum of MAXARGV (64)
  *
  * For RPC services
  *  service name/versionmust be in /etc/rpc
@@ -110,7 +110,7 @@ __RCSID("$NetBSD: inetd.c,v 1.124 2017/1
  *	wait/nowait[:max]		single-threaded/multi-threaded
  *	user[:group]			user to run daemon as
  *	server program			full path name
- *	server program arguments	maximum of MAXARGS (20)
+ *	server program arguments	maximum of MAXARGV (64)
  *
  * For non-RPC services, the "service name" can be of the form
  * hostaddress:servicename, in which case the hostaddress is used
@@ -298,7 +298,7 @@ struct	servtab {
 	char	*se_group;		/* group name to run as */
 	struct	biltin *se_bi;		/* if built-in, description */
 	char	*se_server;		/* server program */
-#define	MAXARGV 20
+#define	MAXARGV 64
 	char	*se_argv[MAXARGV+1];	/* program arguments */
 #ifdef IPSEC
 	char	*se_policy;		/* IPsec poilcy string */

CVS commit: src/sbin/mount_qemufwcfg

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Nov 28 11:10:31 UTC 2017

Added Files:
src/sbin/mount_qemufwcfg: mount_qemufwcfg.8

Log Message:
Add mount_qemufwcfg man page for review.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sbin/mount_qemufwcfg/mount_qemufwcfg.8

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

Added files:

Index: src/sbin/mount_qemufwcfg/mount_qemufwcfg.8
diff -u /dev/null src/sbin/mount_qemufwcfg/mount_qemufwcfg.8:1.1
--- /dev/null	Tue Nov 28 11:10:31 2017
+++ src/sbin/mount_qemufwcfg/mount_qemufwcfg.8	Tue Nov 28 11:10:31 2017
@@ -0,0 +1,89 @@
+.\"	$NetBSD: mount_qemufwcfg.8,v 1.1 2017/11/28 11:10:31 wiz Exp $
+.\"
+.\" Copyright (c) 2017 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.
+.\"
+.Dd November 28, 2017
+.Dt MOUNT_QEMUFWCFG 8
+.Os
+.Sh NAME
+.Nm mount_qemufwcfg
+.Nd provide QEMU fw_cfg data as a file system
+.Sh SYNOPSIS
+.Nm
+.Op Fl F Ar path
+.Op Fl g Ar gid
+.Op Fl M Ar dir-mode
+.Op Fl m Ar file-mode
+.Op Fl u Ar uid
+.Op Ar fuse-options
+.Ar special node
+.Sh DESCRIPTION
+The
+.Nm
+command provdes the QEMU fw_cfg configuration files in a file system
+tree at point
+.Ar node .
+Both
+.Ar special
+and
+.Ar node
+are converted to absolute paths before use.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl F Ar path
+Use
+.Ar path
+instead of
+.Pa /dev/qemufwcfg
+for the QEMU device.
+.It Fl g Ar gid
+Use
+.Ar gid
+as group for files in the file system instead of the active group id.
+.It Fl M Ar dir-mode
+Use
+.Ar dir-mode
+as permissions for directories instead of the default
+.Ar 0555 .
+.It Fl m Ar file-mode
+Use
+.Ar file-mode
+as permissions for files instead of the default
+.Ar 0444 .
+.It Fl u Ar uid
+Use
+.Ar uid
+as user for files in the file system instead of the active user id.
+.El
+.Sh SEE ALSO
+.Xr qemufwcfg 4
+.Sh HISTORY
+A
+.Nm
+command first appeared in
+.Nx 9.0 .
+.Sh AUTHORS
+.An Jared McNeill Aq Mt jmcne...@invisible.ca

CVS commit: src/share/man/man4

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Tue Nov 28 11:02:02 UTC 2017

Modified Files:
src/share/man/man4: qemufwcfg.4

Log Message:
Improve man page a bit more.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/qemufwcfg.4

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

Modified files:

Index: src/share/man/man4/qemufwcfg.4
diff -u src/share/man/man4/qemufwcfg.4:1.2 src/share/man/man4/qemufwcfg.4:1.3
--- src/share/man/man4/qemufwcfg.4:1.2	Mon Nov 27 12:25:02 2017
+++ src/share/man/man4/qemufwcfg.4	Tue Nov 28 11:02:02 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: qemufwcfg.4,v 1.2 2017/11/27 12:25:02 wiz Exp $
+.\"	$NetBSD: qemufwcfg.4,v 1.3 2017/11/28 11:02:02 wiz Exp $
 .\"
 .\" Copyright (c) 2017 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -31,19 +31,25 @@
 .Nm qemufwcfg
 .Nd QEMU Firmware Configuration device driver
 .Sh SYNOPSIS
-.\" TODO: is the next line correct?
-.Cd "qemufwcfg* at acpi"
+.Cd "qemufwcfg* at acpi?"
 .Sh DESCRIPTION
 The
 .Nm
-interface allows QEMU guests to query and modify various data items on
-the host, usually related to firmware configuration.
+interface allows QEMU to provide data items and files to guest
+operating systems.
+.Pp
+See the
+.Fl -fw_cfg
+option in the
+.Nm qemu
+man page.
 .Sh FILES
 .Bl -tag -width 20n
 .It Pa /dev/qemufwctl
 device path
 .El
 .Sh SEE ALSO
+.Xr mount_qemufwcfg 8
 .Rs
 .%T QEMU Firmware Configuration (fw_cfg) Device
 .%U https://raw.githubusercontent.com/qemu/qemu/master/docs/specs/fw_cfg.txt

CVS commit: src/libexec/httpd

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Nov 28 10:33:51 UTC 2017

Modified Files:
src/libexec/httpd: cgi-bozo.c

Log Message:
PR bin/52194: bozohttpd fails to exec scripts via the -C mechanism
sometimes with EFAULT due to not NULL terminated environment.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/libexec/httpd/cgi-bozo.c

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

Modified files:

Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.38 src/libexec/httpd/cgi-bozo.c:1.39
--- src/libexec/httpd/cgi-bozo.c:1.38	Thu Oct  5 04:22:41 2017
+++ src/libexec/httpd/cgi-bozo.c	Tue Nov 28 10:33:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgi-bozo.c,v 1.38 2017/10/05 04:22:41 mrg Exp $	*/
+/*	$NetBSD: cgi-bozo.c,v 1.39 2017/11/28 10:33:51 martin Exp $	*/
 
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -587,6 +587,8 @@ bozo_process_cgi(bozo_httpreq_t *request
 		bozoerr(httpd, 1, "child socketpair failed: %s",
 strerror(errno));
 
+	*curenvp = 0;
+
 	/*
 	 * We create 2 procs: one to become the CGI, one read from
 	 * the CGI and output to the network, and this parent will

CVS commit: src/lib/libc/arch/aarch64/gen

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Tue Nov 28 09:06:25 UTC 2017

Modified Files:
src/lib/libc/arch/aarch64/gen: _setjmp.S

Log Message:
KNF. use tab


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/aarch64/gen/_setjmp.S

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/arch/aarch64/gen/_setjmp.S
diff -u src/lib/libc/arch/aarch64/gen/_setjmp.S:1.1 src/lib/libc/arch/aarch64/gen/_setjmp.S:1.2
--- src/lib/libc/arch/aarch64/gen/_setjmp.S:1.1	Sun Aug 10 05:47:36 2014
+++ src/lib/libc/arch/aarch64/gen/_setjmp.S	Tue Nov 28 09:06:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.1 2014/08/10 05:47:36 matt Exp $ */
+/* $NetBSD: _setjmp.S,v 1.2 2017/11/28 09:06:25 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -71,8 +71,8 @@ ENTRY(_setjmp)
 	stp	d12, d13, [x0, #_JB_D12]
 	stp	d14, d15, [x0, #_JB_D14]
 
-mov	x0, xzr
-ret
+	mov	x0, xzr
+	ret
 END(_setjmp)
 
 ENTRY(_longjmp)
@@ -106,8 +106,8 @@ ENTRY(_longjmp)
 	mov	x29, x4
 	mov	x30, x5
 
-mov	x0, x1
-ret
+	mov	x0, x1
+	ret
 
 	/* validation failed, die die die. */
 .Lbotch:

CVS commit: src/sys/arch/amd64/amd64

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Tue Nov 28 08:43:49 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64: spl.S

Log Message:
style


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amd64/amd64/spl.S

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

Modified files:

Index: src/sys/arch/amd64/amd64/spl.S
diff -u src/sys/arch/amd64/amd64/spl.S:1.30 src/sys/arch/amd64/amd64/spl.S:1.31
--- src/sys/arch/amd64/amd64/spl.S:1.30	Sun Nov 22 13:41:24 2015
+++ src/sys/arch/amd64/amd64/spl.S	Tue Nov 28 08:43:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: spl.S,v 1.30 2015/11/22 13:41:24 maxv Exp $	*/
+/*	$NetBSD: spl.S,v 1.31 2017/11/28 08:43:49 maxv Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -90,28 +90,39 @@
  *	%r13		address to return to
  */
 IDTVEC(softintr)
-	pushq	$_C_LABEL(softintr_ret)	/* set up struct switchframe */
+	/* set up struct switchframe */
+	pushq	$_C_LABEL(softintr_ret)
 	pushq	%rbx
 	pushq	%r12
 	pushq	%r13
 	pushq	%r14
 	pushq	%r15
+
 	movl	$IPL_HIGH,CPUVAR(ILEVEL)
 	movq	CPUVAR(CURLWP),%r15
 	movq	IS_LWP(%rax),%rdi	/* switch to handler LWP */
 	movq	L_PCB(%rdi),%rdx
 	movq	L_PCB(%r15),%rcx
 	movq	%rdi,CPUVAR(CURLWP)
+
+	/* save old context */
 	movq	%rsp,PCB_RSP(%rcx)
 	movq	%rbp,PCB_RBP(%rcx)
-	movq	PCB_RSP0(%rdx),%rsp	/* onto new stack */
+
+	/* switch to the new stack */
+	movq	PCB_RSP0(%rdx),%rsp
+
+	/* dispatch */
 	sti
 	movq	%r15,%rdi		/* interrupted LWP */
 	movl	IS_MAXLEVEL(%rax),%esi	/* ipl to run at */
 	call	_C_LABEL(softint_dispatch)/* run handlers */
 	cli
+
+	/* restore old context */
 	movq	L_PCB(%r15),%rcx
 	movq	PCB_RSP(%rcx),%rsp
+
 	xchgq	%r15,CPUVAR(CURLWP)	/* must be globally visible */
 	popq	%r15			/* unwind switchframe */
 	addq	$(5 * 8),%rsp
@@ -128,7 +139,7 @@ END(Xsoftintr)
  */
 NENTRY(softintr_ret)
 	incl	CPUVAR(MTX_COUNT)	/* re-adjust after mi_switch */
-	movl	$0, L_CTXSWTCH(%rax)	/* %rax from cpu_switchto */
+	movl	$0,L_CTXSWTCH(%rax)	/* %rax from cpu_switchto */
 	cli
 	jmp	*%r13			/* back to Xspllower/Xdoreti */
 END(softintr_ret)
@@ -150,9 +161,9 @@ END(softint_trigger)
  * Handles preemption interrupts via Xspllower().
  */
 IDTVEC(preemptrecurse)
-	movl	$IPL_PREEMPT, CPUVAR(ILEVEL)
+	movl	$IPL_PREEMPT,CPUVAR(ILEVEL)
 	sti
-	xorq	%rdi, %rdi
+	xorq	%rdi,%rdi
 	call	_C_LABEL(kpreempt)
 	cli
 	jmp	*%r13			/* back to Xspllower */
@@ -164,16 +175,16 @@ END(Xpreemptrecurse)
  * Handles preemption interrupts via Xdoreti().
  */
 IDTVEC(preemptresume)
-	movl	$IPL_PREEMPT, CPUVAR(ILEVEL)
+	movl	$IPL_PREEMPT,CPUVAR(ILEVEL)
 	sti
-	testq	$SEL_RPL, TF_CS(%rsp)
+	testq	$SEL_RPL,TF_CS(%rsp)
 	jnz	1f
-	movq	TF_RIP(%rsp), %rdi
-	call	_C_LABEL(kpreempt)		# from kernel
+	movq	TF_RIP(%rsp),%rdi
+	call	_C_LABEL(kpreempt)	/* from kernel */
 	cli
 	jmp	*%r13			/* back to Xdoreti */
 1:
-	call	_C_LABEL(preempt)		# from user
+	call	_C_LABEL(preempt)	/* from user */
 	cli
 	jmp	*%r13			/* back to Xdoreti */
 END(Xpreemptresume)
@@ -197,14 +208,14 @@ END(splraise)
  * are disabled via eflags/IE.
  */
 ENTRY(spllower)
-	cmpl	CPUVAR(ILEVEL), %edi
+	cmpl	CPUVAR(ILEVEL),%edi
 	jae	1f
-	movl	CPUVAR(IUNMASK)(,%rdi,4), %edx
+	movl	CPUVAR(IUNMASK)(,%rdi,4),%edx
 	pushf
 	cli
-	testl	CPUVAR(IPENDING), %edx
+	testl	CPUVAR(IPENDING),%edx
 	jnz	2f
-	movl	%edi, CPUVAR(ILEVEL)
+	movl	%edi,CPUVAR(ILEVEL)
 	popf
 1:
 	ret
@@ -224,7 +235,7 @@ LABEL(spllower_end)
  *
  * For cmpxchg8b, edx/ecx are the high words and eax/ebx the low.
  *
- * edx : eax = old level / old ipending 
+ * edx : eax = old level / old ipending
  * ecx : ebx = new level / old ipending
  */
 ENTRY(cx8_spllower)
@@ -260,7 +271,7 @@ LABEL(cx8_spllower_end)
 
 /*
  * void Xspllower(int s);
- * 
+ *
  * Process pending interrupts.
  *
  * Important registers:
@@ -283,11 +294,11 @@ IDTVEC(spllower)
 	pushq	%r13
 	pushq	%r12
 	movl	%edi,%ebx
-	leaq	1f(%rip),%r13		# address to resume loop at
-1:	movl	%ebx,%eax		# get cpl
+	leaq	1f(%rip),%r13		/* address to resume loop at */
+1:	movl	%ebx,%eax		/* get cpl */
 	movl	CPUVAR(IUNMASK)(,%rax,4),%eax
 	CLI(si)
-	andl	CPUVAR(IPENDING),%eax		# any non-masked bits left?
+	andl	CPUVAR(IPENDING),%eax	/* any non-masked bits left? */
 	jz	2f
 	bsrl	%eax,%eax
 	btrl	%eax,CPUVAR(IPENDING)
@@ -304,7 +315,7 @@ END(Xspllower)
 
 /*
  * void Xdoreti(void);
- * 
+ *
  * Handle return from interrupt after device handler finishes.
  *
  * Important registers:
@@ -312,7 +323,7 @@ END(Xspllower)
  *   r13 - address to resume loop at
  */
 IDTVEC(doreti)
-	popq	%rbx			# get previous priority
+	popq	%rbx			/* get previous priority */
 	decl	CPUVAR(IDEPTH)
 	leaq	1f(%rip),%r13
 1:	movl	%ebx,%eax
@@ -320,9 +331,9 @@ IDTVEC(doreti)
 	CLI(si)
 	andl	CPUVAR(IPENDING),%eax
 	jz	2f
-	bsrl	%eax,%eax		# slow, but not worth optimizing
+	bsrl	%eax,%eax		/* slow, but not worth optimizing */
 	btrl	%eax,CPUVAR(IPENDING)
-	movq	CPUVAR(ISOURCES)(,%rax, 8),%rax
+	movq	CPUVAR(ISOURCES)(,%rax,8),%rax
 	

CVS commit: src/sys/arch/arm/broadcom

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Nov 28 08:39:31 UTC 2017

Modified Files:
src/sys/arch/arm/broadcom: bcm2835_space.c

Log Message:
Sync with armv7_generic_space.c

- BE support (probably not needed)
- a4x subreagion/mmap support
- fix some a4x stream methods
- add UVM_KMF_COLORMATCH in bs_map when allocating KVA
- support BUS_SPACE_MAP_PREFETCHABLE


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/broadcom/bcm2835_space.c

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

Modified files:

Index: src/sys/arch/arm/broadcom/bcm2835_space.c
diff -u src/sys/arch/arm/broadcom/bcm2835_space.c:1.12 src/sys/arch/arm/broadcom/bcm2835_space.c:1.13
--- src/sys/arch/arm/broadcom/bcm2835_space.c:1.12	Mon Nov 27 17:27:37 2017
+++ src/sys/arch/arm/broadcom/bcm2835_space.c	Tue Nov 28 08:39:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bcm2835_space.c,v 1.12 2017/11/27 17:27:37 skrll Exp $	*/
+/*	$NetBSD: bcm2835_space.c,v 1.13 2017/11/28 08:39:31 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.12 2017/11/27 17:27:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_space.c,v 1.13 2017/11/28 08:39:31 skrll Exp $");
 
 #include 
 #include 
@@ -51,6 +51,12 @@ bs_protos(generic_armv4);
 bs_protos(a4x);
 bs_protos(bs_notimpl);
 
+#if __ARMEB__
+#define NSWAP(n)	n ## _swap
+#else
+#define NSWAP(n)	n
+#endif
+
 struct bus_space bcm2835_bs_tag = {
 	/* cookie */
 	(void *) 0,
@@ -75,38 +81,38 @@ struct bus_space bcm2835_bs_tag = {
 
 	/* read (single) */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
-	generic_bs_r_4,
+	NSWAP(generic_armv4_bs_r_2),
+	NSWAP(generic_bs_r_4),
 	bs_notimpl_bs_r_8,
 
 	/* read multiple */
 	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
-	generic_bs_rm_4,
+	NSWAP(generic_armv4_bs_rm_2),
+	NSWAP(generic_bs_rm_4),
 	bs_notimpl_bs_rm_8,
 
 	/* read region */
 	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
-	generic_bs_rr_4,
+	NSWAP(generic_armv4_bs_rr_2),
+	NSWAP(generic_bs_rr_4),
 	bs_notimpl_bs_rr_8,
 
 	/* write (single) */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
-	generic_bs_w_4,
+	NSWAP(generic_armv4_bs_w_2),
+	NSWAP(generic_bs_w_4),
 	bs_notimpl_bs_w_8,
 
 	/* write multiple */
 	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
-	generic_bs_wm_4,
+	NSWAP(generic_armv4_bs_wm_2),
+	NSWAP(generic_bs_wm_4),
 	bs_notimpl_bs_wm_8,
 
 	/* write region */
 	generic_bs_wr_1,
-	generic_armv4_bs_wr_2,
-	generic_bs_wr_4,
+	NSWAP(generic_armv4_bs_wr_2),
+	NSWAP(generic_bs_wr_4),
 	bs_notimpl_bs_wr_8,
 
 	/* set multiple */
@@ -117,8 +123,8 @@ struct bus_space bcm2835_bs_tag = {
 
 	/* set region */
 	generic_bs_sr_1,
-	generic_armv4_bs_sr_2,
-	bs_notimpl_bs_sr_4,
+	NSWAP(generic_armv4_bs_sr_2),
+	NSWAP(generic_bs_sr_4),
 	bs_notimpl_bs_sr_8,
 
 	/* copy */
@@ -130,38 +136,38 @@ struct bus_space bcm2835_bs_tag = {
 #ifdef __BUS_SPACE_HAS_STREAM_METHODS
 	/* read (single) */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
-	generic_bs_r_4,
+	NSWAP(generic_armv4_bs_r_2),
+	NSWAP(generic_bs_r_4),
 	bs_notimpl_bs_r_8,
 
 	/* read multiple */
 	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
-	generic_bs_rm_4,
+	NSWAP(generic_armv4_bs_rm_2),
+	NSWAP(generic_bs_rm_4),
 	bs_notimpl_bs_rm_8,
 
 	/* read region */
 	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
-	generic_bs_rr_4,
+	NSWAP(generic_armv4_bs_rr_2),
+	NSWAP(generic_bs_rr_4),
 	bs_notimpl_bs_rr_8,
 
 	/* write (single) */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
-	generic_bs_w_4,
+	NSWAP(generic_armv4_bs_w_2),
+	NSWAP(generic_bs_w_4),
 	bs_notimpl_bs_w_8,
 
 	/* write multiple */
 	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
-	generic_bs_wm_4,
+	NSWAP(generic_armv4_bs_wm_2),
+	NSWAP(generic_bs_wm_4),
 	bs_notimpl_bs_wm_8,
 
 	/* write region */
 	generic_bs_wr_1,
-	generic_armv4_bs_wr_2,
-	generic_bs_wr_4,
+	NSWAP(generic_armv4_bs_wr_2),
+	NSWAP(generic_bs_wr_4),
 	bs_notimpl_bs_wr_8,
 #endif
 };
@@ -173,7 +179,7 @@ struct bus_space bcm2835_a4x_bs_tag = {
 	/* mapping/unmapping */
 	bcm2835_bs_map,
 	bcm2835_bs_unmap,
-	bcm2835_bs_subregion,
+	bcm2835_a4x_bs_subregion,
 
 	/* allocation/deallocation */
 	bcm2835_bs_alloc,	/* not implemented */
@@ -183,21 +189,21 @@ struct bus_space bcm2835_a4x_bs_tag = {
 	bcm2835_bs_vaddr,
 
 	/* mmap */
-	bs_notimpl_bs_mmap,
+	bcm2835_a4x_bs_mmap,
 
 	/* barrier */
 	bcm2835_bs_barrier,
 
 	/* read (single) */
 	a4x_bs_r_1,
-	a4x_bs_r_2,
-	a4x_bs_r_4,
+	NSWAP(a4x_bs_r_2),
+	NSWAP(a4x_bs_r_4),
 	bs_notimpl_bs_r_8,
 
 	/* read multiple */
 	a4x_bs_rm_1,
-	a4x_bs_rm_2,
-	a4x_bs_rm_4,
+	NSWAP(a4x_bs_rm_2),
+	NSWAP(a4x_bs_rm_4),
 	bs_notimpl_bs_rm_8,
 
 	/* read region */
@@ -208,15 +214,16 @@ struct bus_space bcm2835_a4x_bs_tag = {
 
 	/* write (single) */
 	a4x_bs_w_1,
-	a4x_bs_w_2,
-	a4x_bs_w_4,
+	NSWAP(a4x_bs_w_2),
+	NSWAP(a4x_bs_w_4),
 	bs_notimpl_bs_w_8,
 
 	/* write multiple */
 	a4x_bs_wm_1,
-	a4x_bs_wm_2,
-	a4x_bs_wm_4,
+