summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorRahul Kumar <rahku@microsoft.com>2016-04-19 21:22:23 (GMT)
committerRahul Kumar <rahku@microsoft.com>2016-04-26 17:12:06 (GMT)
commit27fc507393a641542a939168b41585895b6b4fc2 (patch)
tree4e979ea708fe9af0987087a155cf27135e049e97 /src/tools
parent5fe61b36cc72d43263fc892c754bb9f46acb5ef5 (diff)
downloadcoreclr-27fc507393a641542a939168b41585895b6b4fc2.zip
coreclr-27fc507393a641542a939168b41585895b6b4fc2.tar.gz
coreclr-27fc507393a641542a939168b41585895b6b4fc2.tar.bz2
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/tools')
-rw-r--r--src/tools/GenClrDebugResource/CMakeLists.txt6
-rw-r--r--src/tools/InjectResource/CMakeLists.txt8
2 files changed, 3 insertions, 11 deletions
diff --git a/src/tools/GenClrDebugResource/CMakeLists.txt b/src/tools/GenClrDebugResource/CMakeLists.txt
index c30f391..ad2598a 100644
--- a/src/tools/GenClrDebugResource/CMakeLists.txt
+++ b/src/tools/GenClrDebugResource/CMakeLists.txt
@@ -3,9 +3,5 @@ add_executable(GenClrDebugResource GenClrDebugResource.cpp)
target_link_libraries(GenClrDebugResource
${STATIC_MT_CRT_LIB}
+ ${STATIC_MT_VCRT_LIB}
)
-
-# 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 f859306..a4fd538 100644
--- a/src/tools/InjectResource/CMakeLists.txt
+++ b/src/tools/InjectResource/CMakeLists.txt
@@ -6,9 +6,5 @@ add_executable(InjectResource InjectResource.cpp)
target_link_libraries(InjectResource
${STATIC_MT_CRT_LIB}
-)
-
-# 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
+ ${STATIC_MT_VCRT_LIB}
+) \ No newline at end of file