===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.91
retrieving revision 1.100
diff -u -r1.91 -r1.100
--- src/Makefile.cross	2017/01/20 05:00:53	1.91
+++ src/Makefile.cross	2019/05/11 07:18:14	1.100
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.91 2017/01/20 05:00:53 patrick Exp $
+# $OpenBSD: Makefile.cross,v 1.100 2019/05/11 07:18:14 deraadt 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
@@ -17,7 +17,7 @@
 .elif	(${TARGET} == "loongson")
 TARGET_ARCH=	mips64el
 TARGET_CPU=	mips64
-.elif	(${TARGET} == "macppc" || ${TARGET} == "socppc")
+.elif	(${TARGET} == "macppc"
 TARGET_ARCH=	powerpc
 .elif	(${TARGET} == "landisk")
 TARGET_ARCH=	sh
@@ -62,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++
@@ -81,10 +82,17 @@
 .for _arch in ${TARGET_ARCH}
 .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
+CC=gcc
+CXX=g++
 .else
 COMPILER_VERSION=gcc4
+CC=gcc
+CXX=g++
 .endif
 
 .if !empty(PIE_ARCH:M${_arch})
@@ -180,21 +188,23 @@
 	@touch ${CROSSINCLUDES}
 
 ${CROSSBINUTILS}:	${CROSSINCLUDES}
-.if ${TARGET_ARCH} != "aarch64"
 	(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 \
@@ -215,34 +225,39 @@
 		${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\
 	 fi ;\
 	done
-.endif
 	@touch ${CROSSBINUTILS}
 
 
 ${CROSSGCC}:		${CROSSBINUTILS}
 .if ${COMPILER_VERSION:L} == "clang"
 	(cd ${.CURDIR}/gnu/usr.bin/clang; \
+	    CC=${CC} CXX=${CXX} \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    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} \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    MACHINE_ARCH=${TARGET_ARCH} \
 	    ${MAKE} install)
+	(cd ${.CURDIR}/gnu/usr.bin/clang; \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+	    MACHINE_ARCH=${TARGET_ARCH} \
+	    ${MAKE} clean)
 	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++
+	@if [ -e ${CROSSDIR}/usr/bin/ld ]; then \
+		mv ${CROSSDIR}/usr/bin/ld ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld ;\
+		cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-ld \
+		    ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-ld ;\
+		ln -sf ${TARGET_CANON}-ld ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld ;\
+	fi
 	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++; \
@@ -256,6 +271,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)
@@ -276,21 +292,24 @@
 	ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp
 .else
 	(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} \
-	    CROSSDIR=${CROSSDIR} \
 	    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} \
-	    CROSSDIR=${CROSSDIR} \
 	    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} \
@@ -324,7 +343,7 @@
 	    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 ;\
@@ -386,8 +405,12 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
+		${MAKE} depend all); \
+	    (cd ${.CURDIR}/$$i; \
+	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		SKIPDIR=\"${NO_CROSS}\" \
 		DESTDIR=${CROSSDIR} \
-		${MAKE} depend all install); \
+		${MAKE} install); \
 	done
 
 cross-etc-root-var:	${CROSSOBJ}