summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt10
-rw-r--r--src/ToolBox/SOS/Strike/CMakeLists.txt8
-rw-r--r--src/dlls/dbgshim/CMakeLists.txt8
-rw-r--r--src/dlls/mscordac/CMakeLists.txt8
-rw-r--r--src/dlls/mscordbi/CMakeLists.txt7
-rw-r--r--src/inc/longfilepathwrappers.h6
-rw-r--r--src/inc/winwrap.h2
-rw-r--r--src/tools/GenClrDebugResource/CMakeLists.txt7
-rw-r--r--src/tools/InjectResource/CMakeLists.txt7
-rw-r--r--src/tools/crossgen/CMakeLists.txt5
-rw-r--r--src/utilcode/longfilepathwrappers.cpp50
11 files changed, 59 insertions, 59 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f218a23905..20a167eea4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -617,8 +617,18 @@ endif (CLR_CMAKE_PLATFORM_UNIX)
# Libraries
if (WIN32)
+
+ # Define the CRT lib references that link into Desktop imports
set(STATIC_MT_CRT_LIB "libcmt$<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:d>.lib")
+ set(STATIC_MT_VCRT_LIB "libvcruntime$<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:d>.lib")
set(STATIC_MT_CPP_LIB "libcpmt$<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:d>.lib")
+
+ # ARM64_TODO: Enable this for Windows Arm64
+ if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ # Define the uCRT lib reference
+ set(STATIC_MT_UCRT_LIB "libucrt$<$<OR:$<CONFIG:Debug>,$<CONFIG:Checked>>:d>.lib")
+ endif()
+
endif(WIN32)
# Definition directives
diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt
index 3e60ea70e7..f4b157b2c7 100644
--- a/src/ToolBox/SOS/Strike/CMakeLists.txt
+++ b/src/ToolBox/SOS/Strike/CMakeLists.txt
@@ -83,6 +83,14 @@ if(WIN32)
psapi.lib
ntdll.lib
)
+
+ # ARM64_TODO: Enable this for Windows Arm64
+ if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ list(APPEND SOS_LIBRARY
+ ${STATIC_MT_VCRT_LIB}
+ )
+ endif()
+
else(WIN32)
add_definitions(-DFEATURE_ENABLE_HARDWARE_EXCEPTIONS)
add_definitions(-DPAL_STDCPP_COMPAT=1)
diff --git a/src/dlls/dbgshim/CMakeLists.txt b/src/dlls/dbgshim/CMakeLists.txt
index 621ab134c7..655cb0a28b 100644
--- a/src/dlls/dbgshim/CMakeLists.txt
+++ b/src/dlls/dbgshim/CMakeLists.txt
@@ -52,6 +52,14 @@ if(WIN32)
version.lib
psapi.lib
)
+
+ # ARM64_TODO: Enable this for Windows Arm64
+ if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ list(APPEND DBGSHIM_LIBRARIES
+ ${STATIC_MT_VCRT_LIB}
+ )
+ endif()
+
else()
list(APPEND DBGSHIM_LIBRARIES
coreclrpal
diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt
index 40704401b4..ea655e77b8 100644
--- a/src/dlls/mscordac/CMakeLists.txt
+++ b/src/dlls/mscordac/CMakeLists.txt
@@ -87,6 +87,14 @@ if(WIN32)
user32.lib
${STATIC_MT_CRT_LIB}
)
+
+ # ARM64_TODO: Enable this for Windows Arm64
+ if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ list(APPEND COREDAC_LIBRARIES
+ ${STATIC_MT_VCRT_LIB}
+ )
+ endif()
+
else(WIN32)
list(APPEND COREDAC_LIBRARIES
mscorrc_debug
diff --git a/src/dlls/mscordbi/CMakeLists.txt b/src/dlls/mscordbi/CMakeLists.txt
index 050e51d858..0c8a685b76 100644
--- a/src/dlls/mscordbi/CMakeLists.txt
+++ b/src/dlls/mscordbi/CMakeLists.txt
@@ -63,6 +63,13 @@ if(WIN32)
${STATIC_MT_CRT_LIB}
)
+ # ARM64_TODO: Enable this for Windows Arm64
+ if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ list(APPEND COREDBI_LIBRARIES
+ ${STATIC_MT_VCRT_LIB}
+ )
+ endif()
+
target_link_libraries(mscordbi ${COREDBI_LIBRARIES})
elseif(CLR_CMAKE_PLATFORM_UNIX)
diff --git a/src/inc/longfilepathwrappers.h b/src/inc/longfilepathwrappers.h
index b3fc6ad1db..a847988935 100644
--- a/src/inc/longfilepathwrappers.h
+++ b/src/inc/longfilepathwrappers.h
@@ -77,12 +77,6 @@ CopyFileExWrapper(
#endif //FEATURE_PAL
BOOL
-MoveFileWrapper(
- _In_ LPCWSTR lpExistingFileName,
- _In_ LPCWSTR lpNewFileName
- );
-
-BOOL
MoveFileExWrapper(
_In_ LPCWSTR lpExistingFileName,
_In_opt_ LPCWSTR lpNewFileName,
diff --git a/src/inc/winwrap.h b/src/inc/winwrap.h
index 89a3220c67..bb9dc70181 100644
--- a/src/inc/winwrap.h
+++ b/src/inc/winwrap.h
@@ -700,8 +700,8 @@
#define WszFindNextFile FindNextFileW
#define WszCopyFile CopyFileWrapper
#define WszCopyFileEx CopyFileExWrapper
-#define WszMoveFile MoveFileWrapper
#define WszMoveFileEx MoveFileExWrapper
+#define WszMoveFile (lpExistingFileName, lpNewFileName) WszMoveFileEx(lpExistingFileName, lpNewFileName, 0)
#define WszCreateDirectory CreateDirectoryWrapper
#define WszRemoveDirectory RemoveDirectoryWrapper
#define WszCreateHardLink CreateHardLinkWrapper
diff --git a/src/tools/GenClrDebugResource/CMakeLists.txt b/src/tools/GenClrDebugResource/CMakeLists.txt
index c23a603adf..c30f391440 100644
--- a/src/tools/GenClrDebugResource/CMakeLists.txt
+++ b/src/tools/GenClrDebugResource/CMakeLists.txt
@@ -3,4 +3,9 @@ add_executable(GenClrDebugResource GenClrDebugResource.cpp)
target_link_libraries(GenClrDebugResource
${STATIC_MT_CRT_LIB}
-) \ No newline at end of file
+)
+
+# ARM64_TODO: Enable this for Windows Arm64
+if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ target_link_libraries(GenClrDebugResource ${STATIC_MT_VCRT_LIB})
+endif() \ No newline at end of file
diff --git a/src/tools/InjectResource/CMakeLists.txt b/src/tools/InjectResource/CMakeLists.txt
index b530923fcf..f8593069ab 100644
--- a/src/tools/InjectResource/CMakeLists.txt
+++ b/src/tools/InjectResource/CMakeLists.txt
@@ -6,4 +6,9 @@ add_executable(InjectResource InjectResource.cpp)
target_link_libraries(InjectResource
${STATIC_MT_CRT_LIB}
-) \ No newline at end of file
+)
+
+# ARM64_TODO: Enable this for Windows Arm64
+if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ target_link_libraries(InjectResource ${STATIC_MT_VCRT_LIB})
+endif() \ No newline at end of file
diff --git a/src/tools/crossgen/CMakeLists.txt b/src/tools/crossgen/CMakeLists.txt
index cb983bdd83..9bbf37334a 100644
--- a/src/tools/crossgen/CMakeLists.txt
+++ b/src/tools/crossgen/CMakeLists.txt
@@ -60,6 +60,11 @@ else()
${STATIC_MT_CRT_LIB}
)
+ # ARM64_TODO: Enable this for Windows Arm64
+ if (NOT CLR_CMAKE_PLATFORM_ARCH_ARM64)
+ target_link_libraries(crossgen ${STATIC_MT_VCRT_LIB})
+ endif()
+
# We will generate PDB only for the debug configuration
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/crossgen.pdb DESTINATION PDB)
diff --git a/src/utilcode/longfilepathwrappers.cpp b/src/utilcode/longfilepathwrappers.cpp
index 0bb473095a..2cce3b5272 100644
--- a/src/utilcode/longfilepathwrappers.cpp
+++ b/src/utilcode/longfilepathwrappers.cpp
@@ -382,56 +382,6 @@ CopyFileWrapper(
return ret;
}
-
-BOOL
-MoveFileWrapper(
- _In_ LPCWSTR lpExistingFileName,
- _In_ LPCWSTR lpNewFileName
- )
-{
- CONTRACTL
- {
- NOTHROW;
- SO_TOLERANT;
- }
- CONTRACTL_END;
-
- HRESULT hr = S_OK;
- BOOL ret = FALSE;
- DWORD lastError;
-
- BEGIN_SO_INTOLERANT_CODE_NO_THROW_CHECK_THREAD(SetLastError(COR_E_STACKOVERFLOW); return FALSE;)
-
- EX_TRY
- {
- LongPathString Existingpath(LongPathString::Literal, lpExistingFileName);
- LongPathString Newpath(LongPathString::Literal, lpNewFileName);
-
- if (SUCCEEDED(LongFile::NormalizePath(Existingpath)) && SUCCEEDED(LongFile::NormalizePath(Newpath)))
- {
- ret = MoveFileW(
- Existingpath.GetUnicode(),
- Newpath.GetUnicode()
- );
- }
-
- lastError = GetLastError();
- }
- EX_CATCH_HRESULT(hr);
- END_SO_INTOLERANT_CODE
-
- if (hr != S_OK )
- {
- SetLastError(hr);
- }
- else if(ret == FALSE)
- {
- SetLastError(lastError);
- }
-
- return ret;
-}
-
BOOL
MoveFileExWrapper(
_In_ LPCWSTR lpExistingFileName,
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-04 17:49:12 +0000