Module Name:    src
Committed By:   tls
Date:           Sun Aug 10 07:03:02 UTC 2014

Modified Files:
        src/doc [tls-earlyentropy]: 3RDPARTY BUILDING.mdoc CHANGES HACKS
            RESPONSIBLE TODO TODO.clang TODO.i18n

Log Message:
Rebase.


To generate a diff of this commit:
cvs rdiff -u -r1.1105 -r1.1105.2.1 src/doc/3RDPARTY
cvs rdiff -u -r1.95 -r1.95.2.1 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.1910 -r1.1910.2.1 src/doc/CHANGES
cvs rdiff -u -r1.147 -r1.147.2.1 src/doc/HACKS
cvs rdiff -u -r1.108 -r1.108.2.1 src/doc/RESPONSIBLE
cvs rdiff -u -r1.17 -r1.17.20.1 src/doc/TODO
cvs rdiff -u -r1.9 -r1.9.2.1 src/doc/TODO.clang
cvs rdiff -u -r1.8 -r1.8.60.1 src/doc/TODO.i18n

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.1105 src/doc/3RDPARTY:1.1105.2.1
--- src/doc/3RDPARTY:1.1105	Sat Apr  5 11:18:03 2014
+++ src/doc/3RDPARTY	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1105 2014/04/05 11:18:03 apb Exp $
+#	$NetBSD: 3RDPARTY,v 1.1105.2.1 2014/08/10 07:03:02 tls Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -41,7 +41,7 @@
 
 Package:	acpica
 Version:	20131218
-Current Vers:	20131218
+Current Vers:	20140627
 Maintainer:	Intel
 Archive Site:	http://www.acpica.org/downloads/
 Home Page:	http://www.acpica.org/
@@ -113,8 +113,8 @@ Notes:
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.10.0b1
-Current Vers:	9.10.0b1
+Version:	9.10.0-P2
+Current Vers:	9.10.0-P2
 Maintainer:	Paul Vixie <vi...@vix.com>
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/software/bind/
@@ -191,6 +191,9 @@ Responsible:
 License:	BSD (2-clause) (see http://www.freebsd.org/cgi/cvsweb.cgi/src/COPYRIGHT)
 Location:	share/misc/bsd-family-tree
 Notes:
+Please send all updates upstream.  Eitan Adler <li...@eitanadler.com>
+is a FreeBSD committer who has been helpful with incorporating changes
+in the past.
 
 Package:	byacc
 Version:	20130304
@@ -286,8 +289,8 @@ distribution into the netbsd format.  Th
 src/lib/libc/db/db2netbsd.
 
 Package:	dhcp
-Version:	4.2.5-P1
-Current Vers:	4.2.5-P1
+Version:	4.3.0
+Current Vers:	4.3.0
 Maintainer:	mellon
 Archive Site:	ftp://ftp.isc.org/isc/dhcp/
 Home Page:	http://www.isc.org/software/dhcp/
@@ -302,8 +305,8 @@ Notes:
 Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	6.3.2
-Current Vers:	6.3.2
+Version:	6.4.3
+Current Vers:	6.4.3
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/
@@ -328,6 +331,18 @@ Notes:
 Use src/gnu/dist/diffutils/diffutils2netbsd for preparing the source tree
 for the import.
 
+Package:	ekermit
+Version:	1.7
+Current Vers:	1.7
+Maintainer:	Kermit Project
+Archive Site:	ftp://ftp.kermitproject.org/kermit/ekermit/
+Home Page:	http://www.kermitproject.org/ek.html
+Mailing List:
+Responsible:	apb
+License:	BSD (3 clause)
+Location:	external/bsd/ekermit
+Notes:
+
 Package:	expat
 Version:	2.1.0
 Current Vers:	2.1.0
@@ -342,8 +357,8 @@ Notes:
 Please use "expat" as the vendor tag for CVS imports.
 
 Package:	file
-Version:	5.16
-Current Vers:	5.18
+Version:	5.19
+Current Vers:	5.19
 Maintainer:	Christos Zoulas <chris...@zoulas.com>
 Archive Site:	ftp://ftp.astron.com/pub/file/
 Home Page:	http://www.darwinsys.com/file/
@@ -368,8 +383,8 @@ Notes:
 There is a flex2netbsd script to help newer imports.
 
 Package:	gcc
-Version:	4.1.3-20080831/4.5.4/4.8.2r206687
-Current Vers:	4.8.2
+Version:	4.1.3-20080831/4.5.4/4.8.3
+Current Vers:	4.8.3
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gcc/
 Home Page:	http://www.gnu.org/software/gcc/
@@ -397,8 +412,8 @@ Before importing a new version of extern
 	- you can use the gcc2netbsd script for the above (except version)
 
 Package:	gdb
-Version:	7.6.1
-Current Vers:	7.7
+Version:	7.7.1
+Current Vers:	7.7.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gdb/
 Home Page:	http://www.gnu.org/software/gdb/
@@ -442,21 +457,9 @@ GNU gettext is used for userland tools l
 we use BSD-licensed implementation from Citrus project (see entry for
 "Citrus XPG4DL").  We hope to replace userland tools with BSD-licensed one.
 
-Package:	gkermit
-Version:	1.00
-Current Vers:	1.00
-Maintainer:	Kermit Project - Columbia University <ker...@columbia.edu>
-Archive Site:	ftp://kermit.columbia.edu/kermit/archives/
-Home Page:	http://www.columbia.edu/kermit/
-Mailing List:
-Responsible:	apb
-License:	GPLv2
-Location:	gnu/dist/gkermit
-Notes:
-
 Package:	grep
 Version:	2.5.1
-Current Vers:	2.17
+Current Vers:	2.19
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/grep/
 Home Page:	http://www.gnu.org/software/grep/
@@ -489,8 +492,8 @@ Use groff2netbsd from src/gnu/dist/groff
 for import.
 
 Package:	heimdal
-Version:	1.5pre1
-Current Vers:	1.5.2
+Version:	1.5.3
+Current Vers:	1.5.3
 Maintainer:	Heimdal <heim...@pdc.kth.se>
 Archive Site:	ftp://ftp.pdc.kth.se/pub/heimdal/src/
 Home Page:	http://www.pdc.kth.se/heimdal/
@@ -772,7 +775,7 @@ Notes:
 Uses libc's ohash, and strtonum
 
 Package:	mDNSResponder
-Version:	212.1
+Version:	320.16
 Current Vers:	541
 Maintainer:	Apple
 Archive Site:	http://www.opensource.apple.com/tarballs/mDNSResponder/
@@ -796,6 +799,21 @@ License:	BSD (2-clause)
 Location:	external/bsd/mdocml/dist
 Notes:
 
+Package:	mesa-demos
+Version:	8.1.0
+Current Vers:	8.2.0
+Maintainer:	mesa-git@?
+Archive Site:	ftp://ftp.freedesktop.org/pub/mesa/demos/
+Home Page:	http://www.mesa3d.org/
+Mailing List:
+Responsible:	riastradh, mrg
+License:	ISC
+Location:	xsrc/external/mit/MesaDemos/dist
+Notes:
+We use only glxinfo and glxgears.  Delete all else on import.
+Vendor tag:	xorg
+Release tag:	mesa-demos-X-Y-Z
+
 Package:	mesa-drm
 Version:	git 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
 Current Vers:
@@ -808,6 +826,20 @@ License:	BSD
 Location:	sys/external/bsd/drm/dist
 Notes:
 
+Package:	MesaLib
+Version:	7.11.2
+Current Vers:	10.2.3
+Maintainer:	mesa-git@?
+Archive Site:	ftp://ftp.freedesktop.org/pub/mesa/
+Home Page:	http://www.mesa3d.org/
+Mailing List:
+Responsible:	riastradh, mrg
+License:	ISC
+Location:	xsrc/external/mit/MesaLib/dist
+Notes:
+Vendor tag:	xorg
+Release tag:	MesaLib-X-Y-Z
+
 Package:	mopd
 Version:	2.5.3
 Current Vers:	2.5.3
@@ -877,8 +909,8 @@ Notes:
 We have lots of local fixes.
 
 Package:	OpenLDAP
-Version:	2.4.23
-Current Vers:	2.4.38
+Version:	2.4.39
+Current Vers:	2.4.39
 Maintainer:	OpenLDAP Foundation
 Archive Site:	http://www.openldap.org/
 Home Page:	http://www.openldap.org/
@@ -968,8 +1000,8 @@ markus is very cooperative about it):
 - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes.
 
 Package:	OpenSSL
