===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.44
retrieving revision 1.51
diff -u -r1.44 -r1.51
--- src/Makefile.cross	2011/07/07 19:27:15	1.44
+++ src/Makefile.cross	2012/04/06 14:55:51	1.51
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.44 2011/07/07 19:27:15 deraadt Exp $
+# $OpenBSD: Makefile.cross,v 1.51 2012/04/06 14:55:51 jsing 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
@@ -32,6 +32,21 @@
 .endif
 TARGET_CPU?=	${TARGET_ARCH}
 
+# List of LP64 archs
+# XXX move to bsd.*.mk?
+LP64_ARCH = amd64 alpha hppa64 ia64 mips64 sparc64 vax64
+
+TARGET_IS_LP64 =
+MACHINE_IS_LP64 =
+.for _ in ${LP64_ARCH}
+. if !empty(TARGET_ARCH:M$_)
+    TARGET_IS_LP64 = yes
+. endif
+. if !empty(MACHINE_ARCH:M$_)
+    MACHINE_IS_LP64 = yes
+. endif
+.endfor
+
 #CROSSCPPFLAGS?=	-nostdinc -I${CROSSDIR}/usr/include
 #CROSSLDFLAGS?=	-nostdlib -L${CROSSDIR}/usr/lib -static
 CROSSCFLAGS?=	${CROSSCPPFLAGS} -O2 ${PIPE} ${DEBUG}
@@ -72,9 +87,8 @@
 CROSSGCC=	${CROSSDIR}/.gcc_done
 #NO_CROSS=	isakmpd keynote ssh
 
-GCC2_ARCH=m68k m88k sparc vax
-GCC4_ARCH=amd64 hppa i386 mips64* powerpc sparc64
-BINUTILS217_ARCH=ia64
+.include <bsd.own.mk>
+
 OLD_BINUTILS_ARCH=m68k m88k vax
 
 .for _arch in ${TARGET_ARCH}
@@ -119,6 +133,7 @@
 NO_CROSS+=microcode
 NO_CROSS+=groff lynx binutils binutils-2.17 perl texinfo gcc cvs
 NO_CROSS+=nsd
+NO_CROSS+=nginx
 
 cross-dirs:	${CROSSDIRS}
 cross-obj:	${CROSSOBJ}
@@ -134,6 +149,12 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET}
 
 ${CROSSDIRS}:
+.if ${TARGET_ARCH} == "arm" &&  ${MACHINE_IS_LP64} == "yes"
+	# this config is allowed
+.elif ${TARGET_IS_LP64} != ${MACHINE_IS_LP64}
+	@echo "host and target have different size longs"
+	@echo "cross compiler generates bad code; aborting"; exit 1
+.endif
 	@-mkdir -p ${CROSSDIR}
 	@echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
 	@echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`