diff options
author | Sergey Andreenko <seandree@microsoft.com> | 2019-02-15 14:03:47 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-02-15 14:03:47 -0800 |
commit | 6f1bdfffb77ba1c95f46e16a7eeff3cfaf2f2f1f (patch) | |
tree | 439f7cac3298df1c53a1a8267a445c2bc99f5cf0 /configurecompiler.cmake | |
parent | 342c80a0c400e85e0507adaefae47f737c48f06f (diff) | |
download | coreclr-6f1bdfffb77ba1c95f46e16a7eeff3cfaf2f2f1f.tar.gz coreclr-6f1bdfffb77ba1c95f46e16a7eeff3cfaf2f2f1f.tar.bz2 coreclr-6f1bdfffb77ba1c95f46e16a7eeff3cfaf2f2f1f.zip |
Disable arm64 contracts. (#22605)
* Fix ifdef for `g_DbgSuppressAllocationAsserts`.
It needs to be defined under `FEATURE_INTEROP_DEBUGGING`.
* Unify contracts disabling for UNIX/ARM.
It also disables some parts that were disabled for ARM, but not for UNIX.
It fixes the difference that we see between ARM32 and ARM64 Unix Checked.
* Disable contracts on arm64.
FIxes the difference that we see between windows arm32 and arm64 in checked/debug builds.
* Revert CoreFX arm64 timeout change.
That is no longer necessary.
* Reenable arm64 corefx jobs.
They should not fail with timeouts anymore.
* Don't allow `g_DbgSuppressAllocationAsserts` defnition in release builds.
* delete AssertAllocationAllowed
Diffstat (limited to 'configurecompiler.cmake')
-rw-r--r-- | configurecompiler.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake index 709994db1d..dd0ee96a68 100644 --- a/configurecompiler.cmake +++ b/configurecompiler.cmake @@ -438,6 +438,7 @@ if (CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fstack-protector-strong) endif(CLR_CMAKE_PLATFORM_DARWIN) + # Contracts are disabled on UNIX. add_definitions(-DDISABLE_CONTRACTS) if (CLR_CMAKE_WARNINGS_ARE_ERRORS) @@ -563,6 +564,11 @@ if (WIN32) set(CMAKE_ASM_MASM_FLAGS "${CMAKE_ASM_MASM_FLAGS} /ZH:SHA_256") + if (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64) + # Contracts work too slow on ARM/ARM64 DEBUG/CHECKED. + add_definitions(-DDISABLE_CONTRACTS) + endif (CLR_CMAKE_TARGET_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_ARM64) + endif (WIN32) if(CLR_CMAKE_ENABLE_CODE_COVERAGE) |