===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.2
retrieving revision 1.10
diff -u -r1.2 -r1.10
--- src/Makefile.cross	2005/01/10 17:47:15	1.2
+++ src/Makefile.cross	2005/09/11 23:08:30	1.10
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.2 2005/01/10 17:47:15 espie Exp $
+# $OpenBSD: Makefile.cross,v 1.10 2005/09/11 23:08:30 miod Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-etc-root-var
@@ -13,9 +13,9 @@
 CROSSENV=	AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
 		CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \
 		CXX=${CROSSDIR}/usr/bin/c++ \
-		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
+		LD=${CROSSDIR}/usr/bin/ld \
 		LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
-		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
+		STRIP=${CROSSDIR}/usr/bin/strip \
 		HOSTCC=\"${CC}\" HOSTCXX=\"${CXX}\" NOMAN= DESTDIR=${CROSSDIR} \
 		HOSTCFLAGS=\"${CFLAGS}\" HOSTCXXFLAGS=\"${CXXFLAGS}\" \
 		HOSTLDFLAGS=\"${LDFLAGS} \" \
@@ -37,8 +37,7 @@
 		photurisd keynote sectok ssh
 
 # no libcrypto.... these won't build
-NO_CROSS+=	telnetd login_krb5 login_krb5-or-pwd dc passwd telnet ppp \
-		tcpdump
+NO_CROSS+=	dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet
 # need host setup for ydr
 NO_CROSS+=afs
 # explicit cross-compile
@@ -67,6 +66,8 @@
 			echo powerpc ;;\
 		sgi) \
 			echo mips64 ;;\
+		cats|zaurus) \
+			echo arm ;;\
 		*) \
 			(echo Unknown arch ${TARGET} >&2) ; exit 1;; \
 	esac > ${CROSSDIR}/TARGET_ARCH
@@ -99,9 +100,11 @@
 	@(cd ${.CURDIR}/include && \
 	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    TARGET_ARCH=${TARGET_ARCH} \
 	    ${MAKE} prereq && \
 	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    TARGET_ARCH=${TARGET_ARCH} \
 	    ${MAKE} DESTDIR=${CROSSDIR} includes)
 	@touch ${CROSSINCLUDES}
 
@@ -134,7 +137,7 @@
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/as \
-	    ${CROSSDIR}/usr/${TARGET_ARCH}/bin/as
+	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/as
 	(cd ${.CURDIR}/gnu/usr.bin/ld; \
 	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
@@ -183,17 +186,16 @@
 	@touch ${CROSSBINUTILS}
 
 # bsd.own.mk can't do it for us
-.if ${TARGET} == "amd64" || ${TARGET} == "cats" || \
-    ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \
-    ${TARGET} == "i386" || \
-    ${TARGET} == "sparc64" || ${TARGET} == "sgi"
-USE_GCC3=yes
+.if ${MACHINE_ARCH} == "alpha" || \
+    ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
+    ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "vax"
+TARGET_USE_GCC3=No
 .else
-USE_GCC3=no
+TARGET_USE_GCC3=Yes
 .endif
 
 ${CROSSGCC}:		${CROSSBINUTILS}
-.if ${USE_GCC3:L} == "yes"
+.if ${TARGET_USE_GCC3:L} == "yes"
 	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} CROSSDIR=${CROSSDIR} \
@@ -230,6 +232,7 @@
 	    ${CROSSDIR}/usr/libexec/cpp
 	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
+	    -e 's/@dollaropt@/-$$/' \
 	    ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp
 	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
 	chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp
@@ -284,4 +287,3 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    SKIPDIR="${NO_CROSS}" \
 	    ${MAKE} cleandir)
-