X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=clrfeatures.cmake;h=88b9cdd6b73bcbecc061f5af34ad898ba262e76d;hb=0a47706f8eccd58c28b3d921f781c7909e7461bd;hp=3d5d155c3a9e4e691127d01a248ce73710fe41a3;hpb=52098963e7bc7cc280ebccf3c20df5e2aa15d3c8;p=platform%2Fupstream%2Fcoreclr.git

diff --git a/clrfeatures.cmake b/clrfeatures.cmake
index 3d5d155..88b9cdd 100644
--- a/clrfeatures.cmake
+++ b/clrfeatures.cmake
@@ -1,27 +1,15 @@
 if(CLR_CMAKE_TARGET_TIZEN_LINUX)
-  set(FEATURE_EVENT_TRACE 0)
   set(FEATURE_GDBJIT_LANGID_CS 1)
 endif()
 
-if(FEATURE_STANDALONE_GC_ONLY)
-  set(FEATURE_EVENT_TRACE 0)
-  set(FEATURE_APPDOMAIN_RESOURCE_MONITORING 0)
-endif()
-
 if(NOT DEFINED FEATURE_EVENT_TRACE)
-  if (WIN32)
-    set(FEATURE_EVENT_TRACE 1)
-  endif()
-
-  if(CLR_CMAKE_PLATFORM_LINUX)
-    if(CLR_CMAKE_TARGET_ARCH_AMD64)
-      set(FEATURE_EVENT_TRACE 1)
-    elseif(CLR_CMAKE_TARGET_ARCH_ARM)
-      set(FEATURE_EVENT_TRACE 1)
-    endif()
-  endif(CLR_CMAKE_PLATFORM_LINUX)
+  set(FEATURE_EVENT_TRACE 1)
 endif(NOT DEFINED FEATURE_EVENT_TRACE)
 
+if(NOT DEFINED FEATURE_PERFTRACING AND FEATURE_EVENT_TRACE)
+  set(FEATURE_PERFTRACING 1)
+endif(NOT DEFINED FEATURE_PERFTRACING AND FEATURE_EVENT_TRACE)
+
 if(NOT DEFINED FEATURE_DBGIPC)
   if(CLR_CMAKE_PLATFORM_UNIX AND (NOT CLR_CMAKE_PLATFORM_ANDROID))
     set(FEATURE_DBGIPC 1)
@@ -31,15 +19,11 @@ endif(NOT DEFINED FEATURE_DBGIPC)
 if(NOT DEFINED FEATURE_INTERPRETER)
   set(FEATURE_INTERPRETER 0)
 endif(NOT DEFINED FEATURE_INTERPRETER)
-if(NOT WIN32)
-  if(NOT DEFINED FEATURE_NI_BIND_FALLBACK)
-    if(NOT CLR_CMAKE_TARGET_ARCH_AMD64 AND NOT CLR_CMAKE_TARGET_ARCH_ARM64)
-      set(FEATURE_NI_BIND_FALLBACK 1)
-    endif()
-  endif(NOT DEFINED FEATURE_NI_BIND_FALLBACK)
-endif(NOT WIN32)
 
 if(NOT DEFINED FEATURE_APPDOMAIN_RESOURCE_MONITORING)
   set(FEATURE_APPDOMAIN_RESOURCE_MONITORING 1)
 endif(NOT DEFINED FEATURE_APPDOMAIN_RESOURCE_MONITORING)
 
+if(NOT DEFINED FEATURE_STANDALONE_GC)
+  set(FEATURE_STANDALONE_GC 1)
+endif(NOT DEFINED FEATURE_STANDALONE_GC)