===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.18
retrieving revision 1.22
diff -u -r1.18 -r1.22
--- src/Makefile.cross	2006/06/06 00:01:49	1.18
+++ src/Makefile.cross	2006/12/19 23:17:54	1.22
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.cross,v 1.18 2006/06/06 00:01:49 drahn Exp $
+# $OpenBSD: Makefile.cross,v 1.22 2006/12/19 23:17:54 deraadt 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} == "armish" | ${TARGET} == "cats" || ${TARGET} == "zaurus")
+.if	(${TARGET} == "armish" || ${TARGET} == "cats" || ${TARGET} == "zaurus")
 TARGET_ARCH=	arm
 .elif	(${TARGET} == "hp300" || ${TARGET} == "mac68k" || \
 	 ${TARGET} == "mvme68k")
@@ -15,8 +15,12 @@
 TARGET_ARCH=	m88k
 .elif	(${TARGET} == "sgi")
 TARGET_ARCH=	mips64
+.elif	(${TARGET} == "solbourne")
+TARGET_ARCH=	sparc
 .elif	(${TARGET} == "macppc" || ${TARGET} == "mvmeppc")
 TARGET_ARCH=	powerpc
+.elif	(${TARGET} == "landisk")
+TARGET_ARCH=	sh
 .else
 TARGET_ARCH=	${TARGET}
 .endif
@@ -194,8 +198,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