From eba2bbd177e64b072d2a9ed01db4819db36fb546 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 20 Nov 2025 16:57:33 +0200 Subject: [PATCH] [CRT] Remove ftol2_sse --- dll/win32/msvcrt/CMakeLists.txt | 3 --- sdk/lib/crt/msvcrtex.cmake | 9 --------- win32ss/gdi/gdi32/CMakeLists.txt | 4 ---- win32ss/user/user32/CMakeLists.txt | 4 ---- 4 files changed, 20 deletions(-) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 425cc2b6fad..b62e8c3ec0f 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -39,9 +39,6 @@ if(MSVC) # export of deleting destructor "name" target_link_options(msvcrt PRIVATE "/ignore:4102") set_property(TARGET libmsvcrt APPEND PROPERTY STATIC_LIBRARY_OPTIONS "/ignore:4102") - if(ARCH STREQUAL "i386") - target_sources(libmsvcrt PRIVATE $) - endif() endif() add_importlibs(msvcrt kernel32 ntdll) diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index df6dc2b682a..c986bae1efb 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -93,15 +93,6 @@ add_asm_files(msvcrtex_asm ${MSVCRTEX_ASM_SOURCE}) add_library(msvcrtex OBJECT ${MSVCRTEX_SOURCE} ${msvcrtex_asm}) target_compile_definitions(msvcrtex PRIVATE _DLL _MSVCRTEX_) -if(MSVC AND (ARCH STREQUAL "i386")) - # user32.dll needs this as a stand-alone object file - add_asm_files(ftol2_asm math/i386/ftol2_asm.s) - add_library(ftol2_sse OBJECT ${ftol2_asm}) - target_compile_definitions(ftol2_sse PRIVATE $) - set_target_properties(ftol2_sse PROPERTIES LINKER_LANGUAGE C) -endif() - - if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(msvcrtex PRIVATE $<$:-Wno-main>) if(LTCG) diff --git a/win32ss/gdi/gdi32/CMakeLists.txt b/win32ss/gdi/gdi32/CMakeLists.txt index 233a46a4a05..6cefd676d86 100644 --- a/win32ss/gdi/gdi32/CMakeLists.txt +++ b/win32ss/gdi/gdi32/CMakeLists.txt @@ -61,10 +61,6 @@ target_link_libraries(gdi32 atan2 ${PSEH_LIB}) -if(MSVC AND (ARCH STREQUAL "i386")) - target_sources(gdi32 PRIVATE $) -endif() - add_importlibs(gdi32 user32 advapi32 kernel32 ntdll) add_pch(gdi32 include/precomp.h SOURCE) add_dependencies(gdi32 psdk) diff --git a/win32ss/user/user32/CMakeLists.txt b/win32ss/user/user32/CMakeLists.txt index 084df2155b0..dbea71a6798 100644 --- a/win32ss/user/user32/CMakeLists.txt +++ b/win32ss/user/user32/CMakeLists.txt @@ -85,10 +85,6 @@ set_module_type(user32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(user32 user32_vista_static user32_optional_vista user32_wsprintf wine win32ksys ${PSEH_LIB}) add_dependencies(user32 asm) -if(MSVC AND (ARCH STREQUAL "i386")) - target_sources(user32 PRIVATE $) -endif() - add_delay_importlibs(user32 usp10 libpng) add_importlibs(user32 gdi32 advapi32 kernel32 ntdll) add_pch(user32 include/user32.h SOURCE)