===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.60
retrieving revision 1.64
diff -u -r1.60 -r1.64
--- src/Makefile.cross	2013/02/02 13:38:41	1.60
+++ src/Makefile.cross	2013/04/04 10:45:33	1.64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.60 2013/02/02 13:38:41 miod Exp $
+# $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
@@ -7,7 +7,6 @@
 # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
 # this variable to work.
 .if	(${TARGET} == "armish" || ${TARGET} == "beagle" || \
-	 ${TARGET} == "gumstix" || ${TARGET} == "palm" || \
 	 ${TARGET} == "zaurus")
 TARGET_ARCH=	arm
 .elif	(${TARGET} == "hp300" || ${TARGET} == "mvme68k")
@@ -52,11 +51,6 @@
 CROSSCXXFLAGS?=	${CROSSCPPFLAGS}
 #LDSTATIC?=	-static
 
-# XXX
-BINMODE?=555
-BINOWN?=root
-BINGRP?=bin
-
 CROSSDIR=	${DESTDIR}/usr/cross/${TARGET}
 CROSSENV=	AR=${CROSSDIR}/usr/${TARGET_CANON}/bin/ar \
 		AS=${CROSSDIR}/usr/${TARGET_CANON}/bin/as \
@@ -105,6 +99,15 @@
 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,17 +201,17 @@
 ${CROSSBINUTILS}:	${CROSSINCLUDES}
 	(cd ${.CURDIR}/${BINUTILS_DIR}; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    USING_NEW_BINUTILS=${NEW_BINUTILS} \
+	    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} \
+	    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} \
+	    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} \