-Version:	1.0.1f
-Current Vers:	1.0.1f with AES-NI patch
+Version:	1.0.1h
+Current Vers:	1.0.1h with AES-NI patch
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/
@@ -1070,8 +1102,8 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.10.3
-Current Vers:	2.11.0/2.10.3
+Version:	2.11.1
+Current Vers:	2.11.1
 Maintainer:	Wietse Venema <wie...@porcupine.org>
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/
@@ -1121,8 +1153,8 @@ Notes:
 Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS).
 
 Package:	root.cache
-Version:	2013010300 (Jan 3, 2013)
-Current Vers:	2013010300 (Jan 3, 2013)
+Version:	2014060201 (June 2, 2014)
+Current Vers:	2014060201 (June 2, 2014)
 Maintainer:	InterNIC
 Archive Site:	ftp://ftp.internic.net/domain/named.root
 Home Page:	ftp://ftp.internic.net/domain/named.root
@@ -1229,7 +1261,7 @@ Use src/gnu/dist/texinfo/texinfo2netbsd 
 for the import.
 
 Package:	tmux
-Version:	1.5
+Version:	1.9a
 Current Vers:	1.9a
 Maintainer:	Nicholas Marriott <n...@users.sourceforge.net>
 Archive site:	http://downloads.sourceforge.net/tmux/
@@ -1268,8 +1300,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2013i / tzdata2013i
-Current Vers:	tzcode2013i / tzdata2013i
+Version:	tzcode2014e / tzdata2014f
+Current Vers:	tzcode2014f / tzdata2014f
 Maintainer:	Paul Eggert <egg...@cs.ucla.edu>
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
@@ -1278,16 +1310,18 @@ Home Page:	http://www.iana.org/time-zone
 Mailing List:	t...@iana.org
 Responsible:	kleink, christos, apb
 License:	Public domain
-Location:	lib/libc/time,share/zoneinfo
+Location:	lib/libc/time/zoneinfo, external/public-domain/tz/share
 Notes:
 Don't use src/lib/libc/time/tzcode2netbsd to prepare the source tree for import.
 Diffs are now applied by hand, since we have too many diffs (re-entrant tzcode,
 register removal) to apply. The diffs have been submitted upstream but there
 is too much inertia to apply them. Check for .gitignore files.
