===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.67
retrieving revision 1.71
diff -u -r1.67 -r1.71
--- src/Makefile.cross	2013/08/06 19:11:53	1.67
+++ src/Makefile.cross	2014/05/09 20:14:18	1.71
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.67 2013/08/06 19:11:53 miod Exp $
+# $OpenBSD: Makefile.cross,v 1.71 2014/05/09 20:14:18 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
@@ -6,13 +6,10 @@
 
 # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
 # this variable to work.
-.if	(${TARGET} == "armish" || ${TARGET} == "beagle" || \
+.if	(${TARGET} == "armish" || ${TARGET} == "armv7" || \
 	 ${TARGET} == "zaurus")
 TARGET_ARCH=	arm
-.elif	(${TARGET} == "hp300" || ${TARGET} == "mvme68k")
-TARGET_ARCH=	m68k
-.elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k" || \
-	 ${TARGET} == "mvme88k")
+.elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k")
 TARGET_ARCH=	m88k
 .elif	(${TARGET} == "sgi" || ${TARGET} == "octeon")
 TARGET_ARCH=	mips64
@@ -110,8 +107,7 @@
 .endfor
 
 # no libcrypto.... these won't build
-#NO_CROSS+=	dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet \
-#		ftp gzsig sasyncd vnconfig
+#NO_CROSS+=	dc passwd ppp tcpdump telnet ftp gzsig sasyncd vnconfig
 		
 # explicit cross-compile
 NO_CROSS+=bind
@@ -256,19 +252,23 @@
 	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
 .else
 	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
 	    MACHINE=${TARGET} \
 	    PATH=${CROSSPATH} ${MAKE} depend  )
 	(cd ${.CURDIR}/gnu/usr.bin/cc; \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    CROSSDIR=${CROSSDIR} \
 	    MACHINE=${TARGET} \
 	    ${MAKE} all )
 	(cd ${.CURDIR}/gnu/usr.bin/cc; \
-	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
+	    PIE_DEFAULT=${PIE_DEFAULT} \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
 	    MACHINE=${TARGET} \
 	    PATH=${CROSSPATH} ${MAKE} install)