NetBSD re-synchronization of the source tree

This brings our tree to NetBSD 7.0, as found on -current on the
10-10-2015.

This updates:
 - LLVM to 3.6.1
 - GCC to GCC 5.1
 - Replace minix/commands/zdump with usr.bin/zdump
 - external/bsd/libelf has moved to /external/bsd/elftoolchain/
 - Import ctwm
 - Drop sprintf from libminc

Change-Id: I149836ac18e9326be9353958bab9b266efb056f0

lib/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.209 2013/11/28 12:08:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.235 2015/09/28 17:12:12 christos Exp $
 #	from: @(#)Makefile	5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -6,17 +6,7 @@
 SUBDIR=		csu .WAIT
 
 .if (${MKGCC} != "no")
-. if ${HAVE_GCC} == 4
-.  if (${USE_COMPILERCRTSTUFF} == "yes")
-SUBDIR+=	../gnu/lib/crtstuff4 .WAIT
-.  endif
-SUBDIR+=	../gnu/lib/libgcc4 .WAIT
-. else
-.  if (${USE_COMPILERCRTSTUFF} == "yes")
-SUBDIR+=	../external/gpl3/gcc/lib/crtstuff .WAIT
-.  endif
-SUBDIR+=	../external/gpl3/gcc/lib/libgcc .WAIT
-. endif
+SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgcc .WAIT
 .endif
 
 .if defined(__MINIX)
@@ -94,12 +84,13 @@ SUBDIR+=	\
 #SUBDIR+=	libkern
 .endif
 
-.if (${MACHINE_CPU} == "arm")
+.if (${MACHINE_CPU} == "arm" || ${MACHINE_CPU} == "aarch64")
 LIBC_MACHINE_ARCH?=${MACHINE_ARCH}
-.if empty(LIBC_MACHINE_ARCH:M*hf*)
+LIBC_MACHINE_CPU?=${MACHINE_CPU}
+.if ${LIBC_MACHINE_CPU} == "arm" && empty(LIBC_MACHINE_ARCH:M*hf*)
 .if !defined(__MINIX)
 SUBDIR+=	libc_vfp
-.endif
+.endif # !defined(__MINIX)
 .endif
 .endif
 .if (${MKRUMP} != "no")
@@ -114,33 +105,44 @@ SUBDIR+=	../external/apache2/mDNSResponder/lib
 .endif
 
 #SUBDIR+=	../external/bsd/am-utils/lib
+SUBDIR+=	../external/bsd/blacklist/lib
 
 SUBDIR+=	../external/bsd/flex/lib
 #SUBDIR+=	../external/bsd/tre/lib
-SUBDIR+=	../external/bsd/libelf/lib
+SUBDIR+=	../external/bsd/elftoolchain/lib/libelf
 #SUBDIR+=	../external/bsd/liblzf/lib
 #SUBDIR+=	../external/bsd/libpcap/lib
 
+.if ${MKSLJIT} != "no"
+SUBDIR+=	../external/bsd/sljit/lib
+SUBDIR+=	libbpfjit
+.endif
+
+.if (${MKZFS} != "no")
+SUBDIR+=        ../external/cddl/osnet/lib/libavl
+SUBDIR+=        ../external/cddl/osnet/lib/libnvpair
+SUBDIR+=        ../external/cddl/osnet/lib/libumem
+SUBDIR+=        ../external/cddl/osnet/lib/libuutil
+.endif
+
 SUBDIR+=	../external/mit/expat/lib
 
 SUBDIR+=	../external/public-domain/sqlite/lib
-SUBDIR+=	../external/public-domain/xz/lib
 
 #SUBDIR+=	../gnu/lib/libmalloc
 
 .if (${MKGCC} != "no")
-. if ${HAVE_GCC} == 4
-#SUBDIR+=	../gnu/lib/libobjc4
-. else
-.   if !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
-SUBDIR+=	../external/gpl3/gcc/lib/libobjc
-SUBDIR+=	../external/gpl3/gcc/lib/libgomp
-.   endif # !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
-. endif
-. if ${HAVE_GCC} >= 45 && !defined(MLIBDIR)
-.   if !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
+. if !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
+SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libobjc
+SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgomp
+#SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libmudflap
+#SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libmudflapth
+. endif # !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
+. if !defined(__MINIX) || ${MKLIBSTDCXX} == "yes"
 # Should probably move GMP, MPFR and MPC builds into the GCC >= 4.5
 # specific build area, but we get better parallelism this way.