+For the data files, do use external/public-domain/tz/tzdata2netbsd. You might
+need to download the NEWS file separately if it's missing.
 
 Package:	wpa_supplicant/hostapd
 Version:	2.0
-Current Vers:	2.0
+Current Vers:	2.2
 Maintainer:	Jouni Malinen <jkmal...@cc.hut.fi>
 Archive Site:	http://hostap.epitest.fi/releases/
 Home Page:	http://hostap.epitest.fi/wpa_supplicant/
@@ -1354,13 +1388,13 @@ Notes:
      implementation.
 
 Package:	pigz
-Version:	2.1.6
+Version:	2.3.1
 Current Vers:	2.3.1
 Maintainer:	Mark Adler <mad...@alumni.caltech.edu>
 Archive Site:	http://zlib.net/pigz/
 Home Page:	http://zlib.net/pigz/
 Mailing List:	http://mail.zlib.net/mailman/listinfo/pigz-announce_zlib.net
-Responsible:	mrg
+Responsible:	mrg, tls
 License:	zlib
 Location:	external/zlib/pigz/dist
 Notes:
@@ -1428,8 +1462,8 @@ Location:	external/cddl/osnet
 Notes:
 
 Package:	sljit
-Version:	svn revision 186
-Current Vers:	svn revision 226
+Version:	0.91 (svn revision 257)
+Current Vers:	svn revision 268
 Maintainer:	Zoltán Herczeg <hzmes...@freemail.hu
 Archive Site:	http://sourceforge.net/projects/sljit/
 Home Page:	http://sljit.sourceforge.net/
@@ -1506,3 +1540,14 @@ Notes:
 		The kernel portion has been removed from the tar file.
 		Our kernel smbfs and netsmb directories could move to
 		external, but this is just make-work.
+
+Package:	timeout
+Version:	FreeBSD-2014-08-01
+Current Vers:	FreeBSD-XXXX-YY-ZZ
+Maintainer:	Baptiste Daroussin <b...@freebsd.org>
+Archive Site:	none
+Home Page:	none
+Mailing List:	none
+Responsible:	christos
+License:	BSD-like (2-clause)
+Location:	usr.bin/timeout

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.95 src/doc/BUILDING.mdoc:1.95.2.1
--- src/doc/BUILDING.mdoc:1.95	Tue Dec 24 20:10:29 2013
+++ src/doc/BUILDING.mdoc	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.95 2013/12/24 20:10:29 uwe Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.95.2.1 2014/08/10 07:03:02 tls Exp $
 .\"
 .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd November 8, 2012
+.Dd August 7, 2014
 .Dt BUILDING 8
 .Os NetBSD
 .
@@ -74,13 +74,13 @@ to override or manually select your comp
 .Ss Source tree layout
 .
 .Bl -tag -width "BUILDING.mdoc"
-.It Sy doc/BUILDING.mdoc
+.It Pa doc/BUILDING.mdoc
 This document (in -mdoc troff format; the original copy).
-.It Sy BUILDING
+.It Pa BUILDING
 This document (in plaintext).
-.It Sy tools/compat/README
+.It Pa tools/compat/README
 Special notes for cross-hosting a NetBSD build on non-NetBSD platforms.
-.It Sy Makefile
+.It Pa Makefile
 The main Makefile for
 .Nx ;
 should only be run for native builds with an appropriately up-to-date
@@ -90,12 +90,12 @@ version of
 (For building from out-of-date systems or on a non-native host, see the
 .Nm build.sh
 shell script.)
-.It Sy UPDATING
+.It Pa UPDATING
 Special notes for updating from an earlier revision of
 .Nx .
 It is important to read this file before every build of an updated
 source tree.
-.It Sy build.sh
+.It Pa build.sh
 Bourne-compatible shell script used for building the host build tools
 and the
 .Nx
@@ -103,7 +103,7 @@ system from scratch.
 Can be used for both native and cross builds, and should be used instead of
 .Xr make 1
 for any source tree that is updated and recompiled regularly.
-.It Sy crypto/dist/ , dist/ , gnu/dist/
+.It Pa crypto/dist/ , dist/ , gnu/dist/
 Sources imported verbatim from third parties, without mangling the
 existing build structure.
 Other source trees in
@@ -115,12 +115,21 @@ use the
 .Xr make 1
 .Dq reachover
 Makefile semantics when building these programs for a native host.
-.It Sy distrib/ , etc/
+.It Pa external , sys/external
+Sources and build infrastructure for components imported (mostly) unchanged
+from upstream maintainers, sorted by applicable license.
+This is (slowly) replacing the
+.Pa crypto/dist ,
+.Pa dist ,
+and
+.Pa gnu/dist
+directories.
+.It Pa distrib/ , etc/
 Sources for items used when making a full release snapshot, such as
 files installed in
 .Sy DESTDIR Ns Pa /etc
 on the destination system, boot media, and release notes.
-.It Sy tests/ , regress/
+.It Pa tests/ , regress/
 Regression test harness.
 Can be cross-compiled, but only run natively.
 .Pa tests/
