===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/Makefile.cross	2011/09/23 08:09:20	1.48
--- src/Makefile.cross	2011/11/11 12:26:54	1.49
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.48 2011/09/23 08:09:20 guenther 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
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.49 2011/11/11 12:26:54 drahn 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
***************
*** 87,94 ****
  CROSSGCC=	${CROSSDIR}/.gcc_done
  #NO_CROSS=	isakmpd keynote ssh
  
! GCC2_ARCH=m68k m88k sparc vax
! GCC4_ARCH=amd64 hppa hppa64 i386 ia64 mips64* powerpc sparc64
  BINUTILS217_ARCH=hppa64 ia64
  OLD_BINUTILS_ARCH=m68k m88k vax
  
--- 87,94 ----
  CROSSGCC=	${CROSSDIR}/.gcc_done
  #NO_CROSS=	isakmpd keynote ssh
  
! .include <bsd.own.mk>
! 
  BINUTILS217_ARCH=hppa64 ia64
  OLD_BINUTILS_ARCH=m68k m88k vax
  
***************
*** 149,155 ****
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET}
  
  ${CROSSDIRS}:
! .if ${TARGET_IS_LP64} != ${MACHINE_IS_LP64}
  	@echo "host and target have different size longs"
  	@echo "cross compiler generates bad code; aborting"; exit 1
  .endif
--- 149,157 ----
  	    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