Fix v142 ARM64 driver build on hosted runners

Author: ntoskrnl7

.github/workflows/cmake.yml

@@ -117,10 +117,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # v142 is kept as an old-toolset smoke test. The windows-2022 hosted
-        # image mixes v142 ARM64 tasks with v170 marmasm targets, so ARM64 is
-        # covered by the main toolset matrix instead.
-        arch: [x64]
+        arch: [x64, ARM64]
 
     steps:
       - uses: actions/checkout@v4

CMakeLists.txt

@@ -214,8 +214,12 @@ endif()
 #
 # Forced Include File
 #
-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/.internal/winsdk/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/wdk/${WDK_VERSION}/forced.h")
-  target_compile_options(crtsys PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/FI${CMAKE_CURRENT_SOURCE_DIR}/include/.internal/winsdk/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/wdk/${WDK_VERSION}/forced.h>")
+set(CRTSYS_WINSDK_FORCED_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include/.internal/winsdk/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/wdk/${WDK_VERSION}/forced.h")
+if(NOT EXISTS "${CRTSYS_WINSDK_FORCED_INCLUDE}")
+  set(CRTSYS_WINSDK_FORCED_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/include/.internal/winsdk/wdk/${WDK_VERSION}/forced.h")
+endif()
+if(EXISTS "${CRTSYS_WINSDK_FORCED_INCLUDE}")
+  target_compile_options(crtsys PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/FI${CRTSYS_WINSDK_FORCED_INCLUDE}>")
 endif()
 target_compile_options(crtsys PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/FI${CMAKE_CURRENT_SOURCE_DIR}/src/crtsys.h>")
 if (UCXXRT_ENABLED)

cmake/CrtSys.cmake

@@ -173,8 +173,12 @@ function(crtsys_apply_driver_settings _target _root)
 
     set_property(TARGET ${_target} PROPERTY INCLUDE_DIRECTORIES "${_root}/include;${_root}/include/.internal/msvc/$(VCToolsVersion);${_root}/include/.internal/msvc/${MSVC_TOOLSET_VERSION};${_root}/include/.internal/msvc/$(VCToolsVersion)/stl;${_root}/include/.internal/msvc/${MSVC_TOOLSET_VERSION}/stl;$(VC_IncludePath);$(WindowsSDK_IncludePath);${INC_DIR_TMP}")
 
-    if(EXISTS "${_root}/include/.internal/winsdk/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/wdk/${WDK_VERSION}/forced.h")
-      target_compile_options(${_target} PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/FI${_root}/include/.internal/winsdk/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/wdk/${WDK_VERSION}/forced.h>")
+    set(_crtsys_winsdk_forced_include "${_root}/include/.internal/winsdk/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/wdk/${WDK_VERSION}/forced.h")
+    if(NOT EXISTS "${_crtsys_winsdk_forced_include}")
+      set(_crtsys_winsdk_forced_include "${_root}/include/.internal/winsdk/wdk/${WDK_VERSION}/forced.h")
+    endif()
+    if(EXISTS "${_crtsys_winsdk_forced_include}")
+      target_compile_options(${_target} PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/FI${_crtsys_winsdk_forced_include}>")
     endif()
 
     target_compile_options(${_target} PRIVATE "$<$<COMPILE_LANGUAGE:C,CXX>:/FI${_root}/include/.internal/adjust_link_order>")

include/.internal/winsdk/wdk/10.0.26100.0/forced.h

@@ -0,0 +1,18 @@
+#pragma once
+
+//
+// WDK 10.0.26100.0 wdm.h uses _CountOneBits64 in ARM64 helper code before
+// older v142 ARM64 toolsets have necessarily seen the intrinsic declaration.
+// Force intrin.h first and provide the missing v142 declaration.
+//
+#include <intrin.h>
+
+#if defined(_M_ARM64) && defined(_MSC_VER) && _MSC_VER < 1930
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned int __cdecl _CountOneBits64(unsigned __int64);
+#ifdef __cplusplus
+}
+#endif
+#endif

src/crtsys.h

@@ -8,6 +8,21 @@
 
 #include <ntdef.h>
 
+#if defined(_M_ARM64) && defined(_MSC_VER) && _MSC_VER < 1930
+//
+// WDK 10.0.26100.0 wdm.h can reference _CountOneBits64 before the v142 ARM64
+// intrinsic declaration is visible. Keep this narrow compatibility declaration
+// ahead of any later WDK header include.
+//
+#ifdef __cplusplus
+extern "C" {
+#endif
+unsigned int __cdecl _CountOneBits64(unsigned __int64);
+#ifdef __cplusplus
+}
+#endif
+#endif
+
 #ifndef CRTSYS_ENABLE_DIAGNOSTIC_BREAKPOINTS
 #define CRTSYS_ENABLE_DIAGNOSTIC_BREAKPOINTS 1
 #endif

src/ucrt_for_ucxxrt.props

@@ -470,10 +470,12 @@
     <Platform_Arm Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">true</Platform_Arm>
     <Platform_Arm Condition="'$(Platform_Arm)'!='true'">false</Platform_Arm>
     <Platform_Intel>!$(Platform_Arm)</Platform_Intel>
+    <CrtSysMarmasmBuildCustomizationsPath>$(VCTargetsPath)\BuildCustomizations</CrtSysMarmasmBuildCustomizationsPath>
+    <CrtSysMarmasmBuildCustomizationsPath Condition="'$(PlatformToolset)'=='v142' or '$(PlatformToolsetVersion)'=='142'">$(VCTargetsPath)\..\v160\BuildCustomizations</CrtSysMarmasmBuildCustomizationsPath>
   </PropertyGroup>
 
   <ImportGroup>
-    <Import Condition="$(Platform_Arm)" Project="$(VCTargetsPath)\BuildCustomizations\marmasm.props" />
+    <Import Condition="$(Platform_Arm)" Project="$(CrtSysMarmasmBuildCustomizationsPath)\marmasm.props" />
   </ImportGroup>
 
   <Target Name="PreprocessArmHandlers" Condition="'$(Platform)'=='ARM'" BeforeTargets="_MARMASM" Outputs="$(IntDir)handlers.pp" Inputs="$(VC_CRT_SourcePath.Split(%3B)[0])\arm\handlers.asm">
@@ -510,6 +512,6 @@
   </ItemGroup>
 
   <ImportGroup>
-    <Import Condition="$(Platform_Arm)" Project="$(VCTargetsPath)\BuildCustomizations\marmasm.targets" />
+    <Import Condition="$(Platform_Arm)" Project="$(CrtSysMarmasmBuildCustomizationsPath)\marmasm.targets" />
   </ImportGroup>
-</Project>
+</Project>

src/vcruntime.props

@@ -269,10 +269,12 @@
     <Platform_Arm Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">true</Platform_Arm>
     <Platform_Arm Condition="'$(Platform_Arm)'!='true'">false</Platform_Arm>
     <Platform_Intel>!$(Platform_Arm)</Platform_Intel>
+    <CrtSysMarmasmBuildCustomizationsPath>$(VCTargetsPath)\BuildCustomizations</CrtSysMarmasmBuildCustomizationsPath>
+    <CrtSysMarmasmBuildCustomizationsPath Condition="'$(PlatformToolset)'=='v142' or '$(PlatformToolsetVersion)'=='142'">$(VCTargetsPath)\..\v160\BuildCustomizations</CrtSysMarmasmBuildCustomizationsPath>
   </PropertyGroup>
 
   <ImportGroup>
-    <Import Condition="$(Platform_Arm)" Project="$(VCTargetsPath)\BuildCustomizations\marmasm.props" />
+    <Import Condition="$(Platform_Arm)" Project="$(CrtSysMarmasmBuildCustomizationsPath)\marmasm.props" />
   </ImportGroup>
 
   <ItemGroup Condition="'$(Platform)'=='Win32'">
@@ -321,6 +323,6 @@
   </ItemGroup>
 
   <ImportGroup>
-    <Import Condition="$(Platform_Arm)" Project="$(VCTargetsPath)\BuildCustomizations\marmasm.targets" />
+    <Import Condition="$(Platform_Arm)" Project="$(CrtSysMarmasmBuildCustomizationsPath)\marmasm.targets" />
   </ImportGroup>
 </Project>

test/cmake/driver/CMakeLists.txt

@@ -54,6 +54,9 @@ endif()
 
 crtsys_add_driver(crtsys_test ${SOURCE_FILES})
 target_compile_options(crtsys_test PRIVATE "$<$<COMPILE_LANGUAGE:CXX>:/GR>")
+# Keep cppreference examples such as std::fopen intact while building the
+# driver test harness with /WX under older MSVC toolsets.
+target_compile_definitions(crtsys_test PRIVATE "_CRT_SECURE_NO_WARNINGS")
 
 if (NOT CRTSYS_TEST_BREAKPOINT)
     target_compile_definitions(crtsys_test PRIVATE "CRTSYS_TEST_NO_BREAKPOINT")

test/cmake/driver/src/cpp/stl/memory.cpp

@@ -1,5 +1,3 @@
-#define _CRT_SECURE_NO_WARNINGS
-
 //
 // https://en.cppreference.com/w/cpp/memory/shared_ptr#Example
 //

test/nuget/crtsys_nuget_test.vcxproj

@@ -71,7 +71,7 @@
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\cmake;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CRTSYS_TEST_NO_BREAKPOINT;CRTSYS_TEST_NLOHMANN_JSON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CRTSYS_TEST_NO_BREAKPOINT;CRTSYS_TEST_NLOHMANN_JSON;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>