@@ -130,19 +139,19 @@ test framework;
 .Pa regress/
 contains older tests that have not yet been migrated to
 .Xr atf 7 .
-.It Sy sys/
+.It Pa sys/
 .Nx
 kernel sources.
-.It Sy tools/
+.It Pa tools/
 .Dq Reachover
 build structure for the host build tools.
 This has a special method of determining out-of-date status.
-.It Sy bin/ ... usr.sbin/
+.It Pa bin/ ... usr.sbin/
 Sources to the
 .Nx
 userland (non-kernel) programs.
 If any of these directories are missing, they will be skipped during the build.
-.It Sy x11/
+.It Pa x11/
 .Dq Reachover
 build structure for X11R6; the source is in
 .Sy X11SRCDIR .
@@ -330,11 +339,36 @@ configuration file specified by
 .
 .It Sy BUILDID
 Identifier for the build.
+If set, this should be a short string that is suitable for use as
+part of a file or directory name.
 The identifier will be appended to
 object directory names, and can be consulted in the
 .Xr make 1
 configuration file in order to set additional build parameters,
 such as compiler flags.
+It will also be used as part of the kernel version string,
+which can be printed by
+.Dq Li uname \-v .
+.DFLTu
+.
+.It Sy BUILDINFO
+This may be a multi-line string containing information about the build.
+This will appear in
+.Sy DESTDIR Ns Pa /etc/release ,
+and it will be stored in the
+.Va buildinfo
+variable in any kernels that are built.
+When such kernels are booted, the
+.Xr sysctl 7
+.Va kern.buildinfo
+variable will report this value.
+The string may contain backslash escape sequences, such as
+.Dq "\e\e"
+(representing a backslash character)
+and
+.Dq "\en"
+(representing a newline).
+.DFLTu
 .
 .It Sy BUILDSEED
 GCC uses random numbers when compiling C++ code.
@@ -352,7 +386,7 @@ Directory to contain the built
 system.
 If set, special options are passed to the compilation tools to
 prevent their default use of the host system's
-.Sy /usr/include , /usr/lib ,
+.Pa /usr/include , /usr/lib ,
 and so forth.
 This pathname must be an absolute path, and should
 .Em not
@@ -433,6 +467,11 @@ Indicates whether preformatted plaintext
 during a build.
 .DFLTn
 .
+.It Sy MKCROSSGDB
+.YorN
+Create a cross-gdb as a host tool.
+.DFLTn
+.
 .It Sy MKCRYPTO
 .YorN
 Indicates whether cryptographic code will be included in a build;
@@ -442,6 +481,25 @@ Will not affect use of the standard low-
 .Xr crypt 3 .
 .DFLTy
 .
+.It Sy MKDEBUG
+.YorN
+Indicates whether debug information should be generated for all userland
+binaries compiled.
+The result is collected as an additional
+.Sy debug.tgz
+and
+.Sy xdebug.tgz
+set and installed in
+.Pa /usr/libdata/debug .
+.DFLTn
+.
+.It Sy MKDEBUGLIB
+.YorN
+Indicates whether debug information (see
+.Sy MKDEBUG )
+should also be generated for all libraries build.
+.DFLTn
+.
 .It Sy MKDOC
 .YorN
 Indicates whether system documentation destined for
@@ -477,6 +535,18 @@ most of the compilation tools, will be c
 build.
 .DFLTy
 .
+.It Sy MKKDEBUG
+.YorN
+Force generation of full-debug symbol versions of all kernels compiled.
+Alongside of the
+.Pa netbsd
+kernel file, an unstripped version
+.Pa netbsd.gdb
+is created.
+This is useful if a cross-gdb is built as well (see
+.Sy MKCROSSGDB ) .
+.DFLTn
+.
 .It Sy MKKMOD
 .YorN
 Indicates whether kernel modules are built and installed.
@@ -850,7 +920,7 @@ files.
 When building any full
 .Nx
 source tree, this should be set to the
-.Dq share/mk
+.Dq Pa share/mk
 directory in the source tree.
 This is set automatically when building from the top level, or when using
 .Sy build.sh .
@@ -1402,11 +1472,11 @@ does not contain any
 characters, the configuration file is expected to be found in the
 .Sy KERNCONFDIR
 directory, which is typically
-.Sy sys/arch/MACHINE/conf .
+.Pa sys/arch/MACHINE/conf .
 The new kernel will be built in a subdirectory of
 .Sy KERNOBJDIR ,
 which is typically
-.Sy sys/arch/MACHINE/compile
+.Pa sys/arch/MACHINE/compile
 or an associated object directory.
 .Pp
 This command does
@@ -1425,6 +1495,17 @@ on the kernel in question first unless t
 .Fl u
 option is given.
 .
+.It Sy kernel.gdb Ns = Ns Ar kconf
+Build a new kernel with debug information.
+Similar to the above
+.Sy kernel Ns = Ns Ar kconf
+operation, but creates a
+.Pa netbsd.gdb
+file alongside of the kernel
+.Pa netbsd ,
+which contains a full symbol table and can be used for debugging
+(for example with a cross-gdb built by
+.Sy MKCROSSGDB ) .
 .It Sy modules
 This command will build kernel modules and install them into
 .Sy DESTDIR .
@@ -1473,6 +1554,39 @@ Perform
 Perform
 .Dq make live-image .
 .
