Index: head/devel/llvm10/Makefile
===================================================================
--- head/devel/llvm10/Makefile
+++ head/devel/llvm10/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	10.0.0rc3
-PORTREVISION=	1
+DISTVERSION=	10.0.0rc4
+PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -65,10 +65,12 @@
 CXXFLAGS+=	-DNDEBUG
 
 OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
+OPTIONS_DEFINE_aarch64=	OPENMP
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc64=	OPENMP
 OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG
+OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT_powerpc64=	OPENMP
@@ -450,6 +452,13 @@
 	${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb
 
 post-extract-OPENMP-on:
+	# FreeBSD/aarch64 needs same va_list handling as Linux/aarch64
+	# see https://reviews.freebsd.org/D21167
+	${REINPLACE_CMD} -e 's/KMP_ARCH_AARCH64) && KMP_OS_LINUX/KMP_ARCH_AARCH64)/' \
+	    ${WRKSRC_openmp}/runtime/src/kmp.h \
+	    ${WRKSRC_openmp}/runtime/src/kmp_csupport.cpp \
+	    ${WRKSRC_openmp}/runtime/src/kmp_runtime.cpp \
+	    ${WRKSRC_openmp}/runtime/src/kmp_gsupport.cpp
 	${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp
 
 post-patch:
Index: head/devel/llvm10/distinfo
===================================================================
--- head/devel/llvm10/distinfo
+++ head/devel/llvm10/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1583342640
-SHA256 (llvm-10.0.0rc3.src.tar.xz) = 9149b451456f44bf7e5bdd8ca74c9ccac86144cc9d17dbfa0b073ccca31043dd
-SIZE (llvm-10.0.0rc3.src.tar.xz) = 35731988
-SHA256 (clang-10.0.0rc3.src.tar.xz) = b83a5e4065daf9a572ba604d144803968f9330873b47b26779c0256542eef1f0
-SIZE (clang-10.0.0rc3.src.tar.xz) = 14188396
-SHA256 (compiler-rt-10.0.0rc3.src.tar.xz) = e5629363458d3d1174cd0259923ed4459fb48d2f2ff1729ca160989076056463
-SIZE (compiler-rt-10.0.0rc3.src.tar.xz) = 2093472
-SHA256 (clang-tools-extra-10.0.0rc3.src.tar.xz) = 1968de036daf07d03df73896444548ac874ffc59df5fb0afabab7e3e124bc60c
-SIZE (clang-tools-extra-10.0.0rc3.src.tar.xz) = 2605932
-SHA256 (lld-10.0.0rc3.src.tar.xz) = c4edacce36ae5ecd28cd22f7ef2e7e32c94ec5c7500443d5e3d3b6f56b4f2cf1
-SIZE (lld-10.0.0rc3.src.tar.xz) = 1143076
-SHA256 (lldb-10.0.0rc3.src.tar.xz) = e8d5ce75e959b073bb9ca7eef591a1709964b047c914914acb1c88cc46801f1b
-SIZE (lldb-10.0.0rc3.src.tar.xz) = 9638876
-SHA256 (openmp-10.0.0rc3.src.tar.xz) = 4b56ff1cff324cc69c783a3dd56305078c8cb92fc59fee494e736714b2eaad2b
-SIZE (openmp-10.0.0rc3.src.tar.xz) = 958880
+TIMESTAMP = 1584478188
+SHA256 (llvm-10.0.0rc4.src.tar.xz) = 64c44a1136d9ab6688098d9a662ea992ca2badede2f2497960cfdea38b15b09a
+SIZE (llvm-10.0.0rc4.src.tar.xz) = 35735236
+SHA256 (clang-10.0.0rc4.src.tar.xz) = 751f5a9a03adfad97983f6b3cd4ba5addd9a910e63b4538c8308e30c62b4c2a7
+SIZE (clang-10.0.0rc4.src.tar.xz) = 14190596
+SHA256 (compiler-rt-10.0.0rc4.src.tar.xz) = 9a4b3a065448da38fd1ad361709b51fce39558ce7a2e65b8e6a0f0b619fc4d68
+SIZE (compiler-rt-10.0.0rc4.src.tar.xz) = 2094828
+SHA256 (clang-tools-extra-10.0.0rc4.src.tar.xz) = 011d667227cc9b800bd22b659a0d9ccb4a524f58e2f61faffefce2306c582b47
+SIZE (clang-tools-extra-10.0.0rc4.src.tar.xz) = 2605896
+SHA256 (lld-10.0.0rc4.src.tar.xz) = e120d90ccd71bc41d188a4d5450d06814533d460c7f76634df54c070992c1ab1
+SIZE (lld-10.0.0rc4.src.tar.xz) = 1143060
+SHA256 (lldb-10.0.0rc4.src.tar.xz) = 5ce17b4c606a460fe6b5baf19ae434737ca6b58c02f5d41c62932b27949752b6
+SIZE (lldb-10.0.0rc4.src.tar.xz) = 9637692
+SHA256 (openmp-10.0.0rc4.src.tar.xz) = d9eb44083ec58c7143d908d049a2d75bd3c46e168f757937cac45fdf48acd1e2
+SIZE (openmp-10.0.0rc4.src.tar.xz) = 958876