===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.3
retrieving revision 1.12
diff -u -r1.3 -r1.12
--- src/Makefile.cross	2005/01/12 00:06:28	1.3
+++ src/Makefile.cross	2005/09/18 20:42:49	1.12
@@ -1,8 +1,25 @@
-# $OpenBSD: Makefile.cross,v 1.3 2005/01/12 00:06:28 espie Exp $
+# $OpenBSD: Makefile.cross,v 1.12 2005/09/18 20:42:49 drahn 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")
+TARGET_ARCH=	arm
+.elif	(${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
+	 ${TARGET} == "mvme68k")
+TARGET_ARCH=	m68k
+.elif	(${TARGET} == "luna88k" || ${TARGET} == "mvme88k")
+TARGET_ARCH=	m88k
+.elif	(${TARGET} == "sgi")
+TARGET_ARCH=	mips64
+.elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc")
+TARGET_ARCH=	powerpc
+.else
+TARGET_ARCH=	${TARGET}
+.endif
+
 CROSSCPPFLAGS?=	-nostdinc -I${CROSSDIR}/usr/include
 CROSSLDFLAGS?=	-nostdlib -L${CROSSDIR}/usr/lib -static
 CROSSCFLAGS?=	${CROSSCPPFLAGS}
@@ -13,12 +30,12 @@
 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} \" \
+		HOSTLDFLAGS=\"${LDFLAGS}\" \
 		CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \
 		CXXFLAGS=\"${CROSSCXXFLAGS}\" \
 		LDFLAGS=\"${CROSSLDFLAGS}\"
@@ -26,7 +43,6 @@
 CROSSLANGS?=	c c++
 
 TARGET_CANON=`cat ${CROSSDIR}/TARGET_CANON`
-TARGET_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
 
 CROSSDIRS=	${CROSSDIR}/.dirs_done
 CROSSOBJ=	${CROSSDIR}/usr/obj/.obj_done
@@ -37,8 +53,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
@@ -56,20 +71,7 @@
 
 ${CROSSDIRS}:
 	@-mkdir -p ${CROSSDIR}
-	@case ${TARGET} in \
-		alpha|amd64|hppa|hppa64|i386|m68k|m88k|powerpc|sparc|sparc64|vax) \
-			echo ${TARGET} ;;\
-		amiga|hp300|mac68k|mvme68k) \
-			echo m68k ;;\
-		luna88k|mvme88k) \
-			echo m88k ;;\
-		macppc|mvmeppc) \
-			echo powerpc ;;\
-		sgi) \
-			echo mips64 ;;\
-		*) \
-			(echo Unknown arch ${TARGET} >&2) ; exit 1;; \
-	esac > ${CROSSDIR}/TARGET_ARCH
+	@echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
 	@echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
 	@eval `grep '^osr=' sys/conf/newvers.sh`; \
 	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
@@ -99,14 +101,16 @@
 	@(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}
 
-.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m88k" || \
-    ${MACHINE_ARCH} == "vax"
+.if (${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
+     ${TARGET_ARCH} == "vax")
 BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
 NEW_BINUTILS?=	No
 .else
@@ -134,7 +138,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,13 +187,12 @@
 	@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"
-TARGET_USE_GCC3=Yes
-.else
+.if ${TARGET_ARCH} == "alpha" || \
+    ${TARGET_ARCH} == "m68k" || ${TARGET_ARCH} == "m88k" || \
+    ${TARGET_ARCH} == "sparc" || ${TARGET_ARCH} == "vax"
 TARGET_USE_GCC3=No
+.else
+TARGET_USE_GCC3=Yes
 .endif
 
 ${CROSSGCC}:		${CROSSBINUTILS}
@@ -230,6 +233,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
@@ -262,6 +266,7 @@
 
 cross-etc-root-var:	${CROSSOBJ}
 	(cd ${.CURDIR}/etc && \
+	    MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH} \
 	    DESTDIR=${CROSSDIR} ${MAKE} distribution-etc-root-var)
 
 cross-depend:
@@ -284,4 +289,3 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    SKIPDIR="${NO_CROSS}" \
 	    ${MAKE} cleandir)
-