+.It Sy list-arch
+Prints a list of valid
+.Sy MACHINE
+and
+.Sy MACHINE_ARCH
+settings, the default
+.Sy MACHINE_ARCH
+for each
+.Sy MACHINE ,
+and aliases for
+.Sy MACHINE Ns No / Ns Sy MACHINE_ARCH
+pairs, and then exits.
+The
+.Fl m
+or
+.Fl a
+options (or both) may be used to specify glob patterns
+that will be used to narrow the list of results;
+for example,
+.Dq Li build.sh -m 'evm*' -a '*arm*' list-arch
+will list all known
+.Sy MACHINE Ns No / Ns Sy MACHINE_ARCH
+values in which either
+.Sy MACHINE
+or
+.Sy ALIAS
+matches the pattern
+.Ql evb* ,
+and
+.Sy MACHINE_ARCH
+matches the pattern
+.Ql *arm* .
+.
 .El
 .
 .Pp
@@ -1487,6 +1601,9 @@ Set the value of
 .Sy MACHINE_ARCH
 to
 .Ar arch .
+See the
+.Fl m
+option for more information.
 .
 .It Fl B Ar buildid
 Set the value of
@@ -1606,42 +1723,39 @@ Set the value of
 .Sy MACHINE
 to
 .Ar mach ,
-except in some special cases listed below.
-This will also override any value of
+unless the
+.Ar mach
+argument is an alias that refers to a
+.Sy MACHINE Ns No / Ns Sy MACHINE_ARCH
+pair, in which case both
+.Sy MACHINE
+and
 .Sy MACHINE_ARCH
-in the process environment with a value deduced from
-.Ar mach ,
-unless
+are set from the alias.
+Such aliases are interpreted entirely by
+.Sy build.sh ;
+they are not used by any other part of the build system.
+The
+.Sy MACHINE_ARCH
+setting implied by
+.Ar mach
+will override any value of
+.Sy MACHINE_ARCH
+in the process environment, but will not override a value set by the
 .Fl a
-is specified.
+option.
 All cross builds require
 .Fl m ,
 but if unset on a NetBSD host, the host's value of MACHINE will be
 detected and used automatically.
 .Pp
-Some machines support multiple values for
-.Sy MACHINE_ARCH .
-The following special cases for the
-.Ar mach
-argument are defined to set the listed values of
-.Sy MACHINE
+See the
+.Cm list-arch
+operation for a way to get a list of valid
+.Sy MACHINE 
 and
-.Sy MACHINE_ARCH :
-.Bl -column "evbmips-el" "MACHINE" "MACHINE_ARCH" -offset indent
-.It Sy mach Ta Sy "MACHINE" Ta Sy "MACHINE_ARCH"
-.It evbarm Ta evbarm Ta (not set)
-.It evbarm-eb Ta evbarm Ta armeb
-.It evbarm-el Ta evbarm Ta arm
-.It evbmips Ta evbmips Ta (not set)
-.It evbmips-eb Ta evbmips Ta mipseb
-.It evbmips-el Ta evbmips Ta mipsel
-.It evbsh3 Ta evbsh3 Ta (not set)
-.It evbsh3-eb Ta evbsh3 Ta sh3eb
-.It evbsh3-el Ta evbsh3 Ta sh3el
-.It sbmips Ta sbmips Ta (not set)
-.It sbmips-eb Ta sbmips Ta mipseb
-.It sbmips-el Ta sbmips Ta mipsel
-.El
+.Sy MACHINE_ARCH
+settings.
 .
 .It Fl N Ar noiselevel
 Set the
@@ -1703,6 +1817,26 @@ Relying on this default is not recommend
 it is determined by complex rules that are influenced
 by the values of several variables and
 by the location of the source directory.
+.Pp
+Note that placing the
+.Ar obj
+directory location outside of the default source tree hierarchy makes
+it easier to manually clear out old files in the event the
+.Dq make cleandir
+operation is unable to do so.
+(See
+.Sx CAVEATS
+below.)
+.Pp
+Note also that use of one of
+.Fl M
+or
+.Fl O
+is the only means of building multiple machine architecture userlands
+from the same source tree without cleaning between builds (in which
+case, one would specify distinct
+.Ar obj
+locations for each).
 .It Fl o
 Set the value of
 .Sy MKOBJDIRS
@@ -1820,7 +1954,7 @@ script to build
 a
 .Sy \*[toolprefix]make-MACHINE
 script will be created in
-.Sy TOOLDIR/bin
+.Sy TOOLDIR Ns Pa /bin
 upon the first build to assist in building subtrees on a cross-compile
 host.
 .Pp
@@ -1830,7 +1964,7 @@ can be invoked in lieu of
 and will instead call the up-to-date version of
 .Dq \*[toolprefix]make
 installed into
-.Sy TOOLDIR/bin
+.Sy TOOLDIR Ns Pa /bin
 with several key variables pre-set, including
 .Sy MACHINE , MACHINE_ARCH ,
 and
@@ -1934,3 +2068,15 @@ as
 and re-worked to
 .Sy TOOLCHAIN_MISSING
 after that.
