From: Zoltan Varga <vargaz@gmail.com>
Date: Sun, 7 Feb 2021 16:30:37 +0000 (-0500)
Subject: Error out if an unknown option is given in ENABLE_MINIMAL. (#47974)
X-Git-Tag: submit/tizen/20210909.063632~3395
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92b17c0a20ff9518d8a44499caf247ae06e73cbc;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Error out if an unknown option is given in ENABLE_MINIMAL. (#47974)
---

diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt
index 1a967bf..64dcb59 100644
--- a/src/mono/CMakeLists.txt
+++ b/src/mono/CMakeLists.txt
@@ -38,6 +38,9 @@ function(process_enable_minimal)
   string(REPLACE "," ";" tmp1 "${ENABLE_MINIMAL}")
   foreach(arg ${tmp1})
     string(TOUPPER "${arg}" var1)
+	if("${DISABLE_${var1}}" STREQUAL "")
+	  message(FATAL_ERROR "Unknown DISABLE_ option DISABLE_${var1}.")
+	endif()
     set(DISABLE_${var1} 1 PARENT_SCOPE)
   endforeach(arg)
 endfunction()
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index a0c092c..0b3319f 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -203,10 +203,10 @@
     </ItemGroup>
     <!-- WASM specific options -->
     <PropertyGroup Condition="'$(TargetsBrowser)' == 'true'">
-      <_MonoMinimal Condition="'$(Configuration)' == 'Release'">,assert_messages</_MonoMinimal>
+      <_MonoMinimal Condition="'$(Configuration)' == 'Release'">,debugger_agent,assert_messages</_MonoMinimal>
     </PropertyGroup>
     <ItemGroup Condition="'$(TargetsBrowser)' == 'true'">
-      <_MonoCMakeArgs Include="-DENABLE_MINIMAL=jit,portability,sgen_marksweep_conc,sgen_split_nursery,sgen_gc_bridge,sgen_toggleref,logging,shared_perfcounters,sgen_debug_helpers,sgen_binary_protocol,soft_debug,interpreter,threads,eventpipe,qcalls$(_MonoMinimal)"/>
+      <_MonoCMakeArgs Include="-DENABLE_MINIMAL=jit,portability,sgen_major_marksweep_conc,sgen_split_nursery,sgen_gc_bridge,sgen_toggleref,sgen_debug_helpers,sgen_binary_protocol,logging,shared_perfcounters,interpreter,threads,eventpipe,qcalls$(_MonoMinimal)"/>
       <_MonoCMakeArgs Include="-DENABLE_INTERP_LIB=1"/>
       <_MonoCMakeArgs Include="-DDISABLE_ICALL_TABLES=1"/>
       <_MonoCMakeArgs Include="-DDISABLE_CRASH_REPORTING=1"/>
@@ -248,7 +248,7 @@
     </ItemGroup>
     <!-- iOS device specific options -->
     <ItemGroup Condition="'$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' != 'true'">
-      <_MonoCMakeArgs Include="-DENABLE_MINIMAL=jit,portability,sgen_remset,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying,logging,shared_perfcounters" />
+      <_MonoCMakeArgs Include="-DENABLE_MINIMAL=jit,portability,logging,shared_perfcounters" />
       <_MonoCMakeArgs Include="-DENABLE_VISIBILITY_HIDDEN=1"/>
       <_MonoCMakeArgs Include="-DENABLE_LAZY_GC_THREAD_CREATION=1"/>
       <_MonoCMakeArgs Include="-DENABLE_SIGALTSTACK=0"/>
@@ -271,7 +271,7 @@
       <_MonoCMakeArgs Condition="'$(Platform)' == 'arm'" Include="-DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a" />
       <_MonoCMakeArgs Condition="'$(Platform)' == 'x86'" Include="-DCMAKE_ANDROID_ARCH_ABI=x86" />
       <_MonoCMakeArgs Condition="'$(Platform)' == 'x64'" Include="-DCMAKE_ANDROID_ARCH_ABI=x86_64" />
-      <_MonoCMakeArgs Include="-DENABLE_MINIMAL=ssa,portability,sgen_remset,logging,sgen_marksweep_par,sgen_marksweep_fixed,sgen_marksweep_fixed_par,sgen_copying" />
+      <_MonoCMakeArgs Include="-DENABLE_MINIMAL=ssa,portability,logging" />
       <_MonoCMakeArgs Include="-DENABLE_SIGALTSTACK=1"/>
       <_MonoCMakeArgs Include="-DDISABLE_CRASH_REPORTING=1"/>
       <_MonoCMakeArgs Include="-DENABLE_PERFTRACING=0"/>