===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** src/Makefile.cross	2013/04/04 10:45:33	1.64
--- src/Makefile.cross	2013/07/05 21:29:51	1.65
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.64 2013/04/04 10:45:33 jasper 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.65 2013/07/05 21:29:51 miod 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
***************
*** 82,89 ****
  
  .include <bsd.own.mk>
  
- OLD_BINUTILS_ARCH=vax
- 
  .for _arch in ${TARGET_ARCH}
  .if !empty(GCC2_ARCH:M${_arch})
  COMPILER_VERSION=gcc2
--- 82,87 ----
***************
*** 108,121 ****
  PIE_DEFAULT=
  .endif
  
- .if !empty(OLD_BINUTILS_ARCH:M${_arch})
- NEW_BINUTILS?=	No
- BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
- .else
- NEW_BINUTILS?=	Yes
  BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
  		strings strip
- .endif
  BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
  .endfor
  
--- 106,113 ----
***************
*** 147,156 ****
  
  ${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
--- 139,148 ----
  
  ${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
***************
*** 201,265 ****
  ${CROSSBINUTILS}:	${CROSSINCLUDES}
  	(cd ${.CURDIR}/${BINUTILS_DIR}; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    COMPILER_VERSION=${COMPILER_VERSION} \
! 	    USING_NEW_BINUTILS=${NEW_BINUTILS} PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper install)
- .if ${NEW_BINUTILS:L} != "yes"
- 	(cd ${.CURDIR}/gnu/usr.bin/gas; \
- 	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
- 	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} NOMAN= install)
- 	ln -sf ${CROSSDIR}/usr/bin/as \
- 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/as
- 	(cd ${.CURDIR}/gnu/usr.bin/ld; \
- 	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} NOPIC= NOMAN= depend all; \
- 	    TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} NOPIC= NOMAN= install)
- 	ln -sf ${CROSSDIR}/usr/bin/ld \
- 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
- 	(cd ${.CURDIR}/usr.bin/ar; \
- 	    ELF_TOOLCHAIN=no \
- 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
- 	    ELF_TOOLCHAIN=no \
- 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} NOMAN= install)
- 	ln -sf ${CROSSDIR}/usr/bin/ar \
- 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar
- 	@(cd ${.CURDIR}/usr.bin/ranlib; \
- 	    ELF_TOOLCHAIN=no \
- 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
- 	    ELF_TOOLCHAIN=no \
- 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} NOMAN= install)
- 	ln -sf ${CROSSDIR}/usr/bin/ranlib \
- 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ranlib
- 	(cd ${.CURDIR}/usr.bin/strip; \
- 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- 	    NOMAN= depend all; \
- 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
- 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET_ARCH} \
- 	    NOMAN= install)
- 	ln -sf ${CROSSDIR}/usr/bin/strip \
- 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/strip
- .endif
  	@for cmd in ${BINUTILS}; do \
  	 if [ -e ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ] ; then \
  	    cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd \
--- 193,212 ----
  ${CROSSBINUTILS}:	${CROSSINCLUDES}
  	(cd ${.CURDIR}/${BINUTILS_DIR}; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    PATH=${CROSSPATH} \
  	    ${MAKE} -f Makefile.bsd-wrapper depend && \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper all && \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    COMPILER_VERSION=${COMPILER_VERSION} \
! 	    PIE_DEFAULT=${PIE_DEFAULT} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
  	    ${MAKE} -f Makefile.bsd-wrapper install)
  	@for cmd in ${BINUTILS}; do \
  	 if [ -e ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ] ; then \
  	    cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd \