Add core of the infrastructure support for cross-compilation.

- USE_CROSS_COMPILATION activates it, CROSS_DESTDIR specifies root of
  the target filesystem
- derive _CROSS_DESTDIR from CROSS_DESTDIR or MAKEOBJDIR
- buildlink3.mk prefixes the files to symlink with _CROSS_DESTDIR
- compiler/gcc.mk knows about the target prefix (e.g. i386--netbsdelf)
- PKG_DBDIR is prefixed with _CROSS_DESTDIR
- package-install and bin-install are not called with su
- install and strip are redirected to the tool version
- links for the target specific ar, as, ld, nm, objdump, ranlib and
  strip are added
- compiler wrapper detect if linking is requested or not
- special command sinks for CPP and CC/CXX add the cross-compile magic:
  - modify include dirs to get the target /usr/include
  - modify linker dirs and runpath to use target /usr/lib at link time,
    but keep correct rpath entries

Supported-by: Google SoC 2007
Basic tests by he@ on Sparc. Review from jlam@.

4 files changed, 177 insertions, 2 deletions

diff --git a/mk/wrapper/arg-source b/mk/wrapper/arg-source
index bf4ce639fcb..00d840bb304 100644
--- a/mk/wrapper/arg-source
+++ b/mk/wrapper/arg-source
@@ -1,4 +1,4 @@
-# $NetBSD: arg-source,v 1.12 2007/02/23 00:31:29 rillig Exp $
+# $NetBSD: arg-source,v 1.13 2007/08/02 18:19:32 joerg Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -160,6 +160,14 @@ while $test $# -gt 0; do
 		esac
 		;;
 	##############################################################
+	# Remember whether running the linker is desired.
+	##############################################################
+	-c|-S|-E)
+		dont_link=yes
+		append_queue argbuf "$arg"
+		$debug_log $wrapperlog "    (arg-source) push: $arg"
+		;;
+	##############################################################
 	# For everything else, just queue it up.
 	##############################################################
 	*)
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 9e08e9e777f..0bf1bcd5df1 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.70 2007/06/18 07:33:34 rillig Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.71 2007/08/02 18:19:32 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -349,6 +349,12 @@ _WRAP_CACHE_BODY.CXX=	${_WRAP_CACHE_BODY.CC}
 _WRAP_TRANSFORM.CXX=	${_WRAP_TRANSFORM.CC}
 .endif
 
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+_WRAP_CMD_SINK.CC=	${WRAPPER_TMPDIR}/cmd-sink-cross-gcc
+_WRAP_CMD_SINK.CPP=	${WRAPPER_TMPDIR}/cmd-sink-cross-cpp
+_WRAP_CMD_SINK.CXX=	${_WRAP_CMD_SINK.CC}
+.endif
+
 .if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc)
 _WRAP_CMD_SINK.IMAKE=	${WRAPPER_TMPDIR}/cmd-sink-solaris-imake
 _WRAP_CACHE_BODY.IMAKE=	${WRAPPER_TMPDIR}/cache-body-solaris-imake
