=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.45 retrieving revision 1.61 diff -u -r1.45 -r1.61 --- src/Makefile.cross 2011/07/27 14:47:17 1.45 +++ src/Makefile.cross 2013/03/10 08:50:42 1.61 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.45 2011/07/27 14:47:17 kettenis Exp $ +# $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 @@ -10,8 +10,7 @@ ${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,6 +31,21 @@ .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} @@ -72,22 +86,17 @@ CROSSGCC= ${CROSSDIR}/.gcc_done #NO_CROSS= isakmpd keynote ssh -GCC2_ARCH=m68k m88k sparc vax -GCC4_ARCH=amd64 hppa i386 mips64* powerpc sparc64 -BINUTILS217_ARCH=ia64 hppa64 -OLD_BINUTILS_ARCH=m68k m88k vax +.include +OLD_BINUTILS_ARCH=vax + .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,6 +105,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 @@ -111,14 +129,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 +152,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,17 +207,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} \ @@ -335,13 +359,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 +396,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} \