===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.88
retrieving revision 1.89
diff -c -r1.88 -r1.89
*** src/Makefile.cross	2016/09/23 09:18:05	1.88
--- src/Makefile.cross	2016/12/18 17:03:08	1.89
***************
*** 1,4 ****
! # $OpenBSD: Makefile.cross,v 1.88 2016/09/23 09:18:05 sthen 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
--- 1,4 ----
! # $OpenBSD: Makefile.cross,v 1.89 2016/12/18 17:03:08 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,12 ****
  
  # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
  # this variable to work.
! .if	(${TARGET} == "armv7")
  TARGET_ARCH=	arm
  .elif	(${TARGET} == "luna88k")
  TARGET_ARCH=	m88k
--- 6,14 ----
  
  # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
  # this variable to work.
! .if	(${TARGET} == "arm64")
! TARGET_ARCH=	aarch64
! .elif	(${TARGET} == "armv7")
  TARGET_ARCH=	arm
  .elif	(${TARGET} == "luna88k")
  TARGET_ARCH=	m88k
***************
*** 26,32 ****
  
  # List of LP64 archs
  # XXX move to bsd.*.mk?
! LP64_ARCH = amd64 alpha mips64 sparc64
  
  TARGET_IS_LP64 =
  MACHINE_IS_LP64 =
--- 28,34 ----
  
  # List of LP64 archs
  # XXX move to bsd.*.mk?
! LP64_ARCH = aarch64 amd64 alpha mips64 sparc64
  
  TARGET_IS_LP64 =
  MACHINE_IS_LP64 =
***************
*** 77,83 ****
  .include <bsd.own.mk>
  
  .for _arch in ${TARGET_ARCH}
! .if !empty(GCC3_ARCH:M${_arch})
  COMPILER_VERSION=gcc3
  .else
  COMPILER_VERSION=gcc4
--- 79,87 ----
  .include <bsd.own.mk>
  
  .for _arch in ${TARGET_ARCH}
! .if !empty(CLANG_ARCH:M${_arch})
! COMPILER_VERSION=clang
! .elif !empty(GCC3_ARCH:M${_arch})
  COMPILER_VERSION=gcc3
  .else
  COMPILER_VERSION=gcc4
***************
*** 174,179 ****
--- 178,184 ----
  	@touch ${CROSSINCLUDES}
  
  ${CROSSBINUTILS}:	${CROSSINCLUDES}
+ .if ${TARGET_ARCH} != "aarch64"
  	(cd ${.CURDIR}/${BINUTILS_DIR}; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    PIE_DEFAULT=${PIE_DEFAULT} \
***************
*** 208,218 ****
  		${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\
  	 fi ;\
  	done
  	@touch ${CROSSBINUTILS}
  
  
  ${CROSSGCC}:		${CROSSBINUTILS}
! .if ${COMPILER_VERSION:L} == "gcc3"
  	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \
--- 213,248 ----
  		${CROSSDIR}/usr/bin/${TARGET_CANON}-$$cmd ;\
  	 fi ;\
  	done
+ .endif
  	@touch ${CROSSBINUTILS}
  
  
  ${CROSSGCC}:		${CROSSBINUTILS}
! .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}-cc
! 	cp -f ${CROSSDIR}/usr/bin/${TARGET_CANON}-clang++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/${TARGET_CANON}-c++
! 	ln -sf ${TARGET_CANON}-cc ${CROSSDIR}/usr/${TARGET_CANON}/bin/cc
! 	ln -sf ${TARGET_CANON}-c++ ${CROSSDIR}/usr/${TARGET_CANON}/bin/c++
! .elif ${COMPILER_VERSION:L} == "gcc3"
  	(cd ${.CURDIR}/gnu/usr.bin/gcc; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \