RcppCore
diff --git a/‎inst/include/RcppParallel.h
Copy file name to clipboardExpand all lines: inst/include/RcppParallel.h
+3Lines changed: 3 additions & 0 deletions b/‎inst/include/RcppParallel.h
Copy file name to clipboardExpand all lines: inst/include/RcppParallel.h
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Makevars.in
Copy file name to clipboardExpand all lines: src/Makevars.in
+8-3Lines changed: 8 additions & 3 deletions b/‎src/Makevars.in
Copy file name to clipboardExpand all lines: src/Makevars.in
+8-3Lines changed: 8 additions & 3 deletions
diff --git a/‎src/tbb/build/Makefile.tbb
Copy file name to clipboardExpand all lines: src/tbb/build/Makefile.tbb
+1-1Lines changed: 1 addition & 1 deletion b/‎src/tbb/build/Makefile.tbb
Copy file name to clipboardExpand all lines: src/tbb/build/Makefile.tbb
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/tbb/build/Makefile.tbbmalloc
Copy file name to clipboardExpand all lines: src/tbb/build/Makefile.tbbmalloc
+1-1Lines changed: 1 addition & 1 deletion b/‎src/tbb/build/Makefile.tbbmalloc
Copy file name to clipboardExpand all lines: src/tbb/build/Makefile.tbbmalloc
+1-1Lines changed: 1 addition & 1 deletion
@@ -18,6 +18,9 @@
 #endif
 
 #if RCPP_PARALLEL_USE_TBB
+#if defined(WINNT) && defined(__aarch64__) && !defined(TBB_USE_GCC_BUILTINS)
+#define TBB_USE_GCC_BUILTINS 1
+#endif
 # include "RcppParallel/TBB.h"
 #endif
 
 
@@ -24,9 +24,12 @@ ifeq ($(OS), Windows_NT)
 	ARCH=$(shell "${R_HOME}/bin/R" --vanilla -s -e 'cat(R.version$$arch)')
 	TBB_CXXFLAGS = @CXX11FLAGS@ -DTBB_NO_LEGACY=1
 	ifeq "$(ARCH)" "aarch64"
-		WINARM64=true
 		PKG_CPPFLAGS += -DTBB_USE_GCC_BUILTINS
 		TBB_CXXFLAGS += -DTBB_USE_GCC_BUILTINS
+		CLANG_CHECK := $(shell echo | $(CC) -E -dM -  | findstr __clang__)
+		ifneq ($(CLANG_CHECK), )
+			WINARM64_CLANG=true
+		endif
 	endif
 
 	MAKE = make
@@ -39,7 +42,7 @@ ifeq ($(OS), Windows_NT)
 		CXXFLAGS="$(TBB_CXXFLAGS)" 				  \
 		PIC_KEY="@CXX11PICFLAGS@"                 \
 		WARNING_SUPPRESS=""                       \
-		WINARM64="$(WINARM64)"                    \
+		WINARM64_CLANG="$(WINARM64_CLANG)"        \
 		$(MAKE)
 
 else
@@ -86,7 +89,9 @@ ifeq ($(USE_TBB), Windows)
 	# rtools: turn on hacks to compensate for make and shell differences rtools<=>MinGW
 	# compiler: overwrite default (which is cl = MS compiler)
 	MAKE_ARGS += rtools=true compiler=gcc
-	ifneq ($(WINARM64), true)
+	# TBB configure will detect mingw runtime with unknown arch on WINARM64_CLANG but not an 
+	#   issue as we are using compiler built-ins instead of arch-specific code
+	ifneq ($(WINARM64_CLANG), true)
 		ifeq ($(WIN), 64)
 			MAKE_ARGS += arch=intel64 runtime=mingw
 			ARCH_DIR=x64/
 
@@ -93,7 +93,7 @@ tbb.def: $(TBB.DEF) $(TBB.LST)
 
 # LLVM on Windows doesn't need --version-script export
 # https://reviews.llvm.org/D63743
-ifeq (, $(WINARM64))
+ifeq (, $(WINARM64_CLANG))
   LIB_LINK_FLAGS += $(EXPORT_KEY)tbb.def
 endif
 $(TBB.DLL): tbb.def
 
@@ -76,7 +76,7 @@ tbbmalloc.def: $(MALLOC.DEF)
 
 # LLVM on Windows doesn't need --version-script export
 # https://reviews.llvm.org/D63743
-ifeq (, $(WINARM64))
+ifeq (, $(WINARM64_CLANG))
 	MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
 endif
 $(MALLOC.DLL): tbbmalloc.def