+.
+.Sh CAVEATS
+.
+After significant updates to third-party components in the source
+tree, the
+.Dq make cleandir
+operation may be insufficient to clean out old files in object
+directories.
+Instead, one may have to manually remove the files.
+Consult the
+.Pa UPDATING
+file for notices concerning this.

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1910 src/doc/CHANGES:1.1910.2.1
--- src/doc/CHANGES:1.1910	Sat Apr  5 02:25:44 2014
+++ src/doc/CHANGES	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1910 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1910.2.1 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -53,6 +53,9 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel: Add support for 256 CPUs on amd64. [rmind 20120420]
 	OpenSSH: Imported 6.0 [christos 20120501]
 	bzip2: Imported 1.0.6 [wiz 20120507]
+	kernel: Add a genfs_rename abstraction to help file systems correctly
+		implement rename, and use it for tmpfs, ffs, and ext2fs.
+		[riastradh 20120508]
 	amiga: Rework X-Surf driver as xsurf(4). Add support for clockport(4)
 		on top of xsurf(4). [rkujawa 20120515]
 	backtrace(3): Add <execinfo.h> and the backtrace family of functions
@@ -98,7 +101,10 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		can be loaded. [jnemeth 20120803]
 	modstat(8): Add -A, -a, and -e options for testing module loadability.
 		[jnemeth 20120803]
+	uatp(4): Add driver for USB Apple trackpads. [riastradh 20120804]
 	libc: Update to tzcode2012e. [christos 20120809]
+	arm: Add support for the Beaglebone (TI AM335x-based board).
+		[matt 20120820]
 	arm: Add support for BEAGLEBOARDXM (TI DM37XX cpus) boards.
 		[matt 20120822]
 	mfi(8): Added tagged queuing support.  [bouyer 20120823]
@@ -170,6 +176,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		ported from FreeBSD. [skrll 20130109]
 	kernel: Add usmsc(4), a driver for SMSC LAN95xx USB LAN devices, 
 		ported from OpenBSD. [skrll 20130109]
+	atactl(8): Add support for ATA SECURITY commands including setting
+		firmware passwords and erasing disks. [riastradh 20130109]
 	hp300: Add support for sti(4) framebuffer at sgc bus on some 425t.
 		Ported by kiyohara@ from OpenBSD. [tsutsui 20130111]
 	arm: kill userland FPA support, replace with VFP. [matt 20130111]
@@ -240,6 +248,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		userspace.  All sets are the same except for etc.tgz.
 		[matt 20130501]
 	disklabel: this is now a MI tool like installboot.  [matt 20130503]
+	vndcompress(1): Add support for restarting after interrupt.
+		[riastradh 20130503]
 	mcp980x(4): Add driver for Microchip MCP9800/1/2/3 I2C temperature
 		sensor. [rkujawa 20130507]
 	zoneinfo: Import tzdata2013c. [apb 20130508]
@@ -277,6 +287,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	xsh(4): Add driver for Individual Computers X-Surf 100 network interface
 		card. [rkujawa 20130808]
 	postfix(1): Import version 2.9.7 [tron 20130821]
+	libc: Add consttime_memequal and explicit_memset for crypto
+		applications. [riastradh 20130828]
 	kernel: Add BPF coprocessor support (BPF_COP/BPF_COPX instructions).
 		[rmind 20130829]
 	npf: Convert NPF to use BPF byte-code by default.  Many other
@@ -289,6 +301,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		PR port-alpha/48148 by nullnilaki. [tsutsui 20130923]
 	postfix(1): Import version 2.10.2 [tron 20130925]
 	binutils: updated to FSF binutils 2.23.2.  [christos 20130929]
+	getaddrinfo(1): Add utility for querying the system's name resolver.
+		[riastradh 20130929]
 	gdb(1): Updated to 7.6.1.  [christos 20131003]
 	httpd(8): Added Lua scripting for content creation. [mbalmer 20131012]
 	lutok: Update to 0.3.  [jmmv 20131018]
@@ -343,6 +357,9 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	postfix(1): Import version 2.10.3 [tron 20140118]
 	igmafb(4): Added framebuffer driver for Intel Graphics
 		[mlelstv 20140121]
+	vndcompress(1): Add support for constant memory, so 32-bit systems
+		should in theory now be able to compress or uncompress
+		multi-terabyte disks. [riastradh 20140122]
 	ohci(4): Support the National Semiconductor PC87560 as found in
 		many hppa machines. [skrll 20140128]
 	ews4800mips: Switch to X11FLAVOUR=Xorg. Untested. [tsutsui 20140131]
@@ -359,6 +376,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	dhcpcd(8): Import dhcpcd-6.3.0 [roy 20140225]
 	mcp48x1dac(4): Add preliminary support for Microchip MCP48x1 family of
 		Digital-to-Analog converters. [rkujawa 20140225]
+	micphy(4): Add Micrel PHY (KSZ9021RN) [ozaki-r 20140226]
 	bind: update to 9.10.0b1 [christos 20130228]
 	dhcpcd(8): Import dhcpcd-6.3.1 [roy 20140301]
 	x68k: Switch to X11FLAVOUR=Xorg, including X68k monolithic server.
@@ -378,7 +396,71 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	mdnsd(8), dns-sd(1), libdns_sd: import mDNSResponder 258.14
 		[pettai 20140324]
 	arm: add support for ARMv6+ MMU features ASIDS, XN, split TTBR.
-	     add support for SMP. [matt 20140330]
+		add support for SMP. [matt 20140330]
+	applesmc(4): Add drivers for the Apple System Management Controller.
+		[riastradh 20140401]
 	ptyfs: Allow multiple mounts and support proper device visibility
