diff options
| author | Rahul Kumar <rahku@microsoft.com> | 2016-04-19 14:22:23 -0700 |
|---|---|---|
| committer | Rahul Kumar <rahku@microsoft.com> | 2016-04-26 10:12:06 -0700 |
| commit | 27fc507393a641542a939168b41585895b6b4fc2 (patch) | |
| tree | 4e979ea708fe9af0987087a155cf27135e049e97 /src/dlls | |
| parent | 5fe61b36cc72d43263fc892c754bb9f46acb5ef5 (diff) | |
| download | coreclr-27fc507393a641542a939168b41585895b6b4fc2.tar.gz coreclr-27fc507393a641542a939168b41585895b6b4fc2.tar.bz2 coreclr-27fc507393a641542a939168b41585895b6b4fc2.zip | |
This has following changes:
1. Update arm64 toolset to latest.
2. Link against ucrt.
3. Fix tls offsets which have changed due to updated toolset
4. Fix source code in decimal.cpp to avoid integer overflow. Result of signed integer overlfow is undefined in C++.
5. Enable build of sos which can be loaded in arm64 windbg
6. Add nop to empty assembly marker methods as new toolset generates invalid .pdata for them.
Diffstat (limited to 'src/dlls')
| -rw-r--r-- | src/dlls/dbgshim/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/dlls/mscordbi/CMakeLists.txt | 8 |
3 files changed, 3 insertions, 23 deletions
diff --git a/src/dlls/dbgshim/CMakeLists.txt b/src/dlls/dbgshim/CMakeLists.txt index c3ebaf5d06..5024642ca5 100644 --- a/src/dlls/dbgshim/CMakeLists.txt +++ b/src/dlls/dbgshim/CMakeLists.txt @@ -44,6 +44,7 @@ if(WIN32) list(APPEND DBGSHIM_LIBRARIES kernel32.lib ${STATIC_MT_CRT_LIB} + ${STATIC_MT_VCRT_LIB} uuid.lib user32.lib advapi32.lib @@ -52,14 +53,6 @@ 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 4a80ef46e7..8c2cec1b81 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -86,15 +86,8 @@ if(WIN32) uuid.lib user32.lib ${STATIC_MT_CRT_LIB} + ${STATIC_MT_VCRT_LIB} ) - - # ARM64_TODO: Enable this for Windows Arm64 - if (NOT CLR_CMAKE_TARGET_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 b8dfa71ca6..28b006b58c 100644 --- a/src/dlls/mscordbi/CMakeLists.txt +++ b/src/dlls/mscordbi/CMakeLists.txt @@ -62,15 +62,9 @@ if(WIN32) user32.lib version.lib ${STATIC_MT_CRT_LIB} + ${STATIC_MT_VCRT_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) |