===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.41
retrieving revision 1.46
diff -u -r1.41 -r1.46
--- src/Makefile.cross	2010/10/17 08:44:15	1.41
+++ src/Makefile.cross	2011/08/05 09:28:39	1.46
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.41 2010/10/17 08:44:15 djm Exp $
+# $OpenBSD: Makefile.cross,v 1.46 2011/08/05 09:28:39 kettenis Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -23,8 +23,7 @@
 TARGET_CPU=	mips64
 .elif	(${TARGET} == "solbourne")
 TARGET_ARCH=	sparc
-.elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || \
-	 ${TARGET} == "socppc")
+.elif	(${TARGET} == "macppc" || ${TARGET} == "socppc")
 TARGET_ARCH=	powerpc
 .elif	(${TARGET} == "landisk")
 TARGET_ARCH=	sh
@@ -42,7 +41,7 @@
 # XXX
 BINMODE?=555
 BINOWN?=root
-BINOWN?=bin
+BINGRP?=bin
 
 CROSSDIR=	${DESTDIR}/usr/cross/${TARGET}
 CROSSENV=	AR=${CROSSDIR}/usr/${TARGET_CANON}/bin/ar \
@@ -73,21 +72,41 @@
 CROSSGCC=	${CROSSDIR}/.gcc_done
 #NO_CROSS=	isakmpd keynote ssh
 
-# bsd.own.mk can't do it for us
-.if ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
-    ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"
+GCC2_ARCH=m68k m88k sparc vax
+GCC4_ARCH=amd64 hppa hppa64 i386 mips64* powerpc sparc64
+BINUTILS217_ARCH=ia64 hppa64
+OLD_BINUTILS_ARCH=m68k m88k vax
+
+.for _arch in ${TARGET_ARCH}
+.if !empty(GCC2_ARCH:M${_arch})
+USE_GCC3?=no
 TARGET_USE_GCC3=No
-COMPILER_VERSION=gcc2
-.elif ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "hppa" || \
-    ${TARGET_ARCH} == "i386" || ${TARGET_ARCH:Mmips64*} || \
-    ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
+COMPILER_VERSION?=gcc2
+.elif !empty(GCC4_ARCH:M${_arch})
 TARGET_USE_GCC4=Yes
-COMPILER_VERSION=gcc4
+COMPILER_VERSION?=gcc4
 .else
 TARGET_USE_GCC3=Yes
-COMPILER_VERSION=gcc3
+COMPILER_VERSION?=gcc3
 .endif
 
+.if !empty(BINUTILS217_ARCH:M${_arch})
+BINUTILS_VERSION=binutils-2.17
+.else
+BINUTILS_VERSION=binutils
+.endif
+
+.if !empty(OLD_BINUTILS_ARCH:M${_arch})
+NEW_BINUTILS?=	No
+BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
+.else
+NEW_BINUTILS?=	Yes
+BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
+		strings strip
+.endif
+BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
+.endfor
+
 # no libcrypto.... these won't build
 #NO_CROSS+=	dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet \
 #		ftp gzsig sasyncd vnconfig
@@ -98,7 +117,7 @@
 NO_CROSS+=bind
 NO_CROSS+=httpd
 NO_CROSS+=microcode
-NO_CROSS+=groff lynx binutils perl texinfo gcc cvs
+NO_CROSS+=groff lynx binutils binutils-2.17 perl texinfo gcc cvs
 NO_CROSS+=nsd
 
 cross-dirs:	${CROSSDIRS}
@@ -161,18 +180,8 @@
 	    ${MAKE} DESTDIR=${CROSSDIR} includes)
 	@touch ${CROSSINCLUDES}
 
-.if (${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
-     ${TARGET_ARCH} == "vax")
-BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
-NEW_BINUTILS?=	No
-.else
-BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
-		strings strip
-NEW_BINUTILS?=	Yes
-.endif
-
 ${CROSSBINUTILS}:	${CROSSINCLUDES}
-	(cd ${.CURDIR}/gnu/usr.bin/binutils; \
+	(cd ${.CURDIR}/${BINUTILS_DIR}; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \