From f417a522c655ea2c27e118451160641a34f758eb Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 3 Feb 2026 12:25:47 +0200 Subject: [PATCH] [CRT][MSVCRT] Remove chkesp library _chkesp is already part of vcruntime library. --- dll/win32/msvcrt/CMakeLists.txt | 3 --- sdk/lib/crt/except/except.cmake | 8 -------- 2 files changed, 11 deletions(-) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 7028798e734..bf8be52beaa 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -180,9 +180,6 @@ add_library(msvcrt MODULE target_compile_definitions(msvcrt PRIVATE _MSVCR_VER=0) set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12) target_link_libraries(msvcrt msvcrt_static crtmath dbgrpt vcruntime wine chkstk ${PSEH_LIB}) -if(ARCH STREQUAL "i386") - target_link_libraries(msvcrt chkesp) -endif() add_importlibs(msvcrt kernel32 kernel32_vista ntdll) add_delay_importlibs(msvcrt user32 advapi32) diff --git a/sdk/lib/crt/except/except.cmake b/sdk/lib/crt/except/except.cmake index f636f78ce9d..add149de4ec 100644 --- a/sdk/lib/crt/except/except.cmake +++ b/sdk/lib/crt/except/except.cmake @@ -79,11 +79,3 @@ add_asm_files(chkstk_lib_asm ${CHKSTK_ASM_SOURCE}) add_library(chkstk ${CHKSTK_SOURCE} ${chkstk_lib_asm}) set_target_properties(chkstk PROPERTIES LINKER_LANGUAGE "C") add_dependencies(chkstk asm) - -# Temporary lib, until crt and vcruntime are cleaned up -if(ARCH STREQUAL "i386") - add_asm_files(chkesp_lib_asm except/i386/chkesp.s) - add_library(chkesp ${chkesp_lib_asm}) - set_target_properties(chkesp PROPERTIES LINKER_LANGUAGE "C") - add_dependencies(chkesp asm) -endif()