Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091

tools/host-mkdep/Makefile

@@ -1,27 +1,48 @@
-#	$NetBSD: Makefile,v 1.10 2008/10/19 22:05:23 apb Exp $
+#	$NetBSD: Makefile,v 1.12 2012/12/02 12:44:06 apb Exp $
 
-TIMESTAMP=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
+HOSTPROG= 	host-mkdep
+HOSTPROGNAME=	${_TOOL_PREFIX}host-mkdep
+HOST_BINDIR=	${TOOLDIR}/bin
+
+NOMAN=	# defined
+SRCS=	# empty
 
 CLEANFILES+=	config.cache config.log config.status host-mkdep
 
 .include <bsd.hostprog.mk>
 
-# When host-mkdep is built, TOOL_AWK is not yet available, so we do not
-# pass AWK=${TOOL_AWK:Q} to configure; we allow configure to find awk
-# for itself (or complain if it can't find awk).
+# XXX: The configure script needs to use awk, but we can't pass
+# AWK=${TOOL_AWK:Q} in CONFIGURE_ENV, because TOOL_AWK is not yet
+# available at the time that host-mkdep is built.  The configure script
+# will try to find some other version of awk.
+#
+CONFIGURE_ENV=	CC=${HOST_CC:Q}
 
 realall: host-mkdep
 host-mkdep: configure host-mkdep.in
 	-rm -f $@
-	CC=${HOST_CC:Q} ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
+	${CONFIGURE_ENV} \
+	    ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache
 	chmod +x $@
 
-# This is the only program that comes before binstall.
-install: ${TIMESTAMP}
-${TIMESTAMP}: host-mkdep
-	mkdir -p ${TOOLDIR}/bin
-	cp host-mkdep $@
-	chmod +x $@
+# Use uninstalled copy of the install program
+INSTALL_OBJ!=	cd ${NETBSDSRCDIR}/tools/binstall && ${PRINTOBJDIR}
+INSTALL=	${INSTALL_OBJ}/xinstall
+
+# Install rule, copied from src/tools/Makefile.host.
+# We can't include Makefile.host because there is no HOST_SRCDIR
+# corresponding to host-mkdep.
+#
+realinstall: install.host
+install.host: ${HOST_BINDIR}/${HOSTPROGNAME}
+${HOST_BINDIR}/${HOSTPROGNAME}:: ${HOSTPROG}
+	${_MKTARGET_INSTALL}
+	mkdir -p ${HOST_BINDIR}
+	${HOST_INSTALL_FILE} -m ${BINMODE} ${HOSTPROG}${HOSTEXEEXT} ${.TARGET}
+
+.if ${MKUPDATE} == "no"
+.PHONY:		${HOST_BINDIR}/${HOSTPROGNAME}
+.endif
 
 # Run by hand, then "configure" script committed:
 regen:

tools/host-mkdep/host-mkdep.in

@@ -1,6 +1,6 @@
 #!@BSHELL@ -
 #
-#	$NetBSD: host-mkdep.in,v 1.21 2012/08/26 22:37:19 jmmv Exp $
+#	$NetBSD: host-mkdep.in,v 1.30 2013/09/02 08:37:11 joerg Exp $
 #
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -73,7 +73,7 @@ set_objlist()
 # (don't trust the shell builtin getopts to be in a known state on error)
 while [ $# -gt 0 ]; do
 	option="${1#-}"
-	[ "x$option" = "x$1" -o -z "$option" ] && break
+	[ "x$option" = "x$1" -o -z "$option" ] && break # LSC: Prevents error on Minix
 	while
 		optarg="${option#?}"
 		option="${option%$optarg}"
@@ -84,6 +84,7 @@ while [ $# -gt 0 ]; do
 		-o)	OPTIONAL=true; AWK_OPTIONAL='print ".OPTIONAL:" $0';;
 		-p)	NEWEXT=;;
 		-q)	QUIET=true;;
+		-[iv])	;;
 
 		-[fPs])	# Options with arguments
 			[ -z "$optarg" ] && {
@@ -161,6 +162,11 @@ else
 				shift 2
 				cppargs=${cppargs%xx}
 				;;
+		-std=*)
+				set -- "$@" "$1"
+				shift
+				cppargs=${cppargs%x}
+				;;
 
 		-no-cpp-precomp)	# This is a Darwin-specific option.
 				set -- "$@" "$1"
@@ -177,7 +183,12 @@ else
 				shift
 				cppargs=${cppargs%x}
 				;;
-
+		--sysroot*)
+				shift
+				;;
+		-[iv])
+				shift
+				;;
 		-*)		
 				echo "$0: Unknown option: $1" 1>&2 # all other -options
 				exit 1
@@ -225,7 +236,7 @@ else
 		file=${file%.*}
 		set_objlist $file
 
-		@CPP@ "$@" $f | @AWK@ '
+		( (@CPP@ "$@" $f; echo $? >&3) | @AWK@ '
 			/^#/ {
 				# Be as tolerant as possible.
 				sub(/^#(line)? [ 0-9]*\"?/, "")
@@ -241,7 +252,7 @@ else
 				print "'"$objlist"'" ": " $0
 				'"$AWK_OPTIONAL"'
 			}
-		' >> $TMP
+		' >> $TMP) 3>&1 | (read a; exit $a)
 	done
 fi