From: Steve MacLean Date: Wed, 27 Sep 2017 17:38:05 +0000 (-0400) Subject: [ARM64/Unix] Enable FEATURE_EVENT_TRACE (#14176) X-Git-Tag: accepted/tizen/base/20180629.140029~1044 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa30eeba02ad0a5ffeb1122467c5cb47bac285a8;p=platform%2Fupstream%2Fcoreclr.git [ARM64/Unix] Enable FEATURE_EVENT_TRACE (#14176) * [ARM64/Unix] Enable FEATURE_EVENT_TRACE * [Arm64] Remove _PlatformDoesNotSupportEventTrace --- diff --git a/clrfeatures.cmake b/clrfeatures.cmake index 4ad29e4..2c22a9d 100644 --- a/clrfeatures.cmake +++ b/clrfeatures.cmake @@ -19,6 +19,8 @@ if(NOT DEFINED FEATURE_EVENT_TRACE) set(FEATURE_EVENT_TRACE 1) elseif(CLR_CMAKE_TARGET_ARCH_ARM) set(FEATURE_EVENT_TRACE 1) + elseif(CLR_CMAKE_TARGET_ARCH_ARM64) + set(FEATURE_EVENT_TRACE 1) endif() endif(CLR_CMAKE_PLATFORM_LINUX) endif(NOT DEFINED FEATURE_EVENT_TRACE) diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index dd34d3d..69ebb80 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -7,7 +7,6 @@ <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'arm64'">true <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'arm64'">true <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true <_PlatformDoesNotSupportSosPlugin Condition="'$(_runtimeOSFamily)' == 'android'">true <_PlatformDoesNotSupportSosPlugin Condition="'$(Platform)' == 'arm64'">true