===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.107
retrieving revision 1.111
diff -u -r1.107 -r1.111
--- src/Makefile.cross	2019/11/07 11:32:23	1.107
+++ src/Makefile.cross	2021/05/03 00:04:31	1.111
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.107 2019/11/07 11:32:23 mpi Exp $
+# $OpenBSD: Makefile.cross,v 1.111 2021/05/03 00:04:31 drahn 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
@@ -12,7 +12,7 @@
 TARGET_ARCH=	arm
 .elif	(${TARGET} == "luna88k")
 TARGET_ARCH=	m88k
-.elif	(${TARGET} == "sgi" || ${TARGET} == "octeon")
+.elif	(${TARGET} == "octeon")
 TARGET_ARCH=	mips64
 .elif	(${TARGET} == "loongson")
 TARGET_ARCH=	mips64el
@@ -28,7 +28,7 @@
 
 # List of LP64 archs
 # XXX move to bsd.*.mk?
-LP64_ARCH = aarch64 amd64 alpha mips64 mips64el sparc64
+LP64_ARCH = aarch64 amd64 alpha mips64 mips64el riscv64 sparc64 powerpc64
 
 TARGET_IS_LP64 =
 MACHINE_IS_LP64 =
@@ -338,8 +338,13 @@
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BUILD_CLANG=${BUILD_CLANG}; \
 	export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR BUILD_CLANG; \
+	(cd ${.CURDIR}/gnu/lib/libcompiler_rt; \
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
+		${MAKE} all ;\
+	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
+		${MAKE} install); \
 	(cd ${.CURDIR}/lib; \
-	    for lib in csu libcompiler_rt libc; do \
+	    for lib in csu libc; do \
 	    (cd $$lib; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		    ${MAKE} all ;\