===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.14
retrieving revision 1.25
diff -u -r1.14 -r1.25
--- src/Makefile.cross	2006/04/19 09:28:45	1.14
+++ src/Makefile.cross	2008/05/13 21:15:58	1.25
@@ -1,21 +1,27 @@
-# $OpenBSD: Makefile.cross,v 1.14 2006/04/19 09:28:45 mickey Exp $
+# $OpenBSD: Makefile.cross,v 1.25 2008/05/13 21:15:58 miod Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-etc-root-var
 
 # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
 # this variable to work.
-.if	(${TARGET} == "cats" || ${TARGET} == "zaurus")
+.if	(${TARGET} == "armish" || ${TARGET} == "zaurus")
 TARGET_ARCH=	arm
 .elif	(${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
 	 ${TARGET} == "mvme68k")
 TARGET_ARCH=	m68k
-.elif	(${TARGET} == "luna88k" || ${TARGET} == "mvme88k")
+.elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k" || \
+	 ${TARGET} == "mvme88k")
 TARGET_ARCH=	m88k
 .elif	(${TARGET} == "sgi")
 TARGET_ARCH=	mips64
-.elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc")
+.elif	(${TARGET} == "solbourne")
+TARGET_ARCH=	sparc
+.elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || \
+	 ${TARGET} == "socppc")
 TARGET_ARCH=	powerpc
+.elif	(${TARGET} == "landisk")
+TARGET_ARCH=	sh
 .else
 TARGET_ARCH=	${TARGET}
 .endif
@@ -67,7 +73,9 @@
 
 cross-env:
 	@echo ${CROSSENV} MACHINE=${TARGET} \
-	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
+	    MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET}
 
 ${CROSSDIRS}:
 	@-mkdir -p ${CROSSDIR}
@@ -120,17 +128,19 @@
 .endif
 
 ${CROSSBINUTILS}:	${CROSSINCLUDES}
-.if ${NEW_BINUTILS:L} == "yes"
 	(cd ${.CURDIR}/gnu/usr.bin/binutils; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
 	    TARGET_ARCH=${TARGET_ARCH} \
 	    ${MAKE} -f Makefile.bsd-wrapper depend && \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
 	    TARGET_ARCH=${TARGET_ARCH} \
 	    ${MAKE} -f Makefile.bsd-wrapper all && \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
 	    ${MAKE} -f Makefile.bsd-wrapper install)
-.else
+.if ${NEW_BINUTILS:L} != "yes"
 	(cd ${.CURDIR}/gnu/usr.bin/gas; \
 	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
@@ -149,13 +159,17 @@
 	ln -sf ${CROSSDIR}/usr/bin/ld \
 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
 	(cd ${.CURDIR}/usr.bin/ar; \
+	    ELF_TOOLCHAIN=no \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
+	    ELF_TOOLCHAIN=no \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ar \
 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar
 	(cd ${.CURDIR}/usr.bin/ranlib; \
+	    ELF_TOOLCHAIN=no \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
+	    ELF_TOOLCHAIN=no \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ranlib \
@@ -187,8 +201,7 @@
 	@touch ${CROSSBINUTILS}
 
 # bsd.own.mk can't do it for us
-.if ${TARGET_ARCH} == "alpha" || \
-    ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
+.if ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
     ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"
 TARGET_USE_GCC3=No
 .else