Index: devel/llvm37/Makefile
===================================================================
--- devel/llvm37/Makefile
+++ 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
Index: devel/llvm37/files/patch-cloudabi-aarch64
===================================================================
--- /dev/null
+++ devel/llvm37/files/patch-cloudabi-aarch64
@@ -0,0 +1,11 @@
+--- tools/clang/lib/Basic/Targets.cpp
++++ tools/clang/lib/Basic/Targets.cpp
+@@ -6998,6 +6998,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: lang/cloudabi-clang/Makefile
===================================================================
--- lang/cloudabi-clang/Makefile
+++ 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:
+.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++
+		${STAGEDIR}${PREFIX}/bin/${arch}-c++
 	@${MKDIR} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}
-	@${LN} -s ../x86_64-unknown-cloudabi \
-		${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/x86_64-unknown-cloudabi
+	@${LN} -s ../${arch} ${STAGEDIR}${PREFIX}/llvm${LLVM_SUFFIX}/${arch}
+.endfor
 
 .include <bsd.port.mk>