CVS commit: src/sys/arch
Module Name:src Committed By: christos Date: Mon Aug 18 06:31:24 UTC 2014 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/evbarm/conf: BCM5301X BCM56340 CUBIEBOARD GOLDENGATE MV2120 ODROID ODROID-U SHEEVAPLUG src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/macppc/conf: GENERIC GENERIC_601 src/sys/arch/ofppc/conf: GENERIC src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: - Enable Wedge support for MBR/BSDLABEL where it was commented out. - Add apple partition support where it was missing - Add comments where missing To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.393 -r1.394 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/BCM5301X cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/BCM56340 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/CUBIEBOARD cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/GOLDENGATE cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/MV2120 cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ODROID cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/ODROID-U cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.381 -r1.382 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1108 -r1.1109 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.86 -r1.87 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.60 -r1.61 src/sys/arch/i386/conf/XEN3_DOMU cvs rdiff -u -r1.313 -r1.314 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.2 -r1.3 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.152 -r1.153 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.82 -r1.83 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.59 -r1.60 src/sys/arch/zaurus/conf/GENERIC 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/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.14 src/sys/arch/amd64/conf/ALL:1.15 --- src/sys/arch/amd64/conf/ALL:1.14 Sat Aug 16 13:56:31 2014 +++ src/sys/arch/amd64/conf/ALL Mon Aug 18 02:31:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.14 2014/08/16 17:56:31 apb Exp $ +# $NetBSD: ALL,v 1.15 2014/08/18 06:31:24 christos Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.14 $ +#ident ALL-$Revision: 1.15 $ maxusers 64 # estimated number of users @@ -158,7 +158,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges -# The following two options can break /etc/fstab, so handle with care options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.393 src/sys/arch/amd64/conf/GENERIC:1.394 --- src/sys/arch/amd64/conf/GENERIC:1.393 Sat Aug 16 13:56:31 2014 +++ src/sys/arch/amd64/conf/GENERIC Mon Aug 18 02:31:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.393 2014/08/16 17:56:31 apb Exp $ +# $NetBSD: GENERIC,v 1.394 2014/08/18 06:31:24 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include arch/amd64/conf/std.amd64 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.393 $ +#ident GENERIC-$Revision: 1.394 $ maxusers 64 # estimated number of users @@ -130,10 +130,9 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p # Wedge support options DKWEDGE_AUTODISCOVER # Automatically add dk(4) instances options DKWEDGE_METHOD_GPT # Supports GPT partitions as wedges -# The following three options can break /etc/fstab, so handle with care -#options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges -#options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges -#options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges +options DKWEDGE_METHOD_BSDLABEL # Support disklabel entries as wedges +options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges +options DKWEDGE_METHOD_APPLE# Support Apple partitions as wedges # File systems file-system FFS # UFS Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.104 src/sys/arch/amd64/conf/XEN3_DOM0:1.105 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.104 Sat Aug 16 13:56:31 2014 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Aug 18 02:31:24 2014 @@
CVS import: src/external/gpl2/gmake/dist
Module Name:src Committed By: christos Date: Mon Aug 18 06:47:59 UTC 2014 Update of /cvsroot/src/external/gpl2/gmake/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20495 Log Message: import latest gpl2 make Status: Vendor Tag: FSF Release Tags: make-3-81 N src/external/gpl2/gmake/dist/acinclude.m4 N src/external/gpl2/gmake/dist/README N src/external/gpl2/gmake/dist/remote-stub.c N src/external/gpl2/gmake/dist/configure.in N src/external/gpl2/gmake/dist/aclocal.m4 N src/external/gpl2/gmake/dist/commands.h N src/external/gpl2/gmake/dist/dep.h N src/external/gpl2/gmake/dist/filedef.h N src/external/gpl2/gmake/dist/job.h N src/external/gpl2/gmake/dist/make.h N src/external/gpl2/gmake/dist/rule.h N src/external/gpl2/gmake/dist/variable.h N src/external/gpl2/gmake/dist/debug.h N src/external/gpl2/gmake/dist/getopt.h N src/external/gpl2/gmake/dist/gettext.h N src/external/gpl2/gmake/dist/hash.h N src/external/gpl2/gmake/dist/Makefile.am N src/external/gpl2/gmake/dist/Makefile.in N src/external/gpl2/gmake/dist/config.h.in N src/external/gpl2/gmake/dist/configure N src/external/gpl2/gmake/dist/ABOUT-NLS N src/external/gpl2/gmake/dist/AUTHORS N src/external/gpl2/gmake/dist/COPYING N src/external/gpl2/gmake/dist/ChangeLog N src/external/gpl2/gmake/dist/INSTALL N src/external/gpl2/gmake/dist/NEWS N src/external/gpl2/gmake/dist/alloca.c N src/external/gpl2/gmake/dist/ansi2knr.1 N src/external/gpl2/gmake/dist/ansi2knr.c N src/external/gpl2/gmake/dist/getloadavg.c N src/external/gpl2/gmake/dist/ar.c N src/external/gpl2/gmake/dist/arscan.c N src/external/gpl2/gmake/dist/commands.c N src/external/gpl2/gmake/dist/default.c N src/external/gpl2/gmake/dist/dir.c N src/external/gpl2/gmake/dist/expand.c N src/external/gpl2/gmake/dist/file.c N src/external/gpl2/gmake/dist/function.c N src/external/gpl2/gmake/dist/getopt.c N src/external/gpl2/gmake/dist/getopt1.c N src/external/gpl2/gmake/dist/implicit.c N src/external/gpl2/gmake/dist/job.c N src/external/gpl2/gmake/dist/main.c N src/external/gpl2/gmake/dist/misc.c N src/external/gpl2/gmake/dist/read.c N src/external/gpl2/gmake/dist/remake.c N src/external/gpl2/gmake/dist/make_msvc_net2003.sln N src/external/gpl2/gmake/dist/remote-cstms.c N src/external/gpl2/gmake/dist/rule.c N src/external/gpl2/gmake/dist/signame.c N src/external/gpl2/gmake/dist/strcache.c N src/external/gpl2/gmake/dist/variable.c N src/external/gpl2/gmake/dist/version.c N src/external/gpl2/gmake/dist/vpath.c N src/external/gpl2/gmake/dist/hash.c N src/external/gpl2/gmake/dist/vmsjobs.c N src/external/gpl2/gmake/dist/build.sh.in N src/external/gpl2/gmake/dist/make.1 N src/external/gpl2/gmake/dist/README.customs N src/external/gpl2/gmake/dist/README.OS2 N src/external/gpl2/gmake/dist/SCOPTIONS N src/external/gpl2/gmake/dist/SMakefile N src/external/gpl2/gmake/dist/README.Amiga N src/external/gpl2/gmake/dist/Makefile.ami N src/external/gpl2/gmake/dist/config.ami N src/external/gpl2/gmake/dist/make.lnk N src/external/gpl2/gmake/dist/amiga.c N src/external/gpl2/gmake/dist/amiga.h N src/external/gpl2/gmake/dist/README.DOS N src/external/gpl2/gmake/dist/Makefile.DOS N src/external/gpl2/gmake/dist/configure.bat N src/external/gpl2/gmake/dist/dosbuild.bat N src/external/gpl2/gmake/dist/configh.dos N src/external/gpl2/gmake/dist/README.W32 N src/external/gpl2/gmake/dist/NMakefile N src/external/gpl2/gmake/dist/config.h.W32 N src/external/gpl2/gmake/dist/build_w32.bat N src/external/gpl2/gmake/dist/subproc.bat N src/external/gpl2/gmake/dist/make_msvc_net2003.vcproj N src/external/gpl2/gmake/dist/readme.vms N src/external/gpl2/gmake/dist/makefile.vms N src/external/gpl2/gmake/dist/makefile.com N src/external/gpl2/gmake/dist/config.h-vms N src/external/gpl2/gmake/dist/vmsdir.h N src/external/gpl2/gmake/dist/vmsfunctions.c N src/external/gpl2/gmake/dist/vmsify.c N src/external/gpl2/gmake/dist/config/lib-prefix.m4 N src/external/gpl2/gmake/dist/config/dospaths.m4 N src/external/gpl2/gmake/dist/config/gettext.m4 N src/external/gpl2/gmake/dist/config/iconv.m4 N src/external/gpl2/gmake/dist/config/lib-ld.m4 N src/external/gpl2/gmake/dist/config/lib-link.m4 N src/external/gpl2/gmake/dist/config/progtest.m4 N src/external/gpl2/gmake/dist/config/nls.m4 N src/external/gpl2/gmake/dist/config/po.m4 N src/external/gpl2/gmake/dist/config/mkinstalldirs N src/external/gpl2/gmake/dist/config/Makefile.am N src/external/gpl2/gmake/dist/config/Makefile.in N src/external/gpl2/gmake/dist/config/ChangeLog N src/external/gpl2/gmake/dist/config/compile N src/external/gpl2/gmake/dist/config/config.guess N src/external/gpl2/gmake/dist/config/config.rpath N src/external/gpl2/gmake/dist/config/config.sub N src/external/gpl2/gmake/dist/config/depcomp N src/external/gpl2/gmake/dist/config/install-sh N src/external/gpl2/gmake/dist/config/mdate-sh N src/external/gpl2/gmake/dist/config/missing N src/external/gpl2/gmake/dist/config/inttypes-pri.m4 N src/external/gpl2/gmake/dist/config/texinfo.tex N
CVS commit: src/external/gpl2/gmake/dist
Module Name:src
Committed By: christos
Date: Mon Aug 18 06:57:25 UTC 2014
Modified Files:
src/external/gpl2/gmake/dist: Makefile.in
src/external/gpl2/gmake/dist/config: config.guess
src/external/gpl2/gmake/dist/po: Makefile.in.in
Removed Files:
src/external/gpl2/gmake/dist/doc: make.info make.info-1 make.info-2
Log Message:
merge local changes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/config/config.guess
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/gmake/dist/doc/make.info \
src/external/gpl2/gmake/dist/doc/make.info-1 \
src/external/gpl2/gmake/dist/doc/make.info-2
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl2/gmake/dist/po/Makefile.in.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/gpl2/gmake/dist/Makefile.in
diff -u src/external/gpl2/gmake/dist/Makefile.in:1.1.1.1 src/external/gpl2/gmake/dist/Makefile.in:1.2
--- src/external/gpl2/gmake/dist/Makefile.in:1.1.1.1 Mon Aug 18 02:46:49 2014
+++ src/external/gpl2/gmake/dist/Makefile.in Mon Aug 18 02:57:25 2014
@@ -330,6 +330,8 @@ all: config.h
am--refresh:
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @echo NOT REBUILDING $@
+NetBSD_DISABLED_Makefile.in:
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -357,6 +359,8 @@ $(top_builddir)/config.status: $(top_src
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
+ @echo NOT REBUILDING $@
+NetBSD_DISABLED_configure:
cd $(srcdir) $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -371,6 +375,8 @@ stamp-h1: $(srcdir)/config.h.in $(top_bu
@rm -f stamp-h1
cd $(top_builddir) $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: $(am__configure_deps)
+ @echo NOT REBUILDING $@
+NetBSD_DISABLED_config.h.in:
cd $(top_srcdir) $(AUTOHEADER)
rm -f stamp-h1
touch $@
Index: src/external/gpl2/gmake/dist/config/config.guess
diff -u src/external/gpl2/gmake/dist/config/config.guess:1.1.1.1 src/external/gpl2/gmake/dist/config/config.guess:1.2
--- src/external/gpl2/gmake/dist/config/config.guess:1.1.1.1 Mon Aug 18 02:47:09 2014
+++ src/external/gpl2/gmake/dist/config/config.guess Mon Aug 18 02:57:25 2014
@@ -942,6 +942,9 @@ EOF
vax:Linux:*:*)
echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
+tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
Index: src/external/gpl2/gmake/dist/po/Makefile.in.in
diff -u src/external/gpl2/gmake/dist/po/Makefile.in.in:1.1.1.1 src/external/gpl2/gmake/dist/po/Makefile.in.in:1.2
--- src/external/gpl2/gmake/dist/po/Makefile.in.in:1.1.1.1 Mon Aug 18 02:47:14 2014
+++ src/external/gpl2/gmake/dist/po/Makefile.in.in Mon Aug 18 02:57:25 2014
@@ -13,7 +13,7 @@
PACKAGE = @PACKAGE@
VERSION = @VERSION@
-SHELL = /bin/sh
+SHELL = @SHELL@
@SET_MAKE@
srcdir = @srcdir@
CVS commit: src/tools/gmake
Module Name:src
Committed By: christos
Date: Mon Aug 18 06:58:52 UTC 2014
Modified Files:
src/tools/gmake: Makefile
Log Message:
switch to the new gmake
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tools/gmake/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/gmake/Makefile
diff -u src/tools/gmake/Makefile:1.3 src/tools/gmake/Makefile:1.4
--- src/tools/gmake/Makefile:1.3 Fri Aug 16 06:29:32 2013
+++ src/tools/gmake/Makefile Mon Aug 18 02:58:51 2014
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2013/08/16 10:29:32 gsutre Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/18 06:58:51 christos Exp $
#
-GNUHOSTDIST= ${.CURDIR}/../../gnu/dist/gmake
+GNUHOSTDIST= ${.CURDIR}/../../external/gpl2/gmake/dist
CONFIGURE_ENV+= CC=${HOST_CC:Q} \
CFLAGS=${HOST_CFLAGS:Q} \
CVS commit: src/gnu/dist/gmake
Module Name:src Committed By: christos Date: Mon Aug 18 06:59:30 UTC 2014 Removed Files: src/gnu/dist/gmake: ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.DOS Makefile.am Makefile.ami Makefile.in NEWS NMakefile README README.Amiga README.DOS README.W32 README.customs SCOPTIONS SMakefile acinclude.m4 aclocal.m4 alloca.c amiga.c amiga.h ar.c arscan.c build.sh.in build_w32.bat commands.c commands.h config.ami config.h-vms config.h.W32 config.h.in configh.dos configure configure.bat configure.in debug.h default.c dep.h dir.c dosbuild.bat expand.c file.c filedef.h function.c getloadavg.c getopt.c getopt.h getopt1.c gettext.h hash.c hash.h implicit.c job.c job.h loadavg.c main.c make.1 make.h make.lnk makefile.com makefile.vms misc.c read.c readme.vms remake.c remote-cstms.c remote-stub.c rule.c rule.h signame.c subproc.bat variable.c variable.h version.c vmsdir.h vmsfunctions.c vmsify.c vpath.c src/gnu/dist/gmake/config: ChangeLog Makefile.am Makefile.in codeset.m4 compile config.guess config.rpath config.sub depcomp gettext.m4 glibc21.m4 iconv.m4 install-sh intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 missing mkinstalldirs progtest.m4 stdint_h.m4 texinfo.tex uintmax_t.m4 ulonglong.m4 src/gnu/dist/gmake/doc: Makefile.am Makefile.in fdl.texi make-stds.texi make.texi src/gnu/dist/gmake/glob: COPYING.LIB ChangeLog Makefile.am Makefile.ami Makefile.in SCOPTIONS SMakefile configure.bat fnmatch.c fnmatch.h glob.c glob.h src/gnu/dist/gmake/po: ChangeLog LINGUAS Makefile.in.in Makevars POTFILES.in Rules-quot boldquot.sed da.gmo da.po de.gmo de.po en@boldquot.header en@quot.header es.gmo es.po fr.gmo fr.po gl.gmo gl.po he.gmo he.po hr.gmo hr.po insert-header.sin ja.gmo ja.po ko.gmo ko.po make.pot nl.gmo nl.po pl.gmo pl.po pt_BR.gmo pt_BR.po quot.sed remove-potcdate.sin ru.gmo ru.po sv.gmo sv.po tr.gmo tr.po zh_CN.gmo zh_CN.po src/gnu/dist/gmake/tests: COPYING ChangeLog NEWS README mkshadow run_make_tests run_make_tests.pl test_driver.pl src/gnu/dist/gmake/tests/scripts: test_template src/gnu/dist/gmake/tests/scripts/features: comments conditionals default_names double_colon echoing errors escape export include mult_rules mult_targets order_only override parallelism patspecific_vars quoting recursion reinvoke statipattrules targetvars varnesting vpath vpath2 vpathgpath vpathplus src/gnu/dist/gmake/tests/scripts/functions: addprefix addsuffix basename call dir error eval filter-out findstring foreach if join notdir origin sort strip substitution suffix value warning wildcard word src/gnu/dist/gmake/tests/scripts/misc: general1 general2 general3 general4 src/gnu/dist/gmake/tests/scripts/options: dash-B dash-C dash-I dash-e dash-f dash-k dash-l dash-n dash-q dash-t general src/gnu/dist/gmake/tests/scripts/targets: DEFAULT FORCE INTERMEDIATE PHONY SECONDARY SILENT clean src/gnu/dist/gmake/tests/scripts/variables: CURDIR MAKE MAKECMDGOALS MAKEFILES MAKEFILE_LIST MAKELEVEL automatic flavors special src/gnu/dist/gmake/w32: pathstuff.c src/gnu/dist/gmake/w32/compat: dirent.c src/gnu/dist/gmake/w32/include: dirent.h pathstuff.h sub_proc.h w32err.h src/gnu/dist/gmake/w32/subproc: NMakefile build.bat misc.c proc.h sub_proc.c w32err.c Log Message: moved to external/gpl2/gmake To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/gnu/dist/gmake/ABOUT-NLS \ src/gnu/dist/gmake/AUTHORS src/gnu/dist/gmake/COPYING \ src/gnu/dist/gmake/ChangeLog src/gnu/dist/gmake/INSTALL \ src/gnu/dist/gmake/Makefile.DOS src/gnu/dist/gmake/Makefile.am \ src/gnu/dist/gmake/Makefile.ami src/gnu/dist/gmake/NEWS \ src/gnu/dist/gmake/NMakefile src/gnu/dist/gmake/README \ src/gnu/dist/gmake/README.Amiga src/gnu/dist/gmake/README.DOS \ src/gnu/dist/gmake/README.W32 src/gnu/dist/gmake/README.customs \ src/gnu/dist/gmake/SCOPTIONS src/gnu/dist/gmake/SMakefile \ src/gnu/dist/gmake/acinclude.m4 src/gnu/dist/gmake/aclocal.m4 \ src/gnu/dist/gmake/alloca.c src/gnu/dist/gmake/amiga.c \ src/gnu/dist/gmake/amiga.h src/gnu/dist/gmake/ar.c \ src/gnu/dist/gmake/arscan.c src/gnu/dist/gmake/build.sh.in \ src/gnu/dist/gmake/build_w32.bat src/gnu/dist/gmake/commands.c \ src/gnu/dist/gmake/commands.h src/gnu/dist/gmake/config.ami \ src/gnu/dist/gmake/config.h-vms src/gnu/dist/gmake/config.h.W32 \
CVS commit: src/doc
Module Name:src Committed By: christos Date: Mon Aug 18 07:03:33 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: mention gmake To generate a diff of this commit: cvs rdiff -u -r1.1146 -r1.1147 src/doc/3RDPARTY cvs rdiff -u -r1.1969 -r1.1970 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.1146 src/doc/3RDPARTY:1.1147 --- src/doc/3RDPARTY:1.1146 Fri Aug 15 07:05:07 2014 +++ src/doc/3RDPARTY Mon Aug 18 03:03:33 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1146 2014/08/15 11:05:07 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1147 2014/08/18 07:03:33 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -317,6 +317,18 @@ Notes: Please submit all changes to the author. The distribution doesn't include the Linux specific bits or build system. +Package: gmake +Version: 3.81 +Current Vers: 4.0 +Maintainer: FSF +Archive Site: ftp://ftp.gnu.org/gnu/make/ +Home Page: http://www.gnu.org/software/make/ +Mailing List: bug-m...@gnu.org +Responsible: +License: GPLv2+ (3.81), GPLv3+ (3.82 and later) +Location: external/gpl2/gmke +Notes: + Package: diffutils Version: 2.8.1 Current Vers: 3.3 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1969 src/doc/CHANGES:1.1970 --- src/doc/CHANGES:1.1969 Fri Aug 15 07:05:07 2014 +++ src/doc/CHANGES Mon Aug 18 03:03:33 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1969 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1970 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -26,3 +26,6 @@ Changes from NetBSD 7.0 to NetBSD 8.0: libc: Update to tzcode2014f. [christos 20140815] + gmake: Update to gmake-3.81 in external/gpl2/gmake and remove + gnu/dist/gmake (3.80) [christos 20140818] +
CVS commit: src/external/gpl2/gmake/dist/config
Module Name:src
Committed By: wiz
Date: Mon Aug 18 07:12:47 UTC 2014
Modified Files:
src/external/gpl2/gmake/dist/config: config.guess
Log Message:
Put local change in sorted location.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/gmake/dist/config/config.guess
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/gmake/dist/config/config.guess
diff -u src/external/gpl2/gmake/dist/config/config.guess:1.2 src/external/gpl2/gmake/dist/config/config.guess:1.3
--- src/external/gpl2/gmake/dist/config/config.guess:1.2 Mon Aug 18 06:57:25 2014
+++ src/external/gpl2/gmake/dist/config/config.guess Mon Aug 18 07:12:47 2014
@@ -939,12 +939,12 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
-vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
tile*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Mon Aug 18 07:16:32 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1147 -r1.1148 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1147 src/doc/3RDPARTY:1.1148 --- src/doc/3RDPARTY:1.1147 Mon Aug 18 07:03:33 2014 +++ src/doc/3RDPARTY Mon Aug 18 07:16:32 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1147 2014/08/18 07:03:33 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1148 2014/08/18 07:16:32 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -326,7 +326,7 @@ Home Page: http://www.gnu.org/software/m Mailing List: bug-m...@gnu.org Responsible: License: GPLv2+ (3.81), GPLv3+ (3.82 and later) -Location: external/gpl2/gmke +Location: external/gpl2/gmake Notes: Package: diffutils
CVS commit: src/lib/libutil
Module Name:src Committed By: christos Date: Mon Aug 18 07:33:21 UTC 2014 Modified Files: src/lib/libutil: getfsspecname.3 Log Message: fix param name To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libutil/getfsspecname.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/getfsspecname.3 diff -u src/lib/libutil/getfsspecname.3:1.3 src/lib/libutil/getfsspecname.3:1.4 --- src/lib/libutil/getfsspecname.3:1.3 Sat Apr 7 12:22:42 2012 +++ src/lib/libutil/getfsspecname.3 Mon Aug 18 03:33:21 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: getfsspecname.3,v 1.3 2012/04/07 16:22:42 christos Exp $ +.\ $NetBSD: getfsspecname.3,v 1.4 2014/08/18 07:33:21 christos Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd March 6, 2012 +.Dd August 18, 2014 .Dt GETFSSPECNAME 3 .Os .Sh NAME @@ -54,7 +54,7 @@ to the underlying device node, and places the resulting pathname in .Fa buf up to len -.Fa bufsiz . +.Fa buflen . .Pp If the .Fa spec
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Mon Aug 18 07:37:04 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: exec_elf.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #32):
sys/kern/exec_elf.c: revision 1.70
eliminate COMPAT_OLDNOTE and just always recognize the old notes.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/kern/exec_elf.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/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.69 src/sys/kern/exec_elf.c:1.69.2.1
--- src/sys/kern/exec_elf.c:1.69 Tue Jul 8 17:16:25 2014
+++ src/sys/kern/exec_elf.c Mon Aug 18 07:37:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.69 2014/07/08 17:16:25 maxv Exp $ */
+/* $NetBSD: exec_elf.c,v 1.69.2.1 2014/08/18 07:37:04 martin Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.69 2014/07/08 17:16:25 maxv Exp $);
+__KERNEL_RCSID(1, $NetBSD: exec_elf.c,v 1.69.2.1 2014/08/18 07:37:04 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_pax.h
@@ -863,9 +863,6 @@ netbsd_elf_signature(struct lwp *l, stru
int error;
int isnetbsd = 0;
char *ndata, *ndesc;
-#ifdef COMPAT_OLDNOTE
- int compat_oldnote = -1;
-#endif
#ifdef DIAGNOSTIC
const char *badnote;
@@ -907,6 +904,12 @@ netbsd_elf_signature(struct lwp *l, stru
*header size + 4-byte aligned name + 4-byte aligned desc
* Ensure this size is consistent with what is indicated
* in sh_size. The first check avoids integer overflows.
+ *
+ * Binaries from before NetBSD 1.6 have two notes in the same
+ * note section. The second note was never used, so as long as
+ * the section is at least as big as it should be, it's ok.
+ * These binaries also have a second note section with a note of
+ * type ELF_NOTE_TYPE_NETBSD_TAG, which can be ignored as well.
*/
if (np-n_namesz shp-sh_size || np-n_descsz shp-sh_size) {
BADNOTE(note size limit);
@@ -914,11 +917,8 @@ netbsd_elf_signature(struct lwp *l, stru
}
nsize = sizeof(*np) + roundup(np-n_namesz, 4) +
roundup(np-n_descsz, 4);
- if (nsize != shp-sh_size) {
+ if (nsize shp-sh_size) {
BADNOTE(note size);
-#ifdef COMPAT_OLDNOTE
- if (nsize shp-sh_size || compat_oldnote == 0)
-#endif
goto bad;
}
ndesc = ndata + roundup(np-n_namesz, 4);
@@ -933,9 +933,6 @@ netbsd_elf_signature(struct lwp *l, stru
memcpy(epp-ep_osversion, ndesc,
ELF_NOTE_NETBSD_DESCSZ);
isnetbsd = 1;
-#ifdef COMPAT_OLDNOTE
-compat_oldnote = epp-ep_osversion == 199905;
-#endif
break;
}
@@ -947,10 +944,6 @@ netbsd_elf_signature(struct lwp *l, stru
memcmp(ndata, ELF_NOTE_SUSE_NAME,
ELF_NOTE_SUSE_NAMESZ) == 0)
break;
-#ifdef COMPAT_OLDNOTE
- if (compat_oldnote == 1)
-break;
-#endif
BADNOTE(NetBSD tag);
goto bad;
CVS commit: [netbsd-7] src/external/bsd/bind
Module Name:src
Committed By: martin
Date: Mon Aug 18 07:42:02 UTC 2014
Modified Files:
src/external/bsd/bind [netbsd-7]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by christos in ticket #33):
external/bsd/bind/Makefile.inc: revision 1.22
ALLOW_FILTER__ON_V4 has been renamed to ALLOW_FILTER_ (John D. Baker)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.2.1 src/external/bsd/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.21 src/external/bsd/bind/Makefile.inc:1.21.2.1
--- src/external/bsd/bind/Makefile.inc:1.21 Sat Jul 5 19:22:41 2014
+++ src/external/bsd/bind/Makefile.inc Mon Aug 18 07:42:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.21 2014/07/05 19:22:41 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.21.2.1 2014/08/18 07:42:02 martin Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -50,7 +50,7 @@ CPPFLAGS+=-I${BIND_SRCDIR}/include \
.if (${USE_INET6} != no)
CPPFLAGS+= -DWANT_IPV6
-CPPFLAGS+= -DALLOW_FILTER__ON_V4
+CPPFLAGS+= -DALLOW_FILTER_
.endif
.if defined(HAVE_GCC)
CVS commit: [netbsd-7] src/usr.bin/sed
Module Name:src
Committed By: martin
Date: Mon Aug 18 07:44:03 UTC 2014
Modified Files:
src/usr.bin/sed [netbsd-7]: process.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #34):
usr.bin/sed/process.c: revision 1.46
PR/49109: Jeremie Le Hen: fix sed relative addressin (1,+N)
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192108
http://svnweb.freebsd.org/base?view=revisionrevision=269302
XXX: pullup 7.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.bin/sed/process.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/sed/process.c
diff -u src/usr.bin/sed/process.c:1.45 src/usr.bin/sed/process.c:1.45.2.1
--- src/usr.bin/sed/process.c:1.45 Thu Jun 26 02:14:32 2014
+++ src/usr.bin/sed/process.c Mon Aug 18 07:44:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: process.c,v 1.45 2014/06/26 02:14:32 christos Exp $ */
+/* $NetBSD: process.c,v 1.45.2.1 2014/08/18 07:44:03 martin Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: process.c,v 1.45 2014/06/26 02:14:32 christos Exp $);
+__RCSID($NetBSD: process.c,v 1.45.2.1 2014/08/18 07:44:03 martin Exp $);
#ifdef __FBSDID
__FBSDID($FreeBSD: head/usr.bin/sed/process.c 192732 2009-05-25 06:45:33Z brian $);
#endif
@@ -295,24 +295,32 @@ applies(struct s_command *cp)
r = 1;
else if (cp-a2)
if (cp-startline 0) {
- if (MATCH(cp-a2)) {
-cp-startline = 0;
-lastaddr = 1;
-r = 1;
- } else if (linenum - cp-startline = cp-a2-u.l)
-r = 1;
- else if ((cp-a2-type == AT_LINE
- linenum cp-a2-u.l) ||
- (cp-a2-type == AT_RELLINE
- linenum - cp-startline cp-a2-u.l)) {
-/*
- * We missed the 2nd address due to a branch,
- * so just close the range and return false.
- */
-cp-startline = 0;
-r = 0;
- } else
-r = 1;
+ switch (cp-a2-type) {
+ case AT_RELLINE:
+if (linenum - cp-startline = cp-a2-u.l)
+ r = 1;
+else {
+ cp-startline = 0;
+ r = 0;
+}
+break;
+ default:
+if (MATCH(cp-a2)) {
+ cp-startline = 0;
+ lastaddr = 1;
+ r = 1;
+} else if (cp-a2-type == AT_LINE
+linenum cp-a2-u.l) {
+ /*
+ * We missed the 2nd address due to a
+ * branch, so just close the range and
+ * return false.
+ */
+ cp-startline = 0;
+ r = 0;
+} else
+ r = 1;
+ }
} else if (cp-a1 MATCH(cp-a1)) {
/*
* If the second address is a number less than or
CVS commit: [netbsd-7] src/sys/external/bsd/drm2
Module Name:src
Committed By: martin
Date: Mon Aug 18 07:49:10 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm [netbsd-7]: drm_gem.c
src/sys/external/bsd/drm2/dist/drm/ttm [netbsd-7]: ttm_bo.c
src/sys/external/bsd/drm2/ttm [netbsd-7]: ttm_bo_vm.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #36):
sys/external/bsd/drm2/dist/drm/drm_gem.c: revision 1.5
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c: revision 1.5
sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.3
sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c: revision 1.6
bus_space_mmap cookies are not paddrs, so don't pmap_enter them!
For gem and ttm objects backed by uvm_aobjs, share the vmobjlock.
XXX pullup to 7
Simplify previous.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/external/bsd/drm2/dist/drm/drm_gem.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.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/external/bsd/drm2/dist/drm/drm_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4 src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4.2.1
--- src/sys/external/bsd/drm2/dist/drm/drm_gem.c:1.4 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_gem.c Mon Aug 18 07:49:10 2014
@@ -155,6 +155,13 @@ int drm_gem_object_init(struct drm_devic
#ifdef __NetBSD__
obj-gemo_shm_uao = uao_create(size, 0);
+ /*
+ * XXX This is gross. We ought to do it the other way around:
+ * set the uao to have the main uvm object's lock. However,
+ * uvm_obj_setlock is not safe on uvm_aobjs.
+ */
+ mutex_obj_hold(obj-gemo_shm_uao-vmobjlock);
+ uvm_obj_setlock(obj-gemo_uvmobj, obj-gemo_shm_uao-vmobjlock);
#else
filp = shmem_file_setup(drm mm object, size, VM_NORESERVE);
if (IS_ERR(filp))
Index: src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c
diff -u src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4 src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4.2.1
--- src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c:1.4 Sun Jul 27 00:40:39 2014
+++ src/sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c Mon Aug 18 07:49:10 2014
@@ -33,6 +33,7 @@
#ifdef __NetBSD__
#include sys/types.h
#include uvm/uvm_extern.h
+#include uvm/uvm_object.h
#endif
#include drm/ttm/ttm_module.h
@@ -286,7 +287,21 @@ static int ttm_bo_add_ttm(struct ttm_buf
break;
}
+#ifdef __NetBSD__
+ if (ret)
+ return ret;
+
+ /*
+ * XXX This is gross. We ought to do it the other way around:
+ * set the uao to have the main uvm object's lock. However,
+ * uvm_obj_setlock is not safe on uvm_aobjs.
+ */
+ mutex_obj_hold(bo-ttm-swap_storage-vmobjlock);
+ uvm_obj_setlock(bo-uvmobj, bo-ttm-swap_storage-vmobjlock);
+ return 0;
+#else
return ret;
+#endif
}
static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,
Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2.4.1
--- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.2 Sat Aug 9 00:18:58 2014
+++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Mon Aug 18 07:49:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ttm_bo_vm.c,v 1.2 2014/08/09 00:18:58 riastradh Exp $ */
+/* $NetBSD: ttm_bo_vm.c,v 1.2.4.1 2014/08/18 07:49:10 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.2 2014/08/09 00:18:58 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.2.4.1 2014/08/18 07:49:10 martin Exp $);
#include sys/types.h
@@ -89,6 +89,7 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
unsigned i;
vm_prot_t vm_prot; /* VM_PROT_* */
pgprot_t pgprot; /* VM_PROT_* | PMAP_* cacheability flags */
+ unsigned mmapflags;
int ret;
/* Copy-on-write mappings make no sense for the graphics aperture. */
@@ -178,13 +179,19 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u
/* XXX PGO_ALLPAGES? */
if (pps[i] == PGO_DONTCARE)
continue;
- if (bo-mem.bus.is_iomem)
- paddr = bus_space_mmap(bdev-memt, u.base,
- ((startpage + i) PAGE_SHIFT), vm_prot, 0);
- else
+ if (bo-mem.bus.is_iomem) {
+ const paddr_t cookie = bus_space_mmap(bdev-memt,
+ u.base, ((startpage + i) PAGE_SHIFT), vm_prot,
+ 0);
+
+ paddr = pmap_phys_address(cookie);
+ mmapflags = pmap_mmap_flags(cookie);
+ } else {
paddr = page_to_phys(u.ttm-pages[startpage + i]);
+ mmapflags = 0;
+ }
ret = -pmap_enter(ufi-orig_map-pmap, vaddr + i*PAGE_SIZE,
- paddr, vm_prot, (PMAP_CANFAIL | pgprot));
+ paddr, vm_prot, (PMAP_CANFAIL | pgprot | mmapflags));
if (ret)
goto out3;
}
CVS commit: src
Module Name:src
Committed By: plunky
Date: Mon Aug 18 07:52:40 UTC 2014
Modified Files:
src: Makefile
Log Message:
remove obsolete BUILD_CC_LIB_BASEDIR and BUILD_CC_LIB_BASETARGET vars
To generate a diff of this commit:
cvs rdiff -u -r1.309 -r1.310 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.309 src/Makefile:1.310
--- src/Makefile:1.309 Mon Jun 16 09:06:26 2014
+++ src/Makefile Mon Aug 18 07:52:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.309 2014/06/16 09:06:26 apb Exp $
+# $NetBSD: Makefile,v 1.310 2014/08/18 07:52:40 plunky Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -205,11 +205,6 @@ postinstall-fix-obsolete_stand: .NOTMAIN
#
# Targets (in order!) called by make build.
#
-.if defined(HAVE_GCC)
-BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib
-BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
-.endif
-
BUILDTARGETS+= check-tools
.if ${MKUPDATE} == no !defined(NOCLEANDIR)
BUILDTARGETS+= cleandir
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Aug 18 07:55:26 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 32, 33, 34, 36, 37 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.12 src/doc/CHANGES-7.0:1.1.2.13 --- src/doc/CHANGES-7.0:1.1.2.12 Sun Aug 17 03:34:59 2014 +++ src/doc/CHANGES-7.0 Mon Aug 18 07:55:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.12 2014/08/17 03:34:59 riz Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.13 2014/08/18 07:55:26 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -218,3 +218,45 @@ sys/fs/ptyfs/ptyfs_vnops.c 1.48-1.49 ptyfs_free_get(). [hannken, ticket #29] +sys/kern/exec_elf.c1.70 + + eliminate COMPAT_OLDNOTE and just always recognize the old notes. + [chs, ticket #32] + +external/bsd/bind/Makefile.inc 1.22 + + ALLOW_FILTER__ON_V4 has been renamed to ALLOW_FILTER_ + (John D. Baker) + [christos, ticket #33] + +usr.bin/sed/process.c1.46 + + PR/49109: Jeremie Le Hen: fix sed relative addressin (1,+N) + https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=192108 + http://svnweb.freebsd.org/base?view=revisionrevision=269302 + [christos, ticket #34] + +sys/external/bsd/drm2/dist/drm/drm_gem.c 1.5 +sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c 1.5 +sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c 1.6 +sys/external/bsd/drm2/ttm/ttm_bo_vm.c 1.3 + + bus_space_mmap cookies are not paddrs, so don't pmap_enter them! + For gem and ttm objects backed by uvm_aobjs, share the vmobjlock. + Simplify previous. + [riastradh, ticket #36] + +external/gpl3/gcc/dist/gcc/config/vax/builtins.md 1.4 +external/gpl3/gcc/dist/gcc/config/vax/vax.c 1.10 + Rework so that the ctzsi builtin is supported. + +lib/libc/compiler_rt/Makefile.inc 1.26 + VAX does need __clzsi2 + +libexec/ld.elf_so/arch/vax/rtld_start.S 1.23 +libexec/ld.elf_so/arch/vax/rtld_start.S 1.24 + add a missing register prefix. + Add proper registers for register counts. + + [matt, ticket #37] +
CVS commit: src/usr.bin/config
Module Name:src
Committed By: joerg
Date: Mon Aug 18 08:07:02 UTC 2014
Modified Files:
src/usr.bin/config: mkmakefile.c
Log Message:
Restore explicit rule for swap*.o.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/config/mkmakefile.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/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.16 src/usr.bin/config/mkmakefile.c:1.17
--- src/usr.bin/config/mkmakefile.c:1.16 Sun Aug 17 21:17:44 2014
+++ src/usr.bin/config/mkmakefile.c Mon Aug 18 08:07:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.16 2014/08/17 21:17:44 joerg Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.17 2014/08/18 08:07:02 joerg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -507,7 +507,6 @@ static void
emitload(FILE *fp)
{
struct config *cf;
- const char *nm, *swname;
fputs(.MAIN: all\nall:, fp);
TAILQ_FOREACH(cf, allcf, cf_next) {
@@ -522,12 +521,11 @@ emitload(FILE *fp)
}
fputs(\n\n, fp);
TAILQ_FOREACH(cf, allcf, cf_next) {
- nm = cf-cf_name;
- swname =
- cf-cf_root != NULL ? cf-cf_name : generic;
- fprintf(fp, KERNELS+=%s\n, nm);
+ fprintf(fp, KERNELS+=%s\n, cf-cf_name);
fprintf(fp, %s: ${SYSTEM_DEP} swap%s.o vers.o build_kernel\n,
- nm, nm);
+ cf-cf_name, cf-cf_name);
+ fprintf(fp, swap%s.o: swap%s.c\n
+ \t${NORMAL_C}\n\n, cf-cf_name, cf-cf_name);
}
fputs(\n, fp);
}
CVS commit: src/usr.bin/flock
Module Name:src
Committed By: christos
Date: Mon Aug 18 09:14:03 UTC 2014
Modified Files:
src/usr.bin/flock: flock.c
Log Message:
make this behave like linux.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/flock/flock.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/flock/flock.c
diff -u src/usr.bin/flock/flock.c:1.9 src/usr.bin/flock/flock.c:1.10
--- src/usr.bin/flock/flock.c:1.9 Mon Jan 6 21:07:08 2014
+++ src/usr.bin/flock/flock.c Mon Aug 18 05:14:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: flock.c,v 1.9 2014/01/07 02:07:08 joerg Exp $ */
+/* $NetBSD: flock.c,v 1.10 2014/08/18 09:14:03 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: flock.c,v 1.9 2014/01/07 02:07:08 joerg Exp $);
+__RCSID($NetBSD: flock.c,v 1.10 2014/08/18 09:14:03 christos Exp $);
#include stdio.h
#include string.h
@@ -43,6 +43,7 @@ __RCSID($NetBSD: flock.c,v 1.9 2014/01/
#include errno.h
#include getopt.h
#include paths.h
+#include limits.h
#include time.h
static struct option flock_longopts[] = {
@@ -155,6 +156,7 @@ main(int argc, char *argv[])
int fd = -1;
int debug = 0;
int verbose = 0;
+ long l;
char *mcargv[] = {
__UNCONST(_PATH_BSHELL), __UNCONST(-c), NULL, NULL
};
@@ -207,7 +209,7 @@ main(int argc, char *argv[])
argv += optind;
if ((lock ~LOCK_NB) == 0)
- usage(Missing lock type flag);
+ lock |= LOCK_EX; /* default to exclusive like linux */
switch (argc) {
case 0:
@@ -215,7 +217,13 @@ main(int argc, char *argv[])
case 1:
if (cls)
usage(Close is valid only for descriptors);
- fd = strtol(argv[0], NULL, 0); // XXX: error checking
+ errno = 0;
+ l = strtol(argv[0], v, 0); // XXX: error checking
+ if ((l == LONG_MIN || l == LONG_MAX) errno == ERANGE)
+ err(EXIT_FAILURE, Bad file descriptor `%s', argv[0]);
+ if (l INT_MAX || l 0 || *v)
+ errx(EXIT_FAILURE, Bad file descriptor `%s', argv[0]);
+ fd = (int)l;
if (debug) {
fprintf(stderr, descriptor %s lock %s\n,
argv[0], lock2name(lock));
CVS commit: src/usr.bin/flock
Module Name:src Committed By: christos Date: Mon Aug 18 09:16:35 UTC 2014 Modified Files: src/usr.bin/flock: flock.c Log Message: remove XXX, fix error message To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.bin/flock/flock.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/flock/flock.c diff -u src/usr.bin/flock/flock.c:1.10 src/usr.bin/flock/flock.c:1.11 --- src/usr.bin/flock/flock.c:1.10 Mon Aug 18 05:14:03 2014 +++ src/usr.bin/flock/flock.c Mon Aug 18 05:16:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: flock.c,v 1.10 2014/08/18 09:14:03 christos Exp $ */ +/* $NetBSD: flock.c,v 1.11 2014/08/18 09:16:35 christos Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: flock.c,v 1.10 2014/08/18 09:14:03 christos Exp $); +__RCSID($NetBSD: flock.c,v 1.11 2014/08/18 09:16:35 christos Exp $); #include stdio.h #include string.h @@ -216,9 +216,9 @@ main(int argc, char *argv[]) usage(Missing lock file argument); case 1: if (cls) - usage(Close is valid only for descriptors); + usage(Close is not valid for descriptors); errno = 0; - l = strtol(argv[0], v, 0); // XXX: error checking + l = strtol(argv[0], v, 0); if ((l == LONG_MIN || l == LONG_MAX) errno == ERANGE) err(EXIT_FAILURE, Bad file descriptor `%s', argv[0]); if (l INT_MAX || l 0 || *v)
CVS commit: src/usr.bin/flock
Module Name:src Committed By: christos Date: Mon Aug 18 09:45:52 UTC 2014 Modified Files: src/usr.bin/flock: flock.1 Log Message: mention that -x is the default. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.bin/flock/flock.1 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/flock/flock.1 diff -u src/usr.bin/flock/flock.1:1.9 src/usr.bin/flock/flock.1:1.10 --- src/usr.bin/flock/flock.1:1.9 Sat Sep 21 11:01:14 2013 +++ src/usr.bin/flock/flock.1 Mon Aug 18 05:45:52 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: flock.1,v 1.9 2013/09/21 15:01:14 khorben Exp $ +.\ $NetBSD: flock.1,v 1.10 2014/08/18 09:45:52 christos Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .\ -.Dd November 2, 2012 +.Dd August 18, 2014 .Dt FLOCK 1 .Os .Sh NAME @@ -87,6 +87,7 @@ Fail if the lock could not be obtained a .Ar seconds . .It Fl x , Fl Fl exclusive Obtain an exclusive lock. +This is the default. .El .Sh EXIT STATUS .Ex -std
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Mon Aug 18 12:40:36 UTC 2014
Modified Files:
src/sbin/ccdconfig [netbsd-7]: ccdconfig.c
src/sys/dev [netbsd-7]: ccd.c ccdvar.h
Log Message:
Pull up following revision(s) (requested by sborrill in ticket #38):
sys/dev/ccd.c: revision 1.152
sbin/ccdconfig/ccdconfig.c: revision 1.54
sbin/ccdconfig/ccdconfig.c: revision 1.55
sys/dev/ccdvar.h: revision 1.34
Switch size_t to uint64_t in appropriate places to ensure that ccd(4) works
with component and total sizes of 2TB.
Add COMPAT_60 code for platforms where this alters userland-accessible
structures.
Make kernel print device information when a ccd configured.
Fix some typos in comments.
Don't print ccd_size with %zu; it no longer has type size_t.
Instead, cast to uintmax_t and print with %ju.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.6.1 src/sbin/ccdconfig/ccdconfig.c
cvs rdiff -u -r1.151 -r1.151.2.1 src/sys/dev/ccd.c
cvs rdiff -u -r1.33 -r1.33.10.1 src/sys/dev/ccdvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ccdconfig/ccdconfig.c
diff -u src/sbin/ccdconfig/ccdconfig.c:1.53 src/sbin/ccdconfig/ccdconfig.c:1.53.6.1
--- src/sbin/ccdconfig/ccdconfig.c:1.53 Fri May 3 00:01:15 2013
+++ src/sbin/ccdconfig/ccdconfig.c Mon Aug 18 12:40:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdconfig.c,v 1.53 2013/05/03 00:01:15 christos Exp $ */
+/* $NetBSD: ccdconfig.c,v 1.53.6.1 2014/08/18 12:40:36 martin Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: ccdconfig.c,v 1.53 2013/05/03 00:01:15 christos Exp $);
+__RCSID($NetBSD: ccdconfig.c,v 1.53.6.1 2014/08/18 12:40:36 martin Exp $);
#endif
#include sys/param.h
@@ -271,7 +271,7 @@ do_single(int argc, char **argv, int act
ui == 0 ? '(' : ' ', cp2,
ui == ccio.ccio_ndisks - 1 ? ')' : ',');
}
- printf(, %ld blocks , (long)ccio.ccio_size);
+ printf(, %ju blocks , (uintmax_t)ccio.ccio_size);
if (ccio.ccio_ileave != 0)
printf(interleaved at %d blocks\n, ccio.ccio_ileave);
else
@@ -445,8 +445,9 @@ print_ccd_info(int u, struct ccddiskinfo
}
/* Dump out softc information. */
- printf(ccd%d\t\t%d\t0x%x\t%zu\t, u, ccd-ccd_ileave,
- ccd-ccd_flags CCDF_USERMASK, ccd-ccd_size * DEV_BSIZE);
+ printf(ccd%d\t\t%d\t0x%x\t%ju\t, u, ccd-ccd_ileave,
+ ccd-ccd_flags CCDF_USERMASK,
+ (uintmax_t)ccd-ccd_size * DEV_BSIZE);
/* Read component pathname and display component info. */
for (size_t i = 0; i ccd-ccd_ndisks; ++i) {
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.151 src/sys/dev/ccd.c:1.151.2.1
--- src/sys/dev/ccd.c:1.151 Fri Jul 25 08:10:35 2014
+++ src/sys/dev/ccd.c Mon Aug 18 12:40:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.151 2014/07/25 08:10:35 dholland Exp $ */
+/* $NetBSD: ccd.c,v 1.151.2.1 2014/08/18 12:40:36 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,11 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.151 2014/07/25 08:10:35 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.151.2.1 2014/08/18 12:40:36 martin Exp $);
+
+#if defined(_KERNEL_OPT)
+#include opt_compat_netbsd.h
+#endif
#include sys/param.h
#include sys/systm.h
@@ -426,6 +430,22 @@ ccdinit(struct ccd_softc *cs, char **cpa
ccg-ccg_ntracks = 1;
ccg-ccg_nsectors = 1024 * (1024 / ccg-ccg_secsize);
ccg-ccg_ncylinders = cs-sc_size / ccg-ccg_nsectors;
+
+ if (cs-sc_ileave 0)
+ aprint_normal(%s: Interleaving %d component%s
+ (%d block interleave)\n, cs-sc_xname,
+ cs-sc_nccdisks, (cs-sc_nccdisks != 0 ? s : ),
+ cs-sc_ileave);
+ else
+ aprint_normal(%s: Concatenating %d component%s\n,
+ cs-sc_xname,
+ cs-sc_nccdisks, (cs-sc_nccdisks != 0 ? s : ));
+ for (ix = 0; ix cs-sc_nccdisks; ix++) {
+ ci = cs-sc_cinfo[ix];
+ aprint_normal(%s: %s (%ju blocks)\n, cs-sc_xname,
+ ci-ci_path, (uintmax_t)ci-ci_size);
+ }
+ aprint_normal(%s: total %ju blocks\n, cs-sc_xname, cs-sc_size);
/*
* Create thread to handle deferred I/O.
@@ -1053,6 +1073,46 @@ ccdioctl(dev_t dev, u_long cmd, void *da
return ENOENT;
uc = kauth_cred_get();
+/*
+ * Compat code must not be called if on a platform where
+ * sizeof (size_t) == sizeof (uint64_t) as CCDIOCSET will
+ * be the same as CCDIOCSET_60
+ */
+#if defined(COMPAT_60) !defined(_LP64)
+ switch (cmd) {
+ case CCDIOCSET_60: {
+ struct ccd_ioctl ccionew;
+ struct ccd_ioctl_60 *ccio60 =
+ (struct ccd_ioctl_60 *)data;
+ ccionew.ccio_disks = ccio-ccio_disks;
+ ccionew.ccio_ndisks = ccio-ccio_ndisks;
+ ccionew.ccio_ileave = ccio-ccio_ileave;
+ ccionew.ccio_flags =
CVS commit: [netbsd-7] src/sys/rump/librump/rumpkern
Module Name:src
Committed By: martin
Date: Mon Aug 18 13:26:55 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern [netbsd-7]: hyperentropy.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #35):
sys/rump/librump/rumpkern/hyperentropy.c: revision 1.6
sys/rump/librump/rumpkern/hyperentropy.c: revision 1.7
sys/rump/librump/rumpkern/hyperentropy.c: revision 1.4
sys/rump/librump/rumpkern/hyperentropy.c: revision 1.5
Call rnd_add_data asynchronously for the rump hyperentropy callback.
Avoids recursion rnd_getmore - rnd_add_data - rnd_getmore, which is
silly but I don't have time to fix it properly right now.
add sys/atomic.h and order headers correctly
Fix header ordering
sys/param.h comes first, per /usr/share/misc/style.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/rump/librump/rumpkern/hyperentropy.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/rump/librump/rumpkern/hyperentropy.c
diff -u src/sys/rump/librump/rumpkern/hyperentropy.c:1.3 src/sys/rump/librump/rumpkern/hyperentropy.c:1.3.2.1
--- src/sys/rump/librump/rumpkern/hyperentropy.c:1.3 Sun Aug 10 16:44:36 2014
+++ src/sys/rump/librump/rumpkern/hyperentropy.c Mon Aug 18 13:26:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: hyperentropy.c,v 1.3 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: hyperentropy.c,v 1.3.2.1 2014/08/18 13:26:54 martin Exp $ */
/*
* Copyright (c) 2014 Antti Kantee. All Rights Reserved.
@@ -26,9 +26,10 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hyperentropy.c,v 1.3 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: hyperentropy.c,v 1.3.2.1 2014/08/18 13:26:54 martin Exp $);
#include sys/param.h
+#include sys/atomic.h
#include sys/kmem.h
#include sys/rnd.h
@@ -37,10 +38,12 @@ __KERNEL_RCSID(0, $NetBSD: hyperentropy
#include rump_private.h
static krndsource_t rndsrc;
+static volatile unsigned hyperentropy_wanted;
+static void *feedrandom_softint;
#define MAXGET (RND_POOLBITS/NBBY)
static void
-feedrandom(size_t bytes, void *arg)
+feedrandom(size_t bytes)
{
uint8_t *rnddata;
size_t dsize;
@@ -52,18 +55,42 @@ feedrandom(size_t bytes, void *arg)
kmem_intr_free(rnddata, MAXGET);
}
+static void
+feedrandom_intr(void *cookie __unused)
+{
+
+ feedrandom(atomic_swap_uint(hyperentropy_wanted, 0));
+}
+
+static void
+feedrandom_cb(size_t bytes, void *cookie __unused)
+{
+ unsigned old, new;
+
+ do {
+ old = hyperentropy_wanted;
+ new = ((MAXGET - old) bytes? MAXGET : (old + bytes));
+ } while (atomic_cas_uint(hyperentropy_wanted, old, new) != old);
+
+ softint_schedule(feedrandom_softint);
+}
+
void
rump_hyperentropy_init(void)
{
if (rump_threads) {
- rndsource_setcb(rndsrc, feedrandom, rndsrc);
+ feedrandom_softint =
+ softint_establish(SOFTINT_CLOCK|SOFTINT_MPSAFE,
+ feedrandom_intr, NULL);
+ KASSERT(feedrandom_softint != NULL);
+ rndsource_setcb(rndsrc, feedrandom_cb, rndsrc);
rnd_attach_source(rndsrc, rump_hyperent, RND_TYPE_VM,
RND_FLAG_COLLECT_VALUE|RND_FLAG_HASCB);
} else {
/* without threads, just fill the pool */
rnd_attach_source(rndsrc, rump_hyperent, RND_TYPE_VM,
RND_FLAG_COLLECT_VALUE);
- feedrandom(RND_POOLBITS/NBBY, NULL);
+ feedrandom(MAXGET);
}
}
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: apb
Date: Mon Aug 18 13:46:07 UTC 2014
Modified Files:
src/sys/dev/dkwedge: dkwedge_bsdlabel.c
Log Message:
Don't ignore unrecognised partition types in BSD disklabels;
instead, add them with wedge partition type unknown#%u, where
%u is the underlying numeric partition type from the BSD disklabel.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/dkwedge/dkwedge_bsdlabel.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/dkwedge/dkwedge_bsdlabel.c
diff -u src/sys/dev/dkwedge/dkwedge_bsdlabel.c:1.19 src/sys/dev/dkwedge/dkwedge_bsdlabel.c:1.20
--- src/sys/dev/dkwedge/dkwedge_bsdlabel.c:1.19 Mon Mar 31 11:25:49 2014
+++ src/sys/dev/dkwedge/dkwedge_bsdlabel.c Mon Aug 18 13:46:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_bsdlabel.c,v 1.19 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: dkwedge_bsdlabel.c,v 1.20 2014/08/18 13:46:07 apb Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dkwedge_bsdlabel.c,v 1.19 2014/03/31 11:25:49 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: dkwedge_bsdlabel.c,v 1.20 2014/08/18 13:46:07 apb Exp $);
#include sys/param.h
#ifdef _KERNEL
@@ -232,18 +232,15 @@ addwedges(const mbr_args_t *a, const str
if (p-p_fstype == FS_UNUSED)
continue;
- if ((ptype = bsdlabel_fstype_to_str(p-p_fstype)) == NULL) {
- /*
- * XXX Should probably just add these...
- * XXX maybe just have an empty ptype?
- */
- aprint_verbose(%s: skipping partition %d, type %d\n,
- a-pdk-dk_name, i, p-p_fstype);
- continue;
- }
- strcpy(dkw.dkw_ptype, ptype);
+ ptype = bsdlabel_fstype_to_str(p-p_fstype);
+ if (ptype == NULL)
+ snprintf(dkw.dkw_ptype, sizeof(dkw.dkw_ptype),
+ unknown#%u, p-p_fstype);
+ else
+ strlcpy(dkw.dkw_ptype, ptype, sizeof(dkw.dkw_ptype));
- strcpy(dkw.dkw_parent, a-pdk-dk_name);
+ strlcpy(dkw.dkw_parent, a-pdk-dk_name,
+ sizeof(dkw.dkw_parent));
dkw.dkw_offset = p-p_offset;
dkw.dkw_size = p-p_size;
CVS commit: src/sys/dev/dkwedge
Module Name:src
Committed By: apb
Date: Mon Aug 18 14:18:59 UTC 2014
Modified Files:
src/sys/dev/dkwedge: dkwedge_bsdlabel.c
Log Message:
Use FSTYPE_DEFN from sys/disklabel.h to generate case branches for
conversions from all known disklabel fstypes to strings. This replaces
the hand-coded list of conversions for only a few of the known types.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dkwedge/dkwedge_bsdlabel.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/dkwedge/dkwedge_bsdlabel.c
diff -u src/sys/dev/dkwedge/dkwedge_bsdlabel.c:1.20 src/sys/dev/dkwedge/dkwedge_bsdlabel.c:1.21
--- src/sys/dev/dkwedge/dkwedge_bsdlabel.c:1.20 Mon Aug 18 13:46:07 2014
+++ src/sys/dev/dkwedge/dkwedge_bsdlabel.c Mon Aug 18 14:18:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_bsdlabel.c,v 1.20 2014/08/18 13:46:07 apb Exp $ */
+/* $NetBSD: dkwedge_bsdlabel.c,v 1.21 2014/08/18 14:18:59 apb Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dkwedge_bsdlabel.c,v 1.20 2014/08/18 13:46:07 apb Exp $);
+__KERNEL_RCSID(0, $NetBSD: dkwedge_bsdlabel.c,v 1.21 2014/08/18 14:18:59 apb Exp $);
#include sys/param.h
#ifdef _KERNEL
@@ -144,21 +144,15 @@ bsdlabel_fstype_to_str(uint8_t fstype)
{
const char *str;
+ /*
+ * For each type known to FSTYPE_DEFN (from sys/disklabel.h),
+ * a suitable case branch will convert the type number to a string.
+ */
switch (fstype) {
- case FS_UNUSED: str = DKW_PTYPE_UNUSED; break;
- case FS_SWAP: str = DKW_PTYPE_SWAP; break;
- case FS_BSDFFS: str = DKW_PTYPE_FFS; break;
- case FS_MSDOS: str = DKW_PTYPE_FAT; break;
- case FS_BSDLFS: str = DKW_PTYPE_LFS; break;
- case FS_ISO9660: str = DKW_PTYPE_ISO9660; break;
- case FS_ADOS: str = DKW_PTYPE_AMIGADOS; break;
- case FS_HFS: str = DKW_PTYPE_APPLEHFS; break;
- case FS_FILECORE: str = DKW_PTYPE_FILECORE; break;
- case FS_EX2FS: str = DKW_PTYPE_EXT2FS; break;
- case FS_NTFS: str = DKW_PTYPE_NTFS; break;
- case FS_RAID: str = DKW_PTYPE_RAIDFRAME; break;
- case FS_CCD: str = DKW_PTYPE_CCD; break;
- case FS_APPLEUFS: str = DKW_PTYPE_APPLEUFS; break;
+#define FSTYPE_TO_STR_CASE(tag, number, name, fsck, mount) \
+ case __CONCAT(FS_,tag): str = name; break;
+ FSTYPE_DEFN(FSTYPE_TO_STR_CASE)
+#undef FSTYPE_TO_STR_CASE
default: str = NULL; break;
}
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Mon Aug 18 14:21:18 UTC 2014
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
support endian-independent operation on all platforms
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/shmif_dumpbus/shmif_dumpbus.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/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.11 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.12
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.11 Fri Dec 20 10:04:33 2013
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Mon Aug 18 14:21:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.11 2013/12/20 10:04:33 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.12 2014/08/18 14:21:18 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include rump/rumpuser_port.h
#ifndef lint
-__RCSID($NetBSD: shmif_dumpbus.c,v 1.11 2013/12/20 10:04:33 pooka Exp $);
+__RCSID($NetBSD: shmif_dumpbus.c,v 1.12 2014/08/18 14:21:18 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -69,15 +69,41 @@ usage(void)
}
#define BUFSIZE 64*1024
-#ifdef __NetBSD__
-#define SWAPME(a) (doswap ? bswap32(a) : (a))
-#define SWAPME64(a) (doswap ? bswap64(a) : (a))
-#else
-/* lazy, but let's assume everyone uses shmif_dumpbus only locally */
-#define SWAPME(a) (a)
-#define SWAPME64(a) (a)
-#define bswap32(a) (a)
-#endif
+
+/*
+ * byte swapdom
+ */
+static uint32_t
+swp32(uint32_t x)
+{
+ uint32_t v;
+
+ v = (((x) 0xff00) 24) |
+ (((x) 0x00ff) 8) |
+ (((x) 0xff00) 8) |
+ (((x) 0x00ff) 24);
+ return v;
+}
+
+static uint64_t
+swp64(uint64_t x)
+{
+ uint64_t v;
+
+ v = (((x) 0xff00ull) 56) |
+ (((x) 0x00ffull) 40) |
+ (((x) 0xff00ull) 24) |
+ (((x) 0x00ffull) 8) |
+ (((x) 0xff00ull) 8) |
+ (((x) 0x00ffull) 24) |
+ (((x) 0xff00ull) 40) |
+ (((x) 0x00ffull) 56);
+ return v;
+}
+
+#define SWAPME(x) (doswap ? swp32(x) : (x))
+#define SWAPME64(x) (doswap ? swp64(x) : (x))
+
int
main(int argc, char *argv[])
{
@@ -133,9 +159,9 @@ main(int argc, char *argv[])
bmem = busmem;
if (bmem-shm_magic != SHMIF_MAGIC) {
- if (bmem-shm_magic != bswap32(SHMIF_MAGIC))
+ if (bmem-shm_magic != swp32(SHMIF_MAGIC))
errx(1, %s not a shmif bus, argv[0]);
- doswap = 1;
+ doswap = true;
}
if (SWAPME(bmem-shm_version) != SHMIF_VERSION)
errx(1, bus vesrsion %d, program %d,
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src Committed By: pooka Date: Mon Aug 18 14:21:44 UTC 2014 Modified Files: src/usr.bin/shmif_dumpbus: shmif_dumpbus.c Log Message: fix tyop in error message To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.bin/shmif_dumpbus/shmif_dumpbus.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/shmif_dumpbus/shmif_dumpbus.c diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.12 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.13 --- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.12 Mon Aug 18 14:21:18 2014 +++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Mon Aug 18 14:21:44 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: shmif_dumpbus.c,v 1.12 2014/08/18 14:21:18 pooka Exp $ */ +/* $NetBSD: shmif_dumpbus.c,v 1.13 2014/08/18 14:21:44 pooka Exp $ */ /*- * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -33,7 +33,7 @@ #include rump/rumpuser_port.h #ifndef lint -__RCSID($NetBSD: shmif_dumpbus.c,v 1.12 2014/08/18 14:21:18 pooka Exp $); +__RCSID($NetBSD: shmif_dumpbus.c,v 1.13 2014/08/18 14:21:44 pooka Exp $); #endif /* !lint */ #include sys/types.h @@ -164,7 +164,7 @@ main(int argc, char *argv[]) doswap = true; } if (SWAPME(bmem-shm_version) != SHMIF_VERSION) - errx(1, bus vesrsion %d, program %d, + errx(1, bus version %d, program %d, SWAPME(bmem-shm_version), SHMIF_VERSION); if (pcapfile strcmp(pcapfile, -) == 0)
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Mon Aug 18 14:23:24 UTC 2014
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
make name more descriptive: SWAPME - FIXENDIAN
no functional change
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/shmif_dumpbus/shmif_dumpbus.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/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.13 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.14
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.13 Mon Aug 18 14:21:44 2014
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Mon Aug 18 14:23:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.13 2014/08/18 14:21:44 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.14 2014/08/18 14:23:24 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include rump/rumpuser_port.h
#ifndef lint
-__RCSID($NetBSD: shmif_dumpbus.c,v 1.13 2014/08/18 14:21:44 pooka Exp $);
+__RCSID($NetBSD: shmif_dumpbus.c,v 1.14 2014/08/18 14:23:24 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -101,8 +101,8 @@ swp64(uint64_t x)
return v;
}
-#define SWAPME(x) (doswap ? swp32(x) : (x))
-#define SWAPME64(x) (doswap ? swp64(x) : (x))
+#define FIXENDIAN32(x) (doswap ? swp32(x) : (x))
+#define FIXENDIAN64(x) (doswap ? swp64(x) : (x))
int
main(int argc, char *argv[])
@@ -163,18 +163,18 @@ main(int argc, char *argv[])
errx(1, %s not a shmif bus, argv[0]);
doswap = true;
}
- if (SWAPME(bmem-shm_version) != SHMIF_VERSION)
+ if (FIXENDIAN32(bmem-shm_version) != SHMIF_VERSION)
errx(1, bus version %d, program %d,
- SWAPME(bmem-shm_version), SHMIF_VERSION);
+ FIXENDIAN32(bmem-shm_version), SHMIF_VERSION);
if (pcapfile strcmp(pcapfile, -) == 0)
dumploc = stderr;
fprintf(dumploc, bus version %d, lock: %d, generation: % PRIu64
, firstoff: 0x%04x, lastoff: 0x%04x\n,
- SWAPME(bmem-shm_version), SWAPME(bmem-shm_lock),
- SWAPME64(bmem-shm_gen),
- SWAPME(bmem-shm_first), SWAPME(bmem-shm_last));
+ FIXENDIAN32(bmem-shm_version), FIXENDIAN32(bmem-shm_lock),
+ FIXENDIAN64(bmem-shm_gen),
+ FIXENDIAN32(bmem-shm_first), FIXENDIAN32(bmem-shm_last));
if (hflag)
exit(0);
@@ -189,8 +189,8 @@ main(int argc, char *argv[])
pdump = NULL;
}
- curbus = SWAPME(bmem-shm_first);
- buslast = SWAPME(bmem-shm_last);
+ curbus = FIXENDIAN32(bmem-shm_first);
+ buslast = FIXENDIAN32(bmem-shm_last);
if (curbus == BUSMEM_DATASIZE)
curbus = 0;
@@ -215,15 +215,15 @@ main(int argc, char *argv[])
bonus = 0;
assert(curbus sb.st_size);
- curlen = SWAPME(sp.sp_len);
+ curlen = FIXENDIAN32(sp.sp_len);
if (curlen == 0) {
continue;
}
fprintf(dumploc, packet %d, offset 0x%04x, length 0x%04x,
- ts %d/%06d\n, i++, curbus,
- curlen, SWAPME(sp.sp_sec), SWAPME(sp.sp_usec));
+ ts %d/%06d\n, i++, curbus, curlen,
+ FIXENDIAN32(sp.sp_sec), FIXENDIAN32(sp.sp_usec));
if (!pcapfile) {
curbus = shmif_busread(bmem,
@@ -235,8 +235,8 @@ main(int argc, char *argv[])
memset(packhdr, 0, sizeof(packhdr));
packhdr.caplen = packhdr.len = curlen;
- packhdr.ts.tv_sec = SWAPME(sp.sp_sec);
- packhdr.ts.tv_usec = SWAPME(sp.sp_usec);
+ packhdr.ts.tv_sec = FIXENDIAN32(sp.sp_sec);
+ packhdr.ts.tv_usec = FIXENDIAN32(sp.sp_usec);
assert(curlen = BUFSIZE);
curbus = shmif_busread(bmem, buf, curbus, curlen, wrap);
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Mon Aug 18 14:33:24 UTC 2014
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
Add compat for bus version 2.
Fixes tests, but, XXX, should add tests for bus version 3.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/shmif_dumpbus/shmif_dumpbus.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/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.14 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.15
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.14 Mon Aug 18 14:23:24 2014
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Mon Aug 18 14:33:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.14 2014/08/18 14:23:24 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.15 2014/08/18 14:33:23 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include rump/rumpuser_port.h
#ifndef lint
-__RCSID($NetBSD: shmif_dumpbus.c,v 1.14 2014/08/18 14:23:24 pooka Exp $);
+__RCSID($NetBSD: shmif_dumpbus.c,v 1.15 2014/08/18 14:33:23 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -104,6 +104,14 @@ swp64(uint64_t x)
#define FIXENDIAN32(x) (doswap ? swp32(x) : (x))
#define FIXENDIAN64(x) (doswap ? swp64(x) : (x))
+/* compat for bus version 2 */
+struct shmif_pkthdr2 {
+ uint32_t sp_len;
+
+ uint32_t sp_sec;
+ uint32_t sp_usec;
+};
+
int
main(int argc, char *argv[])
{
@@ -118,6 +126,7 @@ main(int argc, char *argv[])
bool hflag = false, doswap = false;
pcap_dumper_t *pdump;
FILE *dumploc = stdout;
+ int useversion;
#ifdef PLATFORM_HAS_SETGETPROGNAME
setprogname(argv[0]);
@@ -163,9 +172,15 @@ main(int argc, char *argv[])
errx(1, %s not a shmif bus, argv[0]);
doswap = true;
}
- if (FIXENDIAN32(bmem-shm_version) != SHMIF_VERSION)
- errx(1, bus version %d, program %d,
- FIXENDIAN32(bmem-shm_version), SHMIF_VERSION);
+ if (FIXENDIAN32(bmem-shm_version) != SHMIF_VERSION) {
+ if (FIXENDIAN32(bmem-shm_version) != 2) {
+ errx(1, bus version %d, program %d,
+ FIXENDIAN32(bmem-shm_version), SHMIF_VERSION);
+ }
+ useversion = 2;
+ } else {
+ useversion = 3;
+ }
if (pcapfile strcmp(pcapfile, -) == 0)
dumploc = stderr;
@@ -199,23 +214,39 @@ main(int argc, char *argv[])
bonus = 1;
i = 0;
+
while (curbus = buslast || bonus) {
struct pcap_pkthdr packhdr;
struct shmif_pkthdr sp;
+ struct shmif_pkthdr2 sp2;
uint32_t oldoff;
uint32_t curlen;
+ uint32_t sp_sec, sp_usec, sp_len;
bool wrap;
assert(curbus sb.st_size);
wrap = false;
oldoff = curbus;
- curbus = shmif_busread(bmem, sp, oldoff, sizeof(sp), wrap);
+
+ if (useversion == 3) {
+ curbus = shmif_busread(bmem,
+ sp, oldoff, sizeof(sp), wrap);
+ sp_len = sp.sp_len;
+ sp_sec = sp.sp_sec;
+ sp_usec = sp.sp_usec;
+ } else {
+ curbus = shmif_busread(bmem,
+ sp2, oldoff, sizeof(sp2), wrap);
+ sp_len = sp2.sp_len;
+ sp_sec = sp2.sp_sec;
+ sp_usec = sp2.sp_usec;
+ }
if (wrap)
bonus = 0;
assert(curbus sb.st_size);
- curlen = FIXENDIAN32(sp.sp_len);
+ curlen = FIXENDIAN32(sp_len);
if (curlen == 0) {
continue;
@@ -223,7 +254,7 @@ main(int argc, char *argv[])
fprintf(dumploc, packet %d, offset 0x%04x, length 0x%04x,
ts %d/%06d\n, i++, curbus, curlen,
- FIXENDIAN32(sp.sp_sec), FIXENDIAN32(sp.sp_usec));
+ FIXENDIAN32(sp_sec), FIXENDIAN32(sp_usec));
if (!pcapfile) {
curbus = shmif_busread(bmem,
@@ -235,8 +266,8 @@ main(int argc, char *argv[])
memset(packhdr, 0, sizeof(packhdr));
packhdr.caplen = packhdr.len = curlen;
- packhdr.ts.tv_sec = FIXENDIAN32(sp.sp_sec);
- packhdr.ts.tv_usec = FIXENDIAN32(sp.sp_usec);
+ packhdr.ts.tv_sec = FIXENDIAN32(sp_sec);
+ packhdr.ts.tv_usec = FIXENDIAN32(sp_usec);
assert(curlen = BUFSIZE);
curbus = shmif_busread(bmem, buf, curbus, curlen, wrap);
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Mon Aug 18 14:35:29 UTC 2014
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
quasi-cosmetic nit to previous: limit variable scope
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/shmif_dumpbus/shmif_dumpbus.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/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.15 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.16
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.15 Mon Aug 18 14:33:23 2014
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Mon Aug 18 14:35:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.15 2014/08/18 14:33:23 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.16 2014/08/18 14:35:29 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include rump/rumpuser_port.h
#ifndef lint
-__RCSID($NetBSD: shmif_dumpbus.c,v 1.15 2014/08/18 14:33:23 pooka Exp $);
+__RCSID($NetBSD: shmif_dumpbus.c,v 1.16 2014/08/18 14:35:29 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -217,8 +217,6 @@ main(int argc, char *argv[])
while (curbus = buslast || bonus) {
struct pcap_pkthdr packhdr;
- struct shmif_pkthdr sp;
- struct shmif_pkthdr2 sp2;
uint32_t oldoff;
uint32_t curlen;
uint32_t sp_sec, sp_usec, sp_len;
@@ -230,12 +228,16 @@ main(int argc, char *argv[])
oldoff = curbus;
if (useversion == 3) {
+ struct shmif_pkthdr sp;
+
curbus = shmif_busread(bmem,
sp, oldoff, sizeof(sp), wrap);
sp_len = sp.sp_len;
sp_sec = sp.sp_sec;
sp_usec = sp.sp_usec;
} else {
+ struct shmif_pkthdr2 sp2;
+
curbus = shmif_busread(bmem,
sp2, oldoff, sizeof(sp2), wrap);
sp_len = sp2.sp_len;
CVS commit: src/usr.bin/shmif_dumpbus
Module Name:src
Committed By: pooka
Date: Mon Aug 18 14:40:17 UTC 2014
Modified Files:
src/usr.bin/shmif_dumpbus: shmif_dumpbus.c
Log Message:
Might as well byteswap when we assign to local variables instead of when
we use said variables.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/shmif_dumpbus/shmif_dumpbus.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/shmif_dumpbus/shmif_dumpbus.c
diff -u src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.16 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.17
--- src/usr.bin/shmif_dumpbus/shmif_dumpbus.c:1.16 Mon Aug 18 14:35:29 2014
+++ src/usr.bin/shmif_dumpbus/shmif_dumpbus.c Mon Aug 18 14:40:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: shmif_dumpbus.c,v 1.16 2014/08/18 14:35:29 pooka Exp $ */
+/* $NetBSD: shmif_dumpbus.c,v 1.17 2014/08/18 14:40:17 pooka Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include rump/rumpuser_port.h
#ifndef lint
-__RCSID($NetBSD: shmif_dumpbus.c,v 1.16 2014/08/18 14:35:29 pooka Exp $);
+__RCSID($NetBSD: shmif_dumpbus.c,v 1.17 2014/08/18 14:40:17 pooka Exp $);
#endif /* !lint */
#include sys/types.h
@@ -232,23 +232,23 @@ main(int argc, char *argv[])
curbus = shmif_busread(bmem,
sp, oldoff, sizeof(sp), wrap);
- sp_len = sp.sp_len;
- sp_sec = sp.sp_sec;
- sp_usec = sp.sp_usec;
+ sp_len = FIXENDIAN32(sp.sp_len);
+ sp_sec = FIXENDIAN32(sp.sp_sec);
+ sp_usec = FIXENDIAN32(sp.sp_usec);
} else {
struct shmif_pkthdr2 sp2;
curbus = shmif_busread(bmem,
sp2, oldoff, sizeof(sp2), wrap);
- sp_len = sp2.sp_len;
- sp_sec = sp2.sp_sec;
- sp_usec = sp2.sp_usec;
+ sp_len = FIXENDIAN32(sp2.sp_len);
+ sp_sec = FIXENDIAN32(sp2.sp_sec);
+ sp_usec = FIXENDIAN32(sp2.sp_usec);
}
if (wrap)
bonus = 0;
assert(curbus sb.st_size);
- curlen = FIXENDIAN32(sp_len);
+ curlen = sp_len;
if (curlen == 0) {
continue;
@@ -256,7 +256,7 @@ main(int argc, char *argv[])
fprintf(dumploc, packet %d, offset 0x%04x, length 0x%04x,
ts %d/%06d\n, i++, curbus, curlen,
- FIXENDIAN32(sp_sec), FIXENDIAN32(sp_usec));
+ sp_sec, sp_usec);
if (!pcapfile) {
curbus = shmif_busread(bmem,
@@ -268,8 +268,8 @@ main(int argc, char *argv[])
memset(packhdr, 0, sizeof(packhdr));
packhdr.caplen = packhdr.len = curlen;
- packhdr.ts.tv_sec = FIXENDIAN32(sp_sec);
- packhdr.ts.tv_usec = FIXENDIAN32(sp_usec);
+ packhdr.ts.tv_sec = sp_sec;
+ packhdr.ts.tv_usec = sp_usec;
assert(curlen = BUFSIZE);
curbus = shmif_busread(bmem, buf, curbus, curlen, wrap);
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Mon Aug 18 16:55:34 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.h
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
Restore Intel opregion stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.7 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h:1.7 Thu Jul 24 21:18:40 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h Mon Aug 18 16:55:34 2014
@@ -2720,8 +2720,8 @@ extern void intel_i2c_reset(struct drm_d
/* intel_opregion.c */
struct intel_encoder;
-#ifdef CONFIG_ACPI
extern int intel_opregion_setup(struct drm_device *dev);
+#ifdef CONFIG_ACPI
extern void intel_opregion_init(struct drm_device *dev);
extern void intel_opregion_fini(struct drm_device *dev);
extern void intel_opregion_asle_intr(struct drm_device *dev);
@@ -2730,7 +2730,6 @@ extern int intel_opregion_notify_encoder
extern int intel_opregion_notify_adapter(struct drm_device *dev,
pci_power_t state);
#else
-static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
static inline void intel_opregion_init(struct drm_device *dev) { return; }
static inline void intel_opregion_fini(struct drm_device *dev) { return; }
static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.6
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.5 Sat Jul 26 18:13:44 2014
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Mon Aug 18 16:55:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.i915drmkms,v 1.5 2014/07/26 18:13:44 riastradh Exp $
+# $NetBSD: files.i915drmkms,v 1.6 2014/08/18 16:55:34 riastradh Exp $
define intelfbbus { }
device i915drmkms: drmkms, drmkms_pci, intelfbbus
@@ -60,8 +60,7 @@ file external/bsd/drm2/dist/drm/i915/int
file external/bsd/drm2/dist/drm/i915/intel_i2c.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_lvds.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_modes.c i915drmkms
-# XXX Restore once I figure out what this does...
-#file external/bsd/drm2/dist/drm/i915/intel_opregion.c i915drmkms
+file external/bsd/drm2/dist/drm/i915/intel_opregion.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_overlay.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_panel.c i915drmkms
file external/bsd/drm2/dist/drm/i915/intel_pm.c i915drmkms
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: agc
Date: Mon Aug 18 17:16:19 UTC 2014
Modified Files:
src/sys/dev/dm: dm_target_snapshot.c
Log Message:
Avoid a memory leak - from maxv
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dm/dm_target_snapshot.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/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.16 src/sys/dev/dm/dm_target_snapshot.c:1.17
--- src/sys/dev/dm/dm_target_snapshot.c:1.16 Sat Jun 14 07:39:00 2014
+++ src/sys/dev/dm/dm_target_snapshot.c Mon Aug 18 17:16:19 2014
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_snapshot.c,v 1.16 2014/06/14 07:39:00 hannken Exp $ */
+/*$NetBSD: dm_target_snapshot.c,v 1.17 2014/08/18 17:16:19 agc Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -221,8 +221,7 @@ dm_target_snapshot_init(dm_dev_t * dmv,
if ((dmp_snap = dm_pdev_insert(argv[0])) == NULL)
return ENOENT;
- if ((tsc = kmem_alloc(sizeof(dm_target_snapshot_config_t), KM_NOSLEEP))
- == NULL)
+ if ((tsc = kmem_alloc(sizeof(*tsc), KM_NOSLEEP)) == NULL)
return 1;
tsc-tsc_persistent_dev = 0;
@@ -232,8 +231,10 @@ dm_target_snapshot_init(dm_dev_t * dmv,
tsc-tsc_persistent_dev = 1;
/* Insert cow device to global pdev list */
- if ((dmp_cow = dm_pdev_insert(argv[1])) == NULL)
+ if ((dmp_cow = dm_pdev_insert(argv[1])) == NULL) {
+ kmem_free(tsc, sizeof(*tsc));
return ENOENT;
+ }
}
tsc-tsc_chunk_size = atoi(argv[3]);
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: agc
Date: Mon Aug 18 17:16:42 UTC 2014
Modified Files:
src/sys/dev/dm: dm_target_stripe.c
Log Message:
Avoid a memory leak - from maxv
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/dm/dm_target_stripe.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/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.19 src/sys/dev/dm/dm_target_stripe.c:1.20
--- src/sys/dev/dm/dm_target_stripe.c:1.19 Sat Jun 14 07:39:00 2014
+++ src/sys/dev/dm/dm_target_stripe.c Mon Aug 18 17:16:42 2014
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.19 2014/06/14 07:39:00 hannken Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.20 2014/08/18 17:16:42 agc Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -156,8 +156,11 @@ dm_target_stripe_init(dm_dev_t * dmv, vo
argv[strpi], argv[strpi+1]);
tlc = kmem_alloc(sizeof(*tlc), KM_NOSLEEP);
- if ((tlc-pdev = dm_pdev_insert(argv[strpi])) == NULL)
+ if ((tlc-pdev = dm_pdev_insert(argv[strpi])) == NULL) {
+ kmem_free(tsc, sizeof(*tsc));
+ kmem_free(tlc, sizeof(*tlc));
return ENOENT;
+ }
tlc-offset = atoi(argv[strpi+1]);
/* Insert striping device to linked list. */
@@ -183,8 +186,10 @@ dm_target_stripe_status(void *target_con
if ((params = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
return NULL;
- if ((tmp = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL)
+ if ((tmp = kmem_alloc(DM_MAX_PARAMS_SIZE, KM_SLEEP)) == NULL) {
+ kmem_free(params, DM_MAX_PARAMS_SIZE);
return NULL;
+ }
snprintf(params, DM_MAX_PARAMS_SIZE, %d % PRIu64,
tsc-stripe_num, tsc-stripe_chunksize);
CVS commit: src/sys/sys
Module Name:src
Committed By: matt
Date: Mon Aug 18 22:21:39 UTC 2014
Added Files:
src/sys/sys: common_wchar_limits.h
Log Message:
Add common_wchar_limits.h for those compilers that emit
__W{CHAR,INT}_{MIN,MAX}__
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/sys/common_wchar_limits.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/sys/common_wchar_limits.h
diff -u /dev/null src/sys/sys/common_wchar_limits.h:1.1
--- /dev/null Mon Aug 18 22:21:39 2014
+++ src/sys/sys/common_wchar_limits.h Mon Aug 18 22:21:39 2014
@@ -0,0 +1,57 @@
+/* $NetBSD: common_wchar_limits.h,v 1.1 2014/08/18 22:21:39 matt Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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.
+ */
+
+#ifndef _SYS_COMMON_WCHAR_LIMITS_H_
+#define _SYS_COMMON_WCHAR_LIMITS_H_
+
+/*
+ * 7.18.3 Limits of other integer types
+ */
+
+/* limits of wchar_t */
+
+#if !defined(__WCHAR_MIN__) || !defined(__WCHAR_MAX__)
+#error __WCHAR_MIN__ or __WCHAR_MAX__ not defined
+#endif
+
+#define WCHAR_MIN __WCHAR_MIN__ /* wchar_t */
+#define WCHAR_MAX __WCHAR_MAX__ /* wchar_t */
+
+/* limits of wint_t */
+
+#if !defined(__WINT_MIN__) || !defined(__WINT_MAX__)
+#error __WINT_MIN__ or __WINT_MAX__ not defined
+#endif
+
+#define WINT_MIN __WINT_MIN__ /* wint_t */
+#define WINT_MAX __WINT_MAX__ /* wint_t */
+
+#endif /* !_SYS_COMMON_WCHAR_LIMITS_H_ */
CVS commit: src
Module Name:src Committed By: matt Date: Mon Aug 18 22:33:25 UTC 2014 Modified Files: src/distrib/sets/lists/comp: mi src/sys/sys: Makefile Log Message: Install common_wchar_limits.h and update set list. To generate a diff of this commit: cvs rdiff -u -r1.1906 -r1.1907 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.149 -r1.150 src/sys/sys/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1906 src/distrib/sets/lists/comp/mi:1.1907 --- src/distrib/sets/lists/comp/mi:1.1906 Sun Aug 10 17:07:04 2014 +++ src/distrib/sets/lists/comp/mi Mon Aug 18 22:33:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1906 2014/08/10 17:07:04 spz Exp $ +# $NetBSD: mi,v 1.1907 2014/08/18 22:33:25 matt Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3137,6 +3137,7 @@ ./usr/include/sys/common_int_limits.h comp-c-include ./usr/include/sys/common_int_mwgwtypes.h comp-c-include ./usr/include/sys/common_int_types.h comp-c-include +./usr/include/sys/common_wchar_limits.h comp-c-include ./usr/include/sys/condvar.h comp-c-include ./usr/include/sys/conf.h comp-c-include ./usr/include/sys/core.h comp-c-include Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.149 src/sys/sys/Makefile:1.150 --- src/sys/sys/Makefile:1.149 Fri Jul 25 21:43:13 2014 +++ src/sys/sys/Makefile Mon Aug 18 22:33:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.149 2014/07/25 21:43:13 joerg Exp $ +# $NetBSD: Makefile,v 1.150 2014/08/18 22:33:25 matt Exp $ .include bsd.own.mk @@ -9,7 +9,7 @@ INCS= acct.h agpio.h aio.h ansi.h aout_m callback.h callout.h cdbr.h cdefs.h cdefs_aout.h \ cdefs_elf.h cdio.h chio.h clockctl.h \ common_int_const.h common_int_fmtio.h common_int_limits.h \ - common_int_mwgwtypes.h common_int_types.h \ + common_int_mwgwtypes.h common_int_types.h common_wchar_limits.h \ condvar.h conf.h core.h \ cpufreq.h cpuio.h ctype_bits.h ctype_inline.h \ device.h device_if.h \
