Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Henry <luhenry@microsoft.com>2018-04-12 00:27:15 +0300
committerGitHub <noreply@github.com>2018-04-12 00:27:15 +0300
commit4f2522e6f4b177f0c5e97cc9847c321543292bbd (patch)
tree37b05170e6c13f7ed01f0278f44afce031d97224 /configure.ac
parentaa729d19cbcbb7b7d22a2b8d0a18085173e78936 (diff)
[ci] Add {,hybrid,full}aot_llvm presets to make sure we compile with LLVM (#8053)
* [ci] Add {,hybrid,full}aot_llvm presets to make sure we compile with LLVM * [configure] Rename runtime_preset to runtime-preset * [bcl] Make sure we build the testing_aot_{hybrid,full} profiles when building all profiles * [test-runner] Factor test-runner parameters for picking up and passing arguments to the runtime * [hybridaot] Fix testing_aot_hybrid build * [mini-llvm-aot] Fix common race condition in parallel builds due to common defaults.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac46
1 files changed, 38 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index c403d3dfdc9..62e121154e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -997,7 +997,7 @@ AC_ARG_WITH(unreal, [ --with-unreal=yes,no If you w
AC_ARG_WITH(wasm, [ --with-wasm=yes,no If you want to build the WebAssembly (defaults to no)], [], [with_wasm=default])
-AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,aot,hybridaot,fullaot,bitcode,unreal Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
+AC_ARG_WITH(runtime-preset, [ --with-runtime-preset=net_4_x,all,aot,aot_llvm,hybridaot,hybridaot_llvm,fullaot,fullaot_llvm,bitcode,unreal Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x])
AC_ARG_WITH(spectre-mitigation, [ --with-spectre-mitigation=yes,no If you want to build the runtime with compiler flags that enable Spectre mitigation (defaults to no)], [], [with_spectre_mitigation=default])
AC_ARG_WITH(spectre-indirect-branch-choice, [ --with-spectre-indirect-branch-choice=keep,thunk,inline,extern Convert indirect branches to the specified kind of thunk (defaults to inline)], [], [with_spectre_indirect_branch_choice=inline])
AC_ARG_WITH(spectre-function-return-choice, [ --with-spectre-function-return-choice=keep,thunk,inline,extern Convert function return instructions to the specified kind of thunk (defaults to inline)], [], [with_spectre_function_return_choice=inline])
@@ -1086,6 +1086,25 @@ elif test x$with_runtime_preset = xall; then
with_orbis_default=yes
with_unreal_default=yes
with_wasm_default=yes
+ with_testing_aot_hybrid_default=yes
+ with_testing_aot_full_default=yes
+elif test x$with_runtime_preset = xbitcode; then
+ DISABLE_MCS_DOCS_default=yes
+ with_testing_aot_full_default=yes
+ with_bitcode_default=yes
+ with_cooperative_gc_default=yes
+ TEST_PROFILE=testing_aot_full
+ enable_llvm_default=yes
+
+ mono_feature_disable_com='yes'
+ mono_feature_disable_remoting='yes'
+ mono_feature_disable_reflection_emit_save='yes'
+ mono_feature_disable_reflection_emit='yes'
+ mono_feature_disable_appdomains='yes'
+
+ AOT_BUILD_FLAGS="--runtime=mobile --aot=llvmonly,$INVARIANT_AOT_OPTIONS"
+ AOT_RUN_FLAGS="--runtime=mobile --llvmonly"
+ AOT_MODE="llvmonly"
elif test x$with_runtime_preset = xfullaot; then
DISABLE_MCS_DOCS_default=yes
with_testing_aot_full_default=yes
@@ -1100,13 +1119,10 @@ elif test x$with_runtime_preset = xfullaot; then
AOT_BUILD_FLAGS="--runtime=mobile -O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--runtime=mobile --full-aot"
AOT_MODE="full"
-elif test x$with_runtime_preset = xbitcode; then
+elif test x$with_runtime_preset = xfullaot_llvm; then
DISABLE_MCS_DOCS_default=yes
with_testing_aot_full_default=yes
- with_bitcode_default=yes
- with_cooperative_gc_default=yes
TEST_PROFILE=testing_aot_full
- enable_llvm_default=yes
mono_feature_disable_com='yes'
mono_feature_disable_remoting='yes'
@@ -1114,9 +1130,9 @@ elif test x$with_runtime_preset = xbitcode; then
mono_feature_disable_reflection_emit='yes'
mono_feature_disable_appdomains='yes'
- AOT_BUILD_FLAGS="--runtime=mobile --aot=llvmonly,$INVARIANT_AOT_OPTIONS"
- AOT_RUN_FLAGS="--runtime=mobile --llvmonly"
- AOT_MODE="llvmonly"
+ AOT_BUILD_FLAGS="--runtime=mobile -O=gsharedvt --llvm --aot=full,$INVARIANT_AOT_OPTIONS"
+ AOT_RUN_FLAGS="--runtime=mobile --full-aot"
+ AOT_MODE="full"
elif test x$with_runtime_preset = xhybridaot; then
DISABLE_MCS_DOCS_default=yes
with_testing_aot_hybrid_default=yes
@@ -1124,6 +1140,13 @@ elif test x$with_runtime_preset = xhybridaot; then
AOT_BUILD_FLAGS="--runtime=mobile --aot=hybrid,$INVARIANT_AOT_OPTIONS"
AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot"
+elif test x$with_runtime_preset = xhybridaot_llvm; then
+ DISABLE_MCS_DOCS_default=yes
+ with_testing_aot_hybrid_default=yes
+ TEST_PROFILE=testing_aot_hybrid
+
+ AOT_BUILD_FLAGS="--runtime=mobile --llvm --aot=hybrid,$INVARIANT_AOT_OPTIONS"
+ AOT_RUN_FLAGS="--runtime=mobile --hybrid-aot"
elif test x$with_runtime_preset = xaot; then
with_profile4_x_default=yes
@@ -1131,6 +1154,13 @@ elif test x$with_runtime_preset = xaot; then
AOT_RUN_FLAGS=""
DISABLE_MCS_DOCS_default=yes
+elif test x$with_runtime_preset = xaot_llvm; then
+ with_profile4_x_default=yes
+
+ AOT_BUILD_FLAGS="--llvm --aot=$INVARIANT_AOT_OPTIONS"
+ AOT_RUN_FLAGS=""
+
+ DISABLE_MCS_DOCS_default=yes
elif test x$with_runtime_preset = xwinaot; then
DISABLE_MCS_DOCS_default=yes
with_winaot_default=yes