Skip to content

Commit

Permalink
Revert "Remove chkstk workarounds" (#73)
Browse files Browse the repository at this point in the history
This reverts commit 739bfd9.
  • Loading branch information
MichalStrehovsky authored Jun 17, 2024
1 parent d289362 commit 6d2c6fb
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,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>
Expand Down
11 changes: 0 additions & 11 deletions src/coreclr/nativeaot/Msvcrt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/nativeaot/Msvcrt/kernel32-supplements.def

This file was deleted.

1 change: 1 addition & 0 deletions src/native/libs/System.Globalization.Native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,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)
Expand Down

0 comments on commit 6d2c6fb

Please sign in to comment.