===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.60
retrieving revision 1.61
diff -c -r1.60 -r1.61
*** src/Makefile.cross	2013/02/02 13:38:41	1.60
--- src/Makefile.cross	2013/03/10 08:50:42	1.61
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.60 2013/02/02 13:38:41 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
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.61 2013/03/10 08:50:42 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
***************
*** 105,110 ****
--- 105,119 ----
  BINUTILS_VERSION=binutils
  .endif
  
+ .if !empty(PIE_ARCH:M${_arch})
+ NOPIE_FLAGS=-fno-pie
+ NOPIE_LDFLAGS=-nopie
+ PIE_DEFAULT=${DEFAULT_PIE_DEF}
+ .else
+ NOPIE_FLAGS=
+ PIE_DEFAULT=
+ .endif
+ 
  .if !empty(OLD_BINUTILS_ARCH:M${_arch})
  NEW_BINUTILS?=	No
  BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
***************
*** 198,214 ****
  ${CROSSBINUTILS}:	${CROSSINCLUDES}
  	(cd ${.CURDIR}/${BINUTILS_DIR}; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
  	    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} \
  	    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} \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
--- 207,223 ----
  ${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} \