=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.66 retrieving revision 1.97 diff -u -r1.66 -r1.97 --- src/Makefile.cross 2013/07/06 17:52:57 1.66 +++ src/Makefile.cross 2017/09/12 08:16:13 1.97 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.66 2013/07/06 17:52:57 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.97 2017/09/12 08:16:13 mpi 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,21 +6,17 @@ # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving # this variable to work. -.if (${TARGET} == "armish" || ${TARGET} == "beagle" || \ - ${TARGET} == "zaurus") +.if (${TARGET} == "arm64") +TARGET_ARCH= aarch64 +.elif (${TARGET} == "armv7") TARGET_ARCH= arm -.elif (${TARGET} == "hp300" || ${TARGET} == "mvme68k") -TARGET_ARCH= m68k -.elif (${TARGET} == "aviion" || ${TARGET} == "luna88k" || \ - ${TARGET} == "mvme88k") +.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") @@ -32,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 = @@ -66,7 +62,8 @@ HOSTLDFLAGS=\"${LDFLAGS}\" \ CFLAGS=\"${CROSSCFLAGS}\" CPPFLAGS=\"${CROSSCPPFLAGS}\" \ CXXFLAGS=\"${CROSSCXXFLAGS}\" \ - LDFLAGS=\"${CROSSLDFLAGS}\" + LDFLAGS=\"${CROSSLDFLAGS}\" \ + CROSSDIR=\"${CROSSDIR}\" CROSSADDPATH=:${CROSSDIR}/usr/${TARGET_CANON}/bin CROSSPATH= /usr/bin:/bin:/usr/sbin:/sbin${CROSSADDPATH} CROSSLANGS?= c c++ @@ -83,18 +80,19 @@ .include .for _arch in ${TARGET_ARCH} -.if !empty(GCC2_ARCH:M${_arch}) -COMPILER_VERSION=gcc2 -.elif !empty(GCC4_ARCH:M${_arch}) -COMPILER_VERSION=gcc4 -.else +.if !empty(CLANG_ARCH:M${_arch}) +COMPILER_VERSION=clang +BUILD_CLANG=yes +CC=clang +CXX=clang++ +.elif !empty(GCC3_ARCH:M${_arch}) COMPILER_VERSION=gcc3 -.endif - -.if !empty(BINUTILS217_ARCH:M${_arch}) -BINUTILS_VERSION=binutils-2.17 +CC=gcc +CXX=g++ .else -BINUTILS_VERSION=binutils +COMPILER_VERSION=gcc4 +CC=gcc +CXX=g++ .endif .if !empty(PIE_ARCH:M${_arch}) @@ -108,21 +106,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 login_krb5 login_krb5-or-pwd 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} @@ -164,6 +159,8 @@ ${CROSSOBJ}: ${CROSSDIRS} @-mkdir -p ${CROSSDIR}/usr/obj + @-chgrp ${WOBJGROUP} ${CROSSDIR}/usr/obj + @-chmod g+w ${CROSSDIR}/usr/obj @(cd ${.CURDIR} && \ BSDOBJDIR=${CROSSDIR}/usr/obj \ COMPILER_VERSION=${COMPILER_VERSION} \ @@ -192,19 +189,22 @@ ${CROSSBINUTILS}: ${CROSSINCLUDES} (cd ${.CURDIR}/${BINUTILS_DIR}; \ + env CROSSDIR=${CROSSDIR} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ PIE_DEFAULT=${PIE_DEFAULT} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ PATH=${CROSSPATH} \ ${MAKE} -f Makefile.bsd-wrapper depend && \ + env CROSSDIR=${CROSSDIR} \ + CC=${CC} CXX=${CXX} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ PIE_DEFAULT=${PIE_DEFAULT} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ ${MAKE} -f Makefile.bsd-wrapper all && \ - DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \ COMPILER_VERSION=${COMPILER_VERSION} \ - PIE_DEFAULT=${PIE_DEFAULT} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + PIE_DEFAULT=${PIE_DEFAULT} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ ${MAKE} -f Makefile.bsd-wrapper install) @for cmd in ${BINUTILS}; do \ @@ -229,42 +229,33 @@ ${CROSSGCC}: ${CROSSBINUTILS} -.if ${COMPILER_VERSION:L} == "gcc4" - (cd ${.CURDIR}/gnu/usr.bin/cc; \ +.if ${COMPILER_VERSION:L} == "clang" + (cd ${.CURDIR}/gnu/usr.bin/clang; \ 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; \ + MACHINE_ARCH=${TARGET_ARCH} \ + ${MAKE} obj) + (cd ${.CURDIR}/gnu/usr.bin/clang; \ + CC=${CC} CXX=${CXX} \ 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} \ - TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ - MACHINE=${TARGET} \ - PATH=${CROSSPATH} ${MAKE} install) - cp -f ${CROSSDIR}/usr/bin/g++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ - cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++ - cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp - cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc + 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++ + mv ${CROSSDIR}/usr/bin/ld ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld + cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-clang + cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-ld ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc - - cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc - rm -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/bin/g++ ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp - # fix links - rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp - sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \ - -e 's/@GNUC@//' \ - -e 's#/usr/include#${CROSSDIR}/usr/include#' \ - -e 's/@dollaropt@//' \ - ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp - chmod ${BINMODE} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp - chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp - ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp + ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++ + ln -sf ${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld + 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} \ @@ -274,6 +265,7 @@ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ CROSSDIR=${CROSSDIR} \ + CC=${CC} CXX=${CXX} \ ${MAKE} -f Makefile.bsd-wrapper all && \ env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ PATH=${CROSSPATH} ${MAKE} -f Makefile.bsd-wrapper install) @@ -293,48 +285,59 @@ chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp .else - (cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \ - /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \ - --with-gnu-as --with-gnu-ld --prefix ${CROSSDIR}/usr \ - --target ${TARGET_CANON} \ - --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} -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} -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 + (cd ${.CURDIR}/gnu/usr.bin/cc; \ + env CROSSDIR=${CROSSDIR} \ + PIE_DEFAULT=${PIE_DEFAULT} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ + MACHINE=${TARGET} \ + PATH=${CROSSPATH} ${MAKE} depend ) + (cd ${.CURDIR}/gnu/usr.bin/cc; \ + env CROSSDIR=${CROSSDIR} \ + COMPILER_VERSION=${COMPILER_VERSION} \ + CC=${CC} CXX=${CXX} \ + PIE_DEFAULT=${PIE_DEFAULT} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ + MACHINE=${TARGET} \ + ${MAKE} all ) + (cd ${.CURDIR}/gnu/usr.bin/cc; \ + env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \ + COMPILER_VERSION=${COMPILER_VERSION} \ + PIE_DEFAULT=${PIE_DEFAULT} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ + MACHINE=${TARGET} \ + PATH=${CROSSPATH} ${MAKE} install) + cp -f ${CROSSDIR}/usr/bin/g++ ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ + cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++ + cp -f ${CROSSDIR}/usr/libexec/cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp + cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc + ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc + + cp -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc + rm -f ${CROSSDIR}/usr/bin/gcc ${CROSSDIR}/usr/bin/g++ ${CROSSDIR}/usr/bin/cc ${CROSSDIR}/usr/libexec/cpp + # fix links rm -f ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-libexeccpp#' \ - -e 's/@GNUC@/-D__GNUC__/' \ + -e 's/@GNUC@//' \ -e 's#/usr/include#${CROSSDIR}/usr/include#' \ - -e 's/@dollaropt@/-$$/' ${.CURDIR}/usr.bin/cpp/cpp.sh > \ - ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp - chmod ${BINMODE} \ - ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp - chown ${BINOWN}:${BINGRP}\ - ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp + -e 's/@dollaropt@//' \ + ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp + chmod ${BINMODE} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp + chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cpp ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp - ln -sf gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc - ln -sf gcc ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-cc - cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-g++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++ - ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++ .endif @touch ${CROSSGCC} # 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 \ + for lib in csu libcompiler_rt libc; do \ (cd $$lib; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} depend all ;\ @@ -342,10 +345,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} @@ -384,6 +387,7 @@ (cd ${.CURDIR}/$$i; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ SKIPDIR=\"${NO_CROSS}\" \ + DESTDIR=${CROSSDIR} \ ${MAKE} depend all install); \ done @@ -395,7 +399,12 @@ (cd ${.CURDIR}/$$i; \ eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ SKIPDIR=\"${NO_CROSS}\" \ - ${MAKE} depend all install); \ + ${MAKE} depend all); \ + (cd ${.CURDIR}/$$i; \ + eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + SKIPDIR=\"${NO_CROSS}\" \ + DESTDIR=${CROSSDIR} \ + ${MAKE} install); \ done cross-etc-root-var: ${CROSSOBJ}