===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.99
retrieving revision 1.103
diff -u -r1.99 -r1.103
--- src/Makefile.cross	2018/02/04 21:11:32	1.99
+++ src/Makefile.cross	2019/10/14 14:36:49	1.103
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.99 2018/02/04 21:11:32 patrick Exp $
+# $OpenBSD: Makefile.cross,v 1.103 2019/10/14 14:36:49 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
@@ -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
@@ -95,6 +95,12 @@
 CXX=g++
 .endif
 
+.if !empty(LLD_ARCH:M${_arch})
+LINKER_VERSION=lld
+.else
+LINKER_VERSION=bfd
+.endif
+
 .if !empty(PIE_ARCH:M${_arch})
 NOPIE_FLAGS=-fno-pie
 NOPIE_LDFLAGS=-nopie
@@ -135,6 +141,8 @@
 ${CROSSDIRS}:
 .if ${TARGET_ARCH} == "arm" &&  ${MACHINE_IS_LP64} == "yes"
 	# this config is allowed
+.elif ${TARGET_ARCH} == "powerpc" &&  ${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
@@ -203,6 +211,7 @@
 	    ${MAKE} -f Makefile.bsd-wrapper all && \
 	    env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \
 	    COMPILER_VERSION=${COMPILER_VERSION} \
+	    LINKER_VERSION=${LINKER_VERSION} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    PIE_DEFAULT=${PIE_DEFAULT} \
 	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
@@ -239,6 +248,7 @@
 	(cd ${.CURDIR}/gnu/usr.bin/clang; \
 	    DESTDIR=${CROSSDIR} \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
+	    LINKER_VERSION=${LINKER_VERSION} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    MACHINE_ARCH=${TARGET_ARCH} \
 	    ${MAKE} install)