Merge remote-tracking branch 'origin/master' into bugfix/windows-load-tbb-stub

# Conflicts:
#	NEWS.md

Author: kevinushey

NEWS.md

@@ -7,6 +7,12 @@
   RcppParallel 6.0.0, such packages would fail to load with "LoadLibrary
   failure: The specified module could not be found".
 
+* The bundled oneTBB headers now guard against GCC's `<cpuid.h>` being
+  included before `<intrin.h>` on Windows (mingw). Previously, translation
+  units including `<cpuid.h>` before any TBB header would fail to compile,
+  as the `__cpuid` macro from `<cpuid.h>` conflicts with the `__cpuid()`
+  function declared by mingw's `<intrin.h>`.
+
 * When building the bundled copy of oneTBB, RcppParallel no longer searches
   for hwloc, and so no longer tries to build the optional 'tbbbind' library.
   This fixes build failures on machines where a static hwloc library is

patches/mingw_cpuid.diff

@@ -0,0 +1,24 @@
+diff --git a/src/tbb/include/oneapi/tbb/detail/_machine.h b/src/tbb/include/oneapi/tbb/detail/_machine.h
+index ca481380..8174f3d3 100644
+--- a/src/tbb/include/oneapi/tbb/detail/_machine.h
++++ b/src/tbb/include/oneapi/tbb/detail/_machine.h
+@@ -26,7 +26,19 @@
+ #include <cstddef>
+ 
+ #ifdef _WIN32
++
++// GCC's <cpuid.h> defines a function-like '__cpuid' macro that mangles the
++// __cpuid() declarations in mingw's <intrin.h>. Hide the macro while
++// including <intrin.h> so the two headers can coexist in any order.
++#if defined(__MINGW32__) && defined(__cpuid)
++#pragma push_macro("__cpuid")
++#undef __cpuid
++#include <intrin.h>
++#pragma pop_macro("__cpuid")
++#else
+ #include <intrin.h>
++#endif
++
+ #ifdef __TBBMALLOC_BUILD
+ #define WIN32_LEAN_AND_MEAN
+ #ifndef NOMINMAX

src/tbb/include/oneapi/tbb/detail/_machine.h

@@ -26,7 +26,19 @@
 #include <cstddef>
 
 #ifdef _WIN32
+
+// GCC's <cpuid.h> defines a function-like '__cpuid' macro that mangles the
+// __cpuid() declarations in mingw's <intrin.h>. Hide the macro while
+// including <intrin.h> so the two headers can coexist in any order.
+#if defined(__MINGW32__) && defined(__cpuid)
+#pragma push_macro("__cpuid")
+#undef __cpuid
+#include <intrin.h>
+#pragma pop_macro("__cpuid")
+#else
 #include <intrin.h>
+#endif
+
 #ifdef __TBBMALLOC_BUILD
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX