From 701b0a3f240d0645dceb6940abd0edccd04e3a80 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Sat, 27 Apr 2024 13:59:06 +0200 Subject: [PATCH] [MSVCRTEX] Only include _CrtDbgReport*, if we don't already export them (#6797) * [MSVCRTEX] Only include _CrtDbgReport*, if we don't already export them For some reason clang builds now want the ___chkstk_ms on x64 as well, so add it. --- sdk/lib/crt/except/amd64/chkstk_ms.s | 2 ++ sdk/lib/crt/msvcrtex.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sdk/lib/crt/except/amd64/chkstk_ms.s b/sdk/lib/crt/except/amd64/chkstk_ms.s index 0894720975f..d895a2a2e9a 100644 --- a/sdk/lib/crt/except/amd64/chkstk_ms.s +++ b/sdk/lib/crt/except/amd64/chkstk_ms.s @@ -16,9 +16,11 @@ .code64 PUBLIC __chkstk +PUBLIC ___chkstk_ms PUBLIC __alloca_probe __alloca_probe: +___chkstk_ms: .PROC __chkstk push rcx /* save temps */ diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 2d50c179a80..545cfc98409 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -4,7 +4,6 @@ include_directories(include/internal/mingw-w64) list(APPEND MSVCRTEX_SOURCE ${CRT_STARTUP_SOURCE} math/sincos.c - misc/dbgrpt.cpp misc/fltused.c misc/isblank.c misc/iswblank.c @@ -13,6 +12,7 @@ list(APPEND MSVCRTEX_SOURCE if(DLL_EXPORT_VERSION LESS 0x600) list(APPEND MSVCRTEX_SOURCE + misc/dbgrpt.cpp stdlib/_invalid_parameter.c stdlib/rand_s.c )