Merge pull request #573 from compnerd/5.5-slpi-22000

shims: adjust the SLPI enumeration for Windows 11
swiftlang · Sep 17, 2021 · 851fbd3 · 851fbd3
2 parents f9fdaee + 55aa133
commit 851fbd3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,20 @@ int main(int argc, char *argv[]) {
   if(DISPATCH_HAVE_EXTENDED_SLPI_20348)
     add_compile_definitions(DISPATCH_HAVE_EXTENDED_SLPI_20348)
   endif()
+
+  check_c_source_compiles([=[
+#include <Windows.h>
+int main(int argc, char *argv[]) {
+  switch ((LOGICAL_PROCESSOR_RELATIONSHIP)0) {
+  case RelationProcessorModule:
+    return 0;
+  }
+  return 0;
+}
+]=] DISPATCH_HAVE_EXTENDED_SLPI_22000)
+  if(DISPATCH_HAVE_EXTENDED_SLPI_22000)
+    add_compile_definitions(DISPATCH_HAVE_EXTENDED_SLPI_22000)
+  endif()
 endif()
 
 set(CMAKE_C_STANDARD 11)

diff --git a/src/shims/hw_config.h b/src/shims/hw_config.h
@@ -166,6 +166,9 @@ _dispatch_hw_get_config(_dispatch_hw_config_t c)
 #endif
 		case RelationCache:
 		case RelationGroup:
+#if defined(DISPATCH_HAVE_EXTENDED_SLPI_22000)
+		case RelationProcessorModule:
+#endif
 		case RelationAll:
 			break;
 		}