=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.71 retrieving revision 1.90 diff -u -r1.71 -r1.90 --- src/Makefile.cross 2014/05/09 20:14:18 1.71 +++ src/Makefile.cross 2017/01/04 17:26:02 1.90 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.71 2014/05/09 20:14:18 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.90 2017/01/04 17:26:02 patrick 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,18 +6,17 @@ # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving # this variable to work. -.if (${TARGET} == "armish" || ${TARGET} == "armv7" || \ - ${TARGET} == "zaurus") +.if (${TARGET} == "arm64") +TARGET_ARCH= aarch64 +.elif (${TARGET} == "armv7") TARGET_ARCH= arm -.elif (${TARGET} == "aviion" || ${TARGET} == "luna88k") +.elif (${TARGET} == "luna88k") TARGET_ARCH= m88k .elif (${TARGET} == "sgi" || ${TARGET} == "octeon") TARGET_ARCH= mips64 .elif (${TARGET} == "loongson") TARGET_ARCH= mips64el TARGET_CPU= mips64 -.elif (${TARGET} == "solbourne") -TARGET_ARCH= sparc .elif (${TARGET} == "macppc" || ${TARGET} == "socppc") TARGET_ARCH= powerpc .elif (${TARGET} == "landisk") @@ -29,7 +28,7 @@ # List of LP64 archs # XXX move to bsd.*.mk? -LP64_ARCH = amd64 alpha hppa64 ia64 mips64 sparc64 vax64 +LP64_ARCH = aarch64 amd64 alpha mips64 sparc64 TARGET_IS_LP64 = MACHINE_IS_LP64 = @@ -80,18 +79,14 @@ .include .for _arch in ${TARGET_ARCH} -.if !empty(GCC3_ARCH:M${_arch}) +.if !empty(CLANG_ARCH:M${_arch}) +COMPILER_VERSION=clang +.elif !empty(GCC3_ARCH:M${_arch}) COMPILER_VERSION=gcc3 .else COMPILER_VERSION=gcc4 .endif -.if !empty(BINUTILS217_ARCH:M${_arch}) -BINUTILS_VERSION=binutils-2.17 -.else -BINUTILS_VERSION=binutils -.endif - .if !empty(PIE_ARCH:M${_arch}) NOPIE_FLAGS=-fno-pie NOPIE_LDFLAGS=-nopie @@ -103,20 +98,18 @@ BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \ strings strip -BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION} +BINUTILS_DIR=gnu/usr.bin/binutils-2.17 .endfor # no libcrypto.... these won't build -#NO_CROSS+= dc passwd ppp tcpdump telnet ftp gzsig sasyncd vnconfig +#NO_CROSS+= dc passwd ppp tcpdump telnet ftp sasyncd vnconfig # 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+=groff binutils binutils-2.17 perl texinfo gcc cvs NO_CROSS+=nsd -NO_CROSS+=nginx -NO_CROSS+=sqlite3 +NO_CROSS+=bind +NO_CROSS+=unbound cross-dirs: ${CROSSDIRS} cross-obj: ${CROSSOBJ} @@ -185,6 +178,7 @@ @touch ${CROSSINCLUDES} ${CROSSBINUTILS}: ${CROSSINCLUDES} +.if ${TARGET_ARCH} != "aarch64" (cd ${.CURDIR}/${BINUTILS_DIR}; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ PIE_DEFAULT=${PIE_DEFAULT} \ @@ -219,11 +213,39 @@ ${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\ fi ;\ done +.endif @touch ${CROSSBINUTILS} ${CROSSGCC}: ${CROSSBINUTILS} -.if ${COMPILER_VERSION:L} == "gcc3" +.if ${COMPILER_VERSION:L} == "clang" + (cd ${.CURDIR}/gnu/usr.bin/clang; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + MACHINE_ARCH=${TARGET_ARCH} \ + ${MAKE} obj) + (cd ${.CURDIR}/gnu/usr.bin/clang; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + MACHINE_ARCH=${TARGET_ARCH} \ + ${MAKE} depend) + (cd ${.CURDIR}/gnu/usr.bin/clang; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + MACHINE_ARCH=${TARGET_ARCH} \ + ${MAKE} all) + (cd ${.CURDIR}/gnu/usr.bin/clang; \ + DESTDIR=${CROSSDIR} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + MACHINE_ARCH=${TARGET_ARCH} \ + ${MAKE} install) + mv ${CROSSDIR}/usr/bin/clang ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang + mv ${CROSSDIR}/usr/bin/clang++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++ + cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang + ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc + ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++ + echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc; \ + chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc; + echo "#!/bin/sh\n${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang --driver-mode=g++ --sysroot ${CROSSDIR} \"$$""@\"" > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++; \ + chmod +x ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++; +.elif ${COMPILER_VERSION:L} == "gcc3" (cd ${.CURDIR}/gnu/usr.bin/gcc; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ @@ -296,8 +318,9 @@ # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later cross-lib: ${CROSSGCC} MACHINE=${TARGET} \ - MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \ - export MACHINE MACHINE_ARCH MACHINE_CPU; \ + MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \ + BSDOBJDIR=${CROSSDIR}/usr/obj; \ + export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \ (cd ${.CURDIR}/lib; \ for lib in csu libc; do \ (cd $$lib; \ @@ -307,10 +330,10 @@ ${MAKE} install); \ done; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \ + SKIPDIR=\"${NO_CROSS}\" \ ${MAKE} depend all ; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \ - SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \ + SKIPDIR=\"${NO_CROSS}\" \ ${MAKE} install) cross-bin: ${CROSSOBJ} @@ -349,6 +372,7 @@ (cd ${.CURDIR}/$$i; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ SKIPDIR=\"${NO_CROSS}\" \ + DESTDIR=${CROSSDIR} \ ${MAKE} depend all install); \ done @@ -360,6 +384,7 @@ (cd ${.CURDIR}/$$i; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ SKIPDIR=\"${NO_CROSS}\" \ + DESTDIR=${CROSSDIR} \ ${MAKE} depend all install); \ done