-	     in chroots (Ilya Zykov) [christos 20140404]
+		in chroots (Ilya Zykov) [christos 20140404]
 	i386: Switched to GCC 4.8.  [christos 20140404]
+	mcp23s17gpio(4): Add Microchip MCP23S17 16-bit GPIO chip driver.
+		e.g. Raspberry Pi interface boards [kardel 20140406]
+	OpenSSL: Imported 1.0.1g [christos 20140407]
+	sparc64: Switched to TOPDOWN_VM [martin 20140414]
+	hp300: Fix broken apci console support of bootloader. [tsutsui 20140410]
+	hp300: Add sti(4) at sgc screen console support to bootloader.
+		[tsutsui 20140413]
+	hp300: Add HP9000/425e RTC support. [tsutsui 20140419]
+	ubsec(4): Add support for AES-CBC modes and BCM586x chips.
+		[bad 20140419]
+	bcmgpio(4): Add BCM2835 GPIO obio driver.
+		[kardel 20140422]
+	kerberos(8): Update to latest Heimdal-1-5-branch.
+		[pettai 20140424]
+	libc: Update to tzcode2014c. [christos 20140513]
+	zoneinfo: Import tzdata2014c. [apb 20140515]
+	hythygtemp(4): Add HYT-221/271/939 humidity/temperature iic sensor
+		driver.	[kardel 20140518]
+	envsys(4): Add %rH (relative Humidity) to sensor framework. 
+		[kardel 20140518]
+	gcc(1): Import version 4.8.3.  [skrll 20140527]
+	openldap: Import 2.4.39 [tron 20140528]
+	libc: Update to tzcode2014d. [christos 20140528]
+	OpenSSL: Imported 1.0.1h [christos 20140605]
+	vax: Switch to GCC 4.8 [matt 20140605]
+	vmx(4): Add VMware VMXNET3 driver, from OpenBSD [hikaru 20140610]
+	etcupdate(8): Add destdir support.  [apb 20140612]
+	file(1): upgraded to 5.19 [christos 20140612]
+	zoneinfo: Import tzdata2014e. [apb 20140613]
+	libc: Update to tzcode2014e. [christos 20140614]
+	dhcpcd(8): Import dhcpcd-6.4.0 [roy 20140614]
+	pigz(1): Update to pigz-2.3.1 [tls 20140615]
+	gdb(1): Updated to 7.7.1.  [christos 20140622]
+	/usr/share/doc: Install formatted docs instead of nroff sources,
+		and reorganize. [dholland 20140705]
+	postfix(1): Import version 2.11.1 [tron 20140706]
+	bind: Import version 9.10.0-P2 [spz 20140708]
+	dhcp: Import version 4.3.0 [spz 20140712]
+	dhcpcd(8): Import dhcpcd-6.4.2 [roy 20140714]
+	wskbd(4): Added belgian keyboard layouts (KB_BE) to pckbd(4) and
+		ukbd(4). [mbalmer 20140714]
+	tiotg(4): added a driver for the Texas Instruments AM335x SoC's
+		USB OTG controller. [bouyer 20140716]
+	tifb(4): added an experimental driver for the Texas Instruments AM335x
+		SoC's graphic controller. [bouyer 20140716]
+	lua: Updated to 5.3 work3 [lneto 20140719]
+	urtwn(4): Add support for Realtek RTL8188EUS and RTL8188ETV chipsets.
+		Ported from FreeBSD. [nonaka 20140720]
+	wm(4): Add internal SERDES support older than 82575.
+		[msaitoh 20140722]
+	tmux(1): Import of tmux 1.9a.  [christos 20140724]
+	kernel: Added fdiscard and posix_fallocate system calls.
+		[dholland 20140725]
+	arm: Add support for the Kobo touch (i.MX50). [hkenken 20140725]
+	dhcpcd(8): Import dhcpcd-6.4.3 [roy 20140730]
+	timeout(1): Import from FreeBSD [christos 20140801]
+	build: New BUILDINFO variable may be passed to build.sh, and exposed
+		in /etc/release, as well as in sysctl kern.buildinfo.
+		[apb 20140803]
+	zoneinfo: Import tzdata2014f. [apb 20140806]
+	ekermit(1): Add BSD-licenced ekermit, and remove GPL-licenced
+		gkermit. [apb 20140808]

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.147 src/doc/HACKS:1.147.2.1
--- src/doc/HACKS:1.147	Sat Apr  5 17:06:44 2014
+++ src/doc/HACKS	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.147 2014/04/05 17:06:44 tron Exp $
+# $NetBSD: HACKS,v 1.147.2.1 2014/08/10 07:03:02 tls Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -815,6 +815,18 @@ port	i386
 		the i387 FPU without rounding the intermediate results
 	kcah
 
+port	x86
+	hack	turn off optimization for biosdisk_ll.c because otherwise
+		we are pass the wrong arguments to biosdisk_read(). 
+		$ cd /usr/src/sys/arch/i386/floppies/bootflopp-com
+		$ qemu-system-i386 -nographic -fda boot-com1.fs -boot a
+	who	christos
+	file	src/sys/arch/i386/stand/lib/Makefile : 1.38
+	descr
+		Turning on DISK_DEBUG shows the problem. We should find
+		out which option is causing this.
+	hcah
+
 port	powerpc
 
 	hack	avoid using __builtin_return_address(0) because it fails in
