Revert "Remove chkstk workarounds" (#73) (#75)

This reverts commit 739bfd9. Co-authored-by: Michal Strehovský <[email protected]>
bflattened · Jun 28, 2024 · a4539d0 · a4539d0
1 parent 5a14802
commit a4539d0
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
@@ -98,7 +98,6 @@ The .NET Foundation licenses this file to you under the MIT license.
       <LinkerArg Include="$(IlcSdkPath)api-ms-win-crt-utility-l1-1-0.lib" />
       <LinkerArg Include="$(IlcSdkPath)api-ms-win-crt-math-l1-1-0.lib" />
       <LinkerArg Include="$(IlcSdkPath)shcrt.lib" />
-      <LinkerArg Include="$(IlcSdkPath)kernel32-supplements.lib" />
       <LinkerArg Include="/nodefaultlib:libcpmt.lib" />
       <LinkerArg Include="shell32.lib" />
     </ItemGroup>

diff --git a/src/coreclr/nativeaot/Msvcrt/CMakeLists.txt b/src/coreclr/nativeaot/Msvcrt/CMakeLists.txt
@@ -6,17 +6,6 @@ else()
   set(LIB_MACHINE_FLAG x64)
 endif()
 
-add_custom_command(
-  OUTPUT kernel32-supplements.lib
-  COMMAND lib.exe /machine:${LIB_MACHINE_FLAG} /def:${CMAKE_CURRENT_SOURCE_DIR}/kernel32-supplements.def /out:kernel32-supplements.lib
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kernel32-supplements.def
-  VERBATIM)
-add_custom_target(kernel32supplementslib ALL
-    DEPENDS kernel32-supplements.lib
-    VERBATIM)
-add_dependencies(nativeaot kernel32supplementslib)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/kernel32-supplements.lib DESTINATION aotsdk COMPONENT nativeaot)
-
 add_custom_command(
   OUTPUT api-ms-win-crt-conio-l1-1-0.lib
   COMMAND lib.exe /machine:${LIB_MACHINE_FLAG} /def:${CMAKE_CURRENT_SOURCE_DIR}/api-ms-win-crt-conio-l1-1-0.def /out:api-ms-win-crt-conio-l1-1-0.lib

diff --git a/src/coreclr/nativeaot/Msvcrt/kernel32-supplements.def b/src/coreclr/nativeaot/Msvcrt/kernel32-supplements.def
diff --git a/src/native/libs/System.Globalization.Native/CMakeLists.txt b/src/native/libs/System.Globalization.Native/CMakeLists.txt
@@ -179,6 +179,7 @@ if(CLR_CMAKE_TARGET_WIN32)
         if(CMAKE_CXX_FLAGS_DEBUG MATCHES "/RTC1")
           string(REPLACE "/RTC1" " " CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
         endif()
+        add_compile_options(/Gs10000000)  # avoid __chkstk
         add_compile_options(/EHa-)
         add_compile_options(/GS-)
         add_compile_options(/Zl)

diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt
@@ -148,6 +148,7 @@ else ()
         if(CMAKE_CXX_FLAGS_DEBUG MATCHES "/RTC1")
           string(REPLACE "/RTC1" " " CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
         endif()
+        add_compile_options(/Gs10000000)  # avoid __chkstk
         add_compile_options(/EHa-)
         add_compile_options(/GS-)
         add_compile_options(/Zl)