===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.47
retrieving revision 1.66
diff -u -r1.47 -r1.66
--- src/Makefile.cross	2011/09/18 09:02:18	1.47
+++ src/Makefile.cross	2013/07/06 17:52:57	1.66
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.47 2011/09/18 09:02:18 kettenis Exp $
+# $OpenBSD: Makefile.cross,v 1.66 2013/07/06 17:52:57 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
@@ -7,11 +7,9 @@
 # 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} == "mac68k" || \
-	 ${TARGET} == "mvme68k")
+.elif	(${TARGET} == "hp300" || ${TARGET} == "mvme68k")
 TARGET_ARCH=	m68k
 .elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k" || \
 	 ${TARGET} == "mvme88k")
@@ -32,17 +30,27 @@
 .endif
 TARGET_CPU?=	${TARGET_ARCH}
 
+# List of LP64 archs
+# XXX move to bsd.*.mk?
+LP64_ARCH = amd64 alpha hppa64 ia64 mips64 sparc64 vax64
+
+TARGET_IS_LP64 =
+MACHINE_IS_LP64 =
+.for _ in ${LP64_ARCH}
+. if !empty(TARGET_ARCH:M$_)
+    TARGET_IS_LP64 = yes
+. endif
+. if !empty(MACHINE_ARCH:M$_)
+    MACHINE_IS_LP64 = yes
+. endif
+.endfor
+
 #CROSSCPPFLAGS?=	-nostdinc -I${CROSSDIR}/usr/include
 #CROSSLDFLAGS?=	-nostdlib -L${CROSSDIR}/usr/lib -static
 CROSSCFLAGS?=	${CROSSCPPFLAGS} -O2 ${PIPE} ${DEBUG}
 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 \
@@ -72,22 +80,15 @@
 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
+.include <bsd.own.mk>
 
 .for _arch in ${TARGET_ARCH}
 .if !empty(GCC2_ARCH:M${_arch})
-USE_GCC3?=no
-TARGET_USE_GCC3=No
-COMPILER_VERSION?=gcc2
+COMPILER_VERSION=gcc2
 .elif !empty(GCC4_ARCH:M${_arch})
-TARGET_USE_GCC4=Yes
-COMPILER_VERSION?=gcc4
+COMPILER_VERSION=gcc4
 .else
-TARGET_USE_GCC3=Yes
-COMPILER_VERSION?=gcc3
+COMPILER_VERSION=gcc3
 .endif
 
 .if !empty(BINUTILS217_ARCH:M${_arch})
@@ -96,14 +97,17 @@
 BINUTILS_VERSION=binutils
 .endif
 
-.if !empty(OLD_BINUTILS_ARCH:M${_arch})
-NEW_BINUTILS?=	No
-BINUTILS=	ar as ld nm ranlib objcopy objdump strings strip
+.if !empty(PIE_ARCH:M${_arch})
+NOPIE_FLAGS=-fno-pie
+NOPIE_LDFLAGS=-nopie
+PIE_DEFAULT=${DEFAULT_PIE_DEF}
 .else
-NEW_BINUTILS?=	Yes
+NOPIE_FLAGS=
+PIE_DEFAULT=
+.endif
+
 BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
 		strings strip
-.endif
 BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
 .endfor
 
@@ -111,14 +115,14 @@
 #NO_CROSS+=	dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet \
 #		ftp gzsig sasyncd vnconfig
 		
-# need host setup for ydr
-NO_CROSS+=afs
 # explicit cross-compile
 NO_CROSS+=bind
 NO_CROSS+=httpd
 NO_CROSS+=microcode
 NO_CROSS+=groff lynx binutils binutils-2.17 perl texinfo gcc cvs
 NO_CROSS+=nsd
+NO_CROSS+=nginx
+NO_CROSS+=sqlite3
 
 cross-dirs:	${CROSSDIRS}
 cross-obj:	${CROSSOBJ}
@@ -134,6 +138,12 @@
 	    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
 	@-mkdir -p ${CROSSDIR}
 	@echo ${TARGET_ARCH} > ${CROSSDIR}/TARGET_ARCH
 	@echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
@@ -183,65 +193,20 @@
 ${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 \
@@ -335,13 +300,13 @@
 	    --enable-languages="c,c++" --enable-cpp --disable-nls \
 	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
 	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" \
-	    CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \
+	    CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
 	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
 	    DEMANGLER_PROG= DEMANGLE_H= LDFLAGS="${LDSTATIC}" build_infodir=. \
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
 	    ${MAKE} BISON=yacc LANGUAGES="${CROSSLANGS}" LDFLAGS="${LDSTATIC}" \
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \
-	    CFLAGS="${CFLAGS} -I${.CURDIR}/gnu/lib/libiberty/include" \
+	    CFLAGS="${CFLAGS} -DOPENBSD_CROSS -I${.CURDIR}/gnu/lib/libiberty/include" \
 	    LIBIBERTY_INCLUDES=${.CURDIR}/gnu/lib/libiberty/include \
 	    build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install)
 	mv -f ${CROSSDIR}/usr/bin/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp
@@ -372,16 +337,16 @@
 	    for lib in csu libc; do \
 	    (cd $$lib; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-		    ${MAKE} WANTLINT=no depend all ;\
+		    ${MAKE} depend all ;\
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
-		    ${MAKE} WANTLINT=no install); \
+		    ${MAKE} install); \
 	    done; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
-	        ${MAKE} WANTLINT=no depend all ; \
+	        ${MAKE} depend all ; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
 	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
-	        ${MAKE} WANTLINT=no install)
+	        ${MAKE} install)
 
 cross-bin:	${CROSSOBJ}
 	MACHINE=${TARGET} \