[mobile_static] Make preset AOT_RUN_FLAGS and AOT_BUILD_FLAGS available to /mono

diff --git a/configure.ac b/configure.ac
index 0930a431abaebcf0602fcbe87ccb18c85f26865b..f4b2a3ac453b175796d89be0fb8f3e532ddb2731 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -748,6 +748,9 @@ dnl
 TEST_PROFILE=default
 enable_llvm_default=no
 
+AOT_BUILD_FLAGS_PREFIX=
+INVARIANT_AOT_OPTIONS=nimt-trampolines=900,ntrampolines=8000,nrgctx-fetch-trampolines=256,ngsharedvt-trampolines=2800
+
 if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
    DISABLE_MCS_DOCS_default=yes
    with_profile4_x_default=no
@@ -792,6 +795,9 @@ elif test x$with_runtime_preset = xmobile_static; then
    with_bitcode_default=no
    with_cooperative_gc_default=no
    TEST_PROFILE=mobile_static 
+
+   AOT_BUILD_FLAGS_PREFIX='-O=gsharedvt --aot=full,'
+   AOT_RUN_FLAGS=--full-aot
 elif test x$with_runtime_preset = xbitcode_mobile_static; then
    DISABLE_MCS_DOCS_default=yes
    with_profile4_x_default=no
@@ -805,7 +811,9 @@ elif test x$with_runtime_preset = xbitcode_mobile_static; then
    with_cooperative_gc_default=yes
    TEST_PROFILE=mobile_static 
    enable_llvm_default=yes
-   MONO_LLVMONLY=yes
+
+   AOT_BUILD_FLAGS_PREFIX=--aot=llvmonly,
+   AOT_RUN_FLAGS=--llvmonly
 else
    with_profile4_x_default=yes
    with_monodroid_default=no
@@ -818,6 +826,11 @@ else
    with_cooperative_gc_default=no
 fi
 
+AOT_BUILD_FLAGS=$AOT_BUILD_FLAGS_PREFIX$INVARIANT_AOT_OPTIONS
+
+AC_SUBST(AOT_BUILD_FLAGS)
+AC_SUBST(AOT_RUN_FLAGS)
+
 AC_SUBST(TEST_PROFILE)
 
 if test "x$with_profile4_x" = "xdefault"; then
@@ -854,7 +867,7 @@ AM_CONDITIONAL(BITCODE, test "x$with_bitcode" = "xyes")
 AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
 AM_CONDITIONAL(INSTALL_MOBILE_STATIC, [test "x$with_mobile_static" != "xno"])
 
-AC_SUBST(MONO_LLVMONLY)
+AC_SUBST(INSTALL_MOBILE_STATIC)
 
 AC_SUBST(BITCODE)
 
@@ -4226,8 +4239,9 @@ fi
       echo "BCL_OPTIMIZE = 1" >> $srcdir/$mcsdir/build/config.make
     fi
 
-    if test "x$MONO_LLVMONLY" = "xyes" ; then
-      echo "MONO_LLVMONLY = 1" >> $srcdir/$mcsdir/build/config.make
+    if test "x$AOT_BUILD_FLAGS_PREFIX" != "x" ; then
+      echo "AOT_RUN_FLAGS = $AOT_RUN_FLAGS" >> $srcdir/$mcsdir/build/config.make
+      echo "AOT_BUILD_FLAGS = $AOT_BUILD_FLAGS" >> $srcdir/$mcsdir/build/config.make
     fi
 
   fi

diff --git a/mcs/build/profiles/mobile_static.make b/mcs/build/profiles/mobile_static.make
index 5663124343ac69dca38e1601b358c6ae24f01eec..d9ff3b67dc9334f4b6727536b33ef219a08db150 100644 (file)
--- a/mcs/build/profiles/mobile_static.make
+++ b/mcs/build/profiles/mobile_static.make
@@ -43,17 +43,5 @@ NO_VTS_TEST = yes
 # Note need for trailing comma. If you add, keep it
 PROFILE_TEST_HARNESS_EXCLUDES = MobileNotWorking,PKITS,
 
-ifndef MONO_DISABLE_GSHAREDVT
-GSHAREDVT_FLAG = -O=gsharedvt
-endif
-
-ifneq ($(MONO_LLVMONLY),)
-AOT_BUILD_FLAGS_PREFIX = --aot=llvmonly,
-AOT_RUN_FLAGS =  --llvmonly
-else
-AOT_BUILD_FLAGS_PREFIX = $(GSHAREDVT_FLAG) --aot=full,
-AOT_RUN_FLAGS = --full-aot
-endif
-
 ALWAYS_AOT = yes