@@ -949,3 +961,24 @@ port	hp700
 	descr
 		workaround for unanalysed codegen bug affecting md5c.c.
 	kcah
+
+port	mips64*
+hack	compiler crashes on mips64* with optimization enabled
+cdate	Tue May 13 18:46:48 UTC 2014
+who	macallan
+file	src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/Makefile.inc: 1.6
+	src/external/lgpl3/gmp/lib/libgmp/arch/mips64eb/config.h: 1.5
+	src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/Makefile.inc: 1.6
+	src/external/lgpl3/gmp/lib/libgmp/arch/mips64el/config.h: 1.5
+descr	workaround for n32 gcc doing unaligned 64bit accesses when optimizing
+pr	48696
+kcah
+
+port	vax
+hack	compile boot with -O1
+cdate	Sat May 24 09:40:58 CEST 2014
+who	martin
+file	src/sys/arch/vax/boot/boot/Makefile: 1.41
+descr	/boot does not work when compiled with -O2 and gcc 4.8
+kcah
+

Index: src/doc/RESPONSIBLE
diff -u src/doc/RESPONSIBLE:1.108 src/doc/RESPONSIBLE:1.108.2.1
--- src/doc/RESPONSIBLE:1.108	Mon Mar 31 11:25:48 2014
+++ src/doc/RESPONSIBLE	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: RESPONSIBLE,v 1.108 2014/03/31 11:25:48 martin Exp $
+#	$NetBSD: RESPONSIBLE,v 1.108.2.1 2014/08/10 07:03:02 tls Exp $
 
 List of sections of the system, and who is responsible for them (or at
 least considered an expert on them).
@@ -34,7 +34,7 @@ installboot(mi)	core
 kerberos	lha*, joda*
 less/more	mrg
 lint		christos
-lua/luac	mbalmer
+lua/luac	mbalmer, lneto
 make		christos, sjg, dholland
 named(bind)	christos
 ntp		simonb, jonathan*

Index: src/doc/TODO
diff -u src/doc/TODO:1.17 src/doc/TODO:1.17.20.1
--- src/doc/TODO:1.17	Tue Aug  9 16:14:41 2011
+++ src/doc/TODO	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TODO,v 1.17 2011/08/09 16:14:41 jruoho Exp $
+#	$NetBSD: TODO,v 1.17.20.1 2014/08/10 07:03:02 tls Exp $
 
 THINGS TO BE DONE:
 
@@ -40,9 +40,6 @@ User programs:
     add detachment to window(1)
     clean up gas config files, set up common defines
 
-Pie-in-the-Sky:
-    someone should actually test all the netiso stuff.
-
 Documentation:
     modify sys docs to reflect NetBSD/arch-specific stuff
     clean up src/share/man/{man0,tools} so that we can generate a printable

Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.9 src/doc/TODO.clang:1.9.2.1
--- src/doc/TODO.clang:1.9	Sat Feb 15 08:25:01 2014
+++ src/doc/TODO.clang	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-$NetBSD: TODO.clang,v 1.9 2014/02/15 08:25:01 wiz Exp $
+$NetBSD: TODO.clang,v 1.9.2.1 2014/08/10 07:03:02 tls Exp $
 
 Hacks for the clang integration
 -------------------------------
@@ -6,6 +6,8 @@ Hacks for the clang integration
 "-no-integrated-as" is used in src/sys/arch/i386/stand to compensate
 for the incomplete explicit positioning support in LLVM MC.
 
-Missing atomic support in ARM libgcc, -march=armv6 "workaround":
-    src/external/bsd/libc++/lib
-    src/external/bsd/lllvm/lib/libLLVMSupport
+Workaround for .fpu handling in src/sys/lib/libunwind for ARM by forcing
+GNU as.
+
+src/external/gpl3/gcc/usr.bin/backend forces tree.c to be compiled with -O0.
+g++ otherwise on trivial input.

Index: src/doc/TODO.i18n
diff -u src/doc/TODO.i18n:1.8 src/doc/TODO.i18n:1.8.60.1
--- src/doc/TODO.i18n:1.8	Fri Oct 13 17:28:09 2006
+++ src/doc/TODO.i18n	Sun Aug 10 07:03:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: TODO.i18n,v 1.8 2006/10/13 17:28:09 tnozaki Exp $
+# $NetBSD: TODO.i18n,v 1.8.60.1 2014/08/10 07:03:02 tls Exp $
 
 NetBSD I18N support status / TODO
 
@@ -20,7 +20,7 @@ nl_langinfo    sm
 locale.h
              status     spec            remarks
 localeconv     sm
-setlocale      im                       LC_CTYPE / LC_MESSAGES only.
+setlocale      im                       Except LC_COLLATE.
 
 
 nl_types.h
@@ -133,13 +133,8 @@ locale         sm       SUSv3
 
 misc TODO:
 
-printf family                           support %$.
 LC_COLLATE                              should be supported.
-LC_MONETARY                             should be supported.
-LC_NUMERIC                              should be supported.
-LC_TIME                                 should be supported.
 message catalog                         make consistent with LC_CTYPE names.
-curses                                  support multibyte char.
 regexp                                  support multibyte char.
 regress                                 enrich test items.
 this list                               add forgotten items.

Reply via email to