From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 21 Nov 2016 08:54:08 +0000 (+0100)
Subject: Merge pull request #3406 from alexanderkyte/mobile_static_default
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=cfeadc51e89f1af952323bb2779066d6813a54ec

Merge pull request #3406 from alexanderkyte/mobile_static_default

[runtime] Default mobile_static AOT type to FullAOT
---

cfeadc51e89f1af952323bb2779066d6813a54ec
diff --cc configure.ac
index 97b62853b8c,ef3e89663e9..7021be1ecfb
--- a/configure.ac
+++ b/configure.ac
@@@ -833,29 -840,29 +833,33 @@@ elif test x$with_runtime_preset = xbitc
  
     AOT_BUILD_FLAGS="--aot=llvmonly,$INVARIANT_AOT_OPTIONS"
     AOT_RUN_FLAGS="--llvmonly"
 +elif test x$with_runtime_preset = xhybrid; then
 +   DISABLE_MCS_DOCS_default=yes
 +   with_mobile_default=yes
 +   TEST_PROFILE=mobile 
 +   enable_llvm_default=yes
 +
 +   mono_feature_disable_com='yes'
 +   mono_feature_disable_remoting='yes'
 +   mono_feature_disable_appdomains='yes'
 +
 +   AOT_BUILD_FLAGS="--aot=hybrid,$INVARIANT_AOT_OPTIONS"
 +   AOT_RUN_FLAGS="--hybrid-aot"
  else
     with_profile4_x_default=yes
 -   with_monodroid_default=no
 -   with_monotouch_default=no
 -   with_monotouch_watch_default=no
 -   with_monotouch_tv_default=no
 -   with_bitcode_default=no
 -   with_xammac_default=no
 -   with_mobile_static_default=no
 -   with_cooperative_gc_default=no
  fi
  
- if test "x$AOT_BUILD_FLAGS" != "x"; then :
-    AC_SUBST(AOT_BUILD_FLAGS)
-    AC_SUBST(AOT_RUN_FLAGS)
-    # For llvmonlycheck + fullaotcheck
-    AC_SUBST(INVARIANT_AOT_OPTIONS)
+ # Have a default AOT mode for mobile_static
+ if test "x$AOT_BUILD_FLAGS" = "x"; then :
+    AOT_BUILD_FLAGS="--aot=full,$INVARIANT_AOT_OPTIONS"
+    AOT_RUN_FLAGS="--full-aot"
  fi
  
+ AC_SUBST(AOT_BUILD_FLAGS)
+ AC_SUBST(AOT_RUN_FLAGS)
+ # For llvmonlycheck + fullaotcheck
+ AC_SUBST(INVARIANT_AOT_OPTIONS)
+ 
  AC_SUBST(TEST_PROFILE)
  
  if test "x$with_profile4_x" = "xdefault"; then