@@ -512,6 +518,21 @@ ${WRAPPER_TMPDIR}/${w}: ${WRAPPER_SRCDIR}/${w}
 	${RUN} ${CAT} ${.ALLSRC} | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
 .endfor
 
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+_WRAP_CROSS_GCC_FILTER+= ${SED}						\
+	-e "s|@CROSS_DESTDIR@|${_CROSS_DESTDIR:Q}|g"			\
+	-e "s|@PREFIX@|${PREFIX:Q}|g"
+${WRAPPER_TMPDIR}/cmd-sink-cross-gcc: ${WRAPPER_SRCDIR}/cmd-sink-cross-gcc
+	${RUN} ${MKDIR} ${.TARGET:H}
+	${RUN} ${CAT} ${.ALLSRC} | ${_WRAP_CROSS_GCC_FILTER} |		\
+	${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+
+${WRAPPER_TMPDIR}/cmd-sink-cross-cpp: ${WRAPPER_SRCDIR}/cmd-sink-cross-cpp
+	${RUN} ${MKDIR} ${.TARGET:H}
+	${RUN} ${CAT} ${.ALLSRC} | ${_WRAP_CROSS_GCC_FILTER} |		\
+	${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET}
+.endif
+
 .if !target(${_WRAP_GEN_REORDER})
 ${_WRAP_GEN_REORDER}: 							\
 		${_WRAP_SHELL_LIB}					\
diff --git a/mk/wrapper/cmd-sink-cross-cpp b/mk/wrapper/cmd-sink-cross-cpp
new file mode 100644
index 00000000000..62f69cef5e7
--- /dev/null
+++ b/mk/wrapper/cmd-sink-cross-cpp
@@ -0,0 +1,50 @@
+# $NetBSD: cmd-sink-cross-cpp,v 1.1 2007/08/02 18:19:32 joerg Exp $
+#
+# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
+# All rights reserved.
+#
+# This code was developed as part of Google's Summer of Code 2007 program.
+#
+# 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 COPYRIGHT HOLDERS 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
+# COPYRIGHT HOLDERS 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.
+
+# Don't use standard include path.
+arg="-nostdinc"
+$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+. $buildcmd
+
+# Compiler searches for headers in /usr/include, emulate.
+arg="-isystem"
+$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+. $buildcmd
+
+arg="@CROSS_DESTDIR@/usr/include"
+$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+. $buildcmd
+
+while ! queue_is_empty cmdbuf; do
+	pop_queue cmdbuf arg
+	$debug_log $wrapperlog "    (cmd-sink-native-cc) pop:  $arg"
+	. $buildcmd
+done
diff --git a/mk/wrapper/cmd-sink-cross-gcc b/mk/wrapper/cmd-sink-cross-gcc
new file mode 100644
index 00000000000..d9e91aa539c
--- /dev/null
+++ b/mk/wrapper/cmd-sink-cross-gcc
@@ -0,0 +1,96 @@
+# $NetBSD: cmd-sink-cross-gcc,v 1.1 2007/08/02 18:19:33 joerg Exp $
+#
+# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
+# All rights reserved.
+#
+# This code was developed as part of Google's Summer of Code 2007 program.
+#
+# 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 COPYRIGHT HOLDERS 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
+# COPYRIGHT HOLDERS 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.
+
+if [ "${dont_link}" != yes ]; then
+	# Don't use standard search paths
+	arg="-Wl,-nostdlib"
+	$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+	. $buildcmd
+
+	# All normal library locations should be checked for 
+	for libdir in /usr/lib @PREFIX@/lib; do
+		arg="-Wl,-rpath-link,@CROSS_DESTDIR@${libdir}"
+		$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+		. $buildcmd
+	done
+
+	# Compiler searches for libraries in /usr/lib, emulate.
+	arg="-L@CROSS_DESTDIR@/usr/lib"
+	$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+	. $buildcmd
+
+	# crt1.o and friends needs to be found as well.
+	arg="-B@CROSS_DESTDIR@/usr/lib"
+	$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+	. $buildcmd
+fi
+
+# Don't use standard include path.
+arg="-nostdinc"
+$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+. $buildcmd
+
+# Compiler searches for headers in /usr/include, emulate.
+arg="-isystem"
+$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+. $buildcmd
+
+arg="@CROSS_DESTDIR@/usr/include"
+$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+. $buildcmd
+
+while ! queue_is_empty cmdbuf; do
+	pop_queue cmdbuf arg
+	case $arg in
+	-R*|-Wl,-R*|-Wl,-rpath,*|-Wl,--rpath,*)
+		# First, push the option out again.
+		$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+		. $buildcmd
+
+		# Now translate the directory to be relative to the
+		# the target DESTDIR for the linker.
+		case $arg in
+		-R*)			R="-R" ;;
+		-Wl,-R*)		R="-Wl,-R" ;;
+		-Wl,-rpath,*)		R="-Wl,-rpath," ;;
+		-Wl,--rpath,*)		R="-Wl,--rpath," ;;
+		esac
+		dir="${arg#$R}"
+		arg="-Wl,-rpath-link,@CROSS_DESTDIR@${dir}"
+		$debug_log $wrapperlog "    (cmd-sink-native-cc) pop: $arg"
+		. $buildcmd
+		;;
+	*)
+		$debug_log $wrapperlog "    (cmd-sink-native-cc) pop:  $arg"
+		. $buildcmd
+		;;
+	esac
+done