+# We don't build compat versions of these.
+. if !defined(MLIBDIR)
 SUBDIR+=	../external/lgpl3/gmp/lib/libgmp
 SUBDIR+=	../external/lgpl3/mpfr/lib/libmpfr
 SUBDIR+=	../external/lgpl3/mpc/lib/libmpc
@@ -155,6 +157,16 @@ SUBDIR+=	../external/lgpl3/mpc/lib/libmpc
 #==================== 1st library dependency barrier ====================
 SUBDIR+=	.WAIT
 
+.if ${MKDTRACE} != "no"
+SUBDIR+=	../external/bsd/librtld_db/lib		# depends on libutil
+.endif
+
+.if ${MKDTRACE} != "no" || ${MKCTF} != "no"
+SUBDIR+=        ../external/cddl/osnet/lib/libctf
+.endif
+
+SUBDIR+=	../external/public-domain/xz/lib	# depends on libpthread
+
 .if (${MKCRYPTO} != "no")
 SUBDIR+=	../crypto/external/bsd/netpgp/libmj
 SUBDIR+=	../crypto/external/bsd/netpgp/lib/verify # depends on libz
@@ -190,7 +202,10 @@ SUBDIR+=	../external/bsd/file/lib	# depends on libz
 SUBDIR+=	../external/bsd/iscsi/lib	# depends on libpthread
 .endif
 
-SUBDIR+=	../external/bsd/libarchive/lib	# depends on libxz
+.if (${MKZFS} != "no")
+SUBDIR+=        ../external/cddl/osnet/lib/libzfs
+SUBDIR+=        ../external/cddl/osnet/lib/libzpool
+.endif
 
 .if (${MKLVM} != "no")
 SUBDIR+=	../external/gpl2/lvm2/lib	# depends on libprop
@@ -205,18 +220,20 @@ SUBDIR+=	../external/bsd/libc++
 .endif
 
 .if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
-. if ${HAVE_GCC} == 4
-SUBDIR+=	../gnu/lib/libstdc++-v3_4	# depends on libm
-SUBDIR+=	../gnu/lib/libsupc++4
-. else
-SUBDIR+=	../external/gpl3/gcc/lib/libstdc++-v3
-SUBDIR+=	../external/gpl3/gcc/lib/libsupc++
-. endif
+SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
+SUBDIR+=	../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libsupc++
 .endif
 
 #==================== 2nd library dependency barrier ====================
 SUBDIR+=	.WAIT
 
+SANITIZER_DIR=../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libasan
+.if exists(${SANITIZER_DIR})
+#SUBDIR+=	${SANITIZER_DIR}
+.endif
+
+SUBDIR+=	../external/bsd/libarchive/lib	# depends on libxz
+
 .if (${MKNPF} != "no")
 SUBDIR+=	npf		# depends on libnpf
 .endif
@@ -247,6 +264,9 @@ SUBDIR+=	../crypto/external/bsd/netpgp/lib  # depends on libcrypto, ...
 .endif
 
 SUBDIR+=	../external/bsd/libevent/lib	# depends on libcrypto
+.if ${MKDTRACE} != "no"
+SUBDIR+=	../external/bsd/libproc/lib	# depends on libstdc++, libctf
+.endif
 SUBDIR+=	../external/bsd/fetch/lib	# depends on libssl
 
 .if (${MKLDAP} != "no")
@@ -258,6 +278,10 @@ SUBDIR+=	.WAIT
 
 #SUBDIR+=	../external/bsd/bind/lib	# depends on heimdal, libcrypto
 
+.if ${MKDTRACE} != "no"
+SUBDIR+=        ../external/cddl/osnet/lib/libdtrace	# depends on libproc
+.endif
+
 .if (${MKRUMP} != "no")
 SUBDIR+=	librumpdev	# depends on librump
 SUBDIR+=	librumpnet	# depends on librump
@@ -272,12 +296,6 @@ SUBDIR+=	libpam		# depends on heimdal
 SUBDIR+=	../crypto/external/bsd/libsaslc	# depends on heimdal, openssl
 .endif
 
-.if ${MKSLJIT} != "no"
-SUBDIR+=	../external/bsd/sljit/lib
-SUBDIR+=	.WAIT
-SUBDIR+=	libbpfjit
-.endif
-
 SUBDIR+=	../external/bsd/mdocml/lib
 
 .if (${MKRUMP} != "no")
@@ -310,5 +328,8 @@ SUBDIR+=	../sys/rump/net/lib
 # Lua bindings come last, they might depend on anything
 SUBDIR+=	lua
 
+# Needed by rump and rescue which are outside the smbfs tree
+#SUBDIR+=	../external/bsd/smbfs/lib
+
 .include <bsd.buildinstall.mk>
 .include <bsd.subdir.mk>