diff options
author | Jonghyun Park <parjong@gmail.com> | 2016-06-02 22:57:13 +0900 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-06-02 06:57:13 -0700 |
commit | c4075441c86e1073e2f48e61be3ed5c58f6d27d0 (patch) | |
tree | 94373254790cff9ed23d4e00eb3c75711ceb86c7 /clrdefinitions.cmake | |
parent | 21751dbaa36ffb621e79b4cfeb5a7db00d397511 (diff) | |
download | coreclr-c4075441c86e1073e2f48e61be3ed5c58f6d27d0.tar.gz coreclr-c4075441c86e1073e2f48e61be3ed5c58f6d27d0.tar.bz2 coreclr-c4075441c86e1073e2f48e61be3ed5c58f6d27d0.zip |
Enable FEATURE_HIJACK for ARM (#5404)
Currently, FEATURE_HIJACK is disabled for ARM, and thus CoreCLR got
stuck if GC is invoked from JITed code.
This commit attempts to port FEATURE_HIJACK from ARM (windows) in order
to fix #5403.
Diffstat (limited to 'clrdefinitions.cmake')
-rw-r--r-- | clrdefinitions.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 0b34e57d37..ea656828a7 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -114,9 +114,9 @@ if(CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) add_definitions(-DFEATURE_EXCEPTIONDISPATCHINFO) # NetBSD doesn't implement this feature -if(NOT CLR_CMAKE_PLATFORM_UNIX_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) +if(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) add_definitions(-DFEATURE_HIJACK) -endif(NOT CLR_CMAKE_PLATFORM_UNIX_ARM AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) +endif(NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) add_definitions(-DFEATURE_HOST_ASSEMBLY_RESOLVER) add_definitions(-DFEATURE_ICASTABLE) if (CLR_CMAKE_PLATFORM_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) |