Index: head/devel/llvm37/Makefile
===================================================================
--- head/devel/llvm37/Makefile
+++ head/devel/llvm37/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	llvm
 DISTVERSION=	3.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
@@ -39,9 +39,10 @@
 
 CLANG_DESC=	Build clang
 CLANG_EXTRA_PATCHES= \
-		${PATCHDIR}/clang-patch-fformat_extensions.diff \
-		${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \
-		${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py
+	${PATCHDIR}/clang-patch-fformat_extensions.diff \
+	${PATCHDIR}/clang-patch-tools_clang_lib_Headers_CMakeLists.txt \
+	${PATCHDIR}/clang-patch-tools_clang_tools_clang-format_clang-format.py \
+	${PATCHDIR}/clang-patch-svn-250416
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_DISTFILES=	cfe-${DISTVERSION}.src${EXTRACT_SUFX}
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
Index: head/devel/llvm37/files/clang-patch-svn-250416
===================================================================
--- head/devel/llvm37/files/clang-patch-svn-250416
+++ head/devel/llvm37/files/clang-patch-svn-250416
@@ -0,0 +1,22 @@
+------------------------------------------------------------------------
+r250416 | ed | 2015-10-15 15:07:07 +0000 (Thu, 15 Oct 2015) | 5 lines
+
+Add support for CloudABI/aarch64.
+
+The core C library has already been ported over to aarch64 successfully,
+meaning there is no reason to hold this change back.
+
+------------------------------------------------------------------------
+Index: lib/Basic/Targets.cpp
+===================================================================
+--- tools/clang/lib/Basic/Targets.cpp	(revision 250415)
++++ tools/clang/lib/Basic/Targets.cpp	(revision 250416)
+@@ -7364,6 +7364,8 @@
+       return new DarwinAArch64TargetInfo(Triple);
+ 
+     switch (os) {
++    case llvm::Triple::CloudABI:
++      return new CloudABITargetInfo<AArch64leTargetInfo>(Triple);
+     case llvm::Triple::FreeBSD:
+       return new FreeBSDTargetInfo<AArch64leTargetInfo>(Triple);
+     case llvm::Triple::Linux:
Index: head/lang/cloudabi-clang/Makefile
===================================================================
--- head/lang/cloudabi-clang/Makefile
+++ head/lang/cloudabi-clang/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cloudabi-clang
 PORTVERSION=	3.7
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	# None
 DISTFILES=	# None
@@ -19,17 +20,20 @@
 
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/x86_64-unknown-cloudabi-cc \
-		bin/x86_64-unknown-cloudabi-c++ \
-		llvm${LLVM_SUFFIX}/x86_64-unknown-cloudabi
+CLOUDABI_ARCHS=	aarch64-unknown-cloudabi x86_64-unknown-cloudabi
+
+.for arch in ${CLOUDABI_ARCHS}
+PLIST_FILES+=	bin/${arch}-cc bin/${arch}-c++ llvm${LLVM_SUFFIX}/${arch}
+.endfor
 
 do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}
+.for arch in ${CLOUDABI_ARCHS}
 	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang \
-		${STAGEDIR}${PREFIX}/bin/x86_64-unknown-cloudabi-cc
+		${STAGEDIR}${PREFIX}/bin/${arch}-cc
 	@${LN} -s ../llvm${LLVM_SUFFIX}/bin/clang++ \
-		${STAGEDIR}${PREFIX}/bin/x86_64-unknown-cloudabi-c++
-	@${MKDIR} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}
-	@${LN} -s ../x86_64-unknown-cloudabi \
-		${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/x86_64-unknown-cloudabi
+		${STAGEDIR}${PREFIX}/bin/${arch}-c++
+	@${LN} -s ../${arch} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/${arch}
+.endfor
 
 .include <bsd.port.mk>