X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.ac;h=21db9420c474e44b3e974d7e4b150795ea41094e;hb=4e441ecc2a8b9e66459e1df19ea5804e1fea668e;hp=96616f87fc23a27e5d698e09a683a338554d1fd8;hpb=028fe452437256416d685fc2e4403e8dbf4f5dfc;p=mono.git diff --git a/configure.ac b/configure.ac index 96616f87fc2..21db9420c47 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ #AC_PREREQ([2.62]) # when bumping version number below, keep it in sync with man/mono.1 too -AC_INIT(mono, [4.5.2], +AC_INIT(mono, [4.7.0], [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono]) AC_CONFIG_SRCDIR([README.md]) @@ -353,6 +353,18 @@ AM_CONDITIONAL(PLATFORM_DARWIN, test x$host_darwin = xyes) AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes) AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes) +if test -z "$PLATFORM_DARWIN_TRUE"; then : +PLATFORM_AOT_SUFFIX=.dylib +fi + +if test -z "$PLATFORM_LINUX_TRUE"; then : +PLATFORM_AOT_SUFFIX=.so +fi + +AC_SUBST(PLATFORM_AOT_SUFFIX) + +## PLATFORM_AOT_SUFFIX not so simple for windows :-) + AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC AC_CHECK_TOOL(CXX, g++, g++) @@ -520,6 +532,9 @@ if test x"$GCC" = xyes; then # We rely on signed overflow to behave CFLAGS="$CFLAGS -fwrapv" + # We rely on zero length arrays in structs + CFLAGS="$CFLAGS -Wno-zero-length-array" + CFLAGS="$CFLAGS -DMONO_DLL_EXPORT" if test x"$disable_visibility_hidden" = xno; then # Don't export any symbols by default @@ -727,6 +742,202 @@ AC_ARG_ENABLE(system-aot, [ --enable-system-aot Enable the Ahead-Of-Time compi DISABLED_FEATURES=none +# +# Set the build profiles and options before things which use them +# + +AC_ARG_WITH(profile4_x, [ --with-profile4=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4_x=default]) +AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=default]) +AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=default]) +AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to build the Xamarin.WatchOS assemblies (defaults to no)],[], [with_monotouch_watch=default]) +AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=default]) +AC_ARG_WITH(bitcode, [ --with-bitcode=yes,no If bitcode is enabled (defaults to no)], [], [with_bitcode=default]) +AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=default]) +AC_ARG_WITH(mobile_static, [ --with-mobile_static=yes,no If you want to build the mobile_static assemblies (defaults to no)], [], [with_mobile_static=default]) + +AC_ARG_WITH(runtime_preset, [ --with-runtime_preset=net_4_x,all,mobile_static,bitcode_mobile_static Which default profile to build (defaults to net_4_x)], [], [with_runtime_preset=net_4_x]) + +dnl +dnl Profile defaults +dnl +TEST_PROFILE=default +enable_llvm_default=no + +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 + with_monodroid_default=no + with_monotouch_default=no + with_monotouch_watch_default=no + with_monotouch_tv_default=no + with_xammac_default=no + with_mobile_static_default=no + with_bitcode_default=no + with_cooperative_gc_default=no +elif test x$with_runtime_preset = xnet_4_x; then + with_cooperative_gc_default=no + with_profile4_x_default=yes + with_monodroid_default=no + with_monotouch_default=no + with_monotouch_watch_default=no + with_monotouch_tv_default=no + with_xammac_default=no + with_mobile_static_default=no + with_bitcode_default=no +elif test x$with_runtime_preset = xall; then + with_cooperative_gc_default=no + with_profile4_x_default=yes + with_monodroid_default=yes + with_monotouch_default=yes + with_monotouch_watch_default=yes + with_monotouch_tv_default=yes + with_xammac_default=yes + with_mobile_static_default=no + with_bitcode_default=no +elif test x$with_runtime_preset = xmobile_static; then + DISABLE_MCS_DOCS_default=yes + with_cooperative_gc_default=no + with_profile4_x_default=no + with_monodroid_default=no + with_monotouch_default=no + with_monotouch_watch_default=no + with_monotouch_tv_default=no + with_xammac_default=no + with_mobile_static_default=yes + with_bitcode_default=no + with_cooperative_gc_default=no + TEST_PROFILE=mobile_static + + 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="-O=gsharedvt --aot=full,$INVARIANT_AOT_OPTIONS" + 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 + with_monodroid_default=no + with_monotouch_default=no + with_monotouch_watch_default=no + with_monotouch_tv_default=no + with_xammac_default=no + with_mobile_static_default=yes + with_bitcode_default=yes + with_cooperative_gc_default=yes + TEST_PROFILE=mobile_static + 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="--aot=llvmonly,$INVARIANT_AOT_OPTIONS" + AOT_RUN_FLAGS="--llvmonly" +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) +fi + +AC_SUBST(TEST_PROFILE) + +if test "x$with_profile4_x" = "xdefault"; then + with_profile4_x=$with_profile4_x_default +fi +if test "x$with_monodroid" = "xdefault"; then + with_monodroid=$with_monodroid_default +fi +if test "x$with_monotouch" = "xdefault"; then + with_monotouch=$with_monotouch_default +fi +if test "x$with_monotouch_watch" = "xdefault"; then + with_monotouch_watch=$with_monotouch_watch_default +fi +if test "x$with_monotouch_tv" = "xdefault"; then + with_monotouch_tv=$with_monotouch_tv_default +fi +if test "x$with_bitcode" = "xdefault"; then + with_bitcode=$with_bitcode_default +fi +if test "x$with_xammac" = "xdefault"; then + with_xammac=$with_xammac_default +fi +if test "x$with_mobile_static" = "xdefault"; then + with_mobile_static=$with_mobile_static_default +fi + +AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = "xyes"]) +AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"]) +AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"]) +AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"]) +AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"]) +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(INSTALL_MOBILE_STATIC) + +default_profile=net_4_x +if test -z "$INSTALL_MONODROID_TRUE"; then : + default_profile=monodroid +fi +if test -z "$INSTALL_MONOTOUCH_TRUE"; then : + default_profile=monotouch +fi +if test -z "$INSTALL_XAMMAC_TRUE"; then : + default_profile=xammac +fi +if test -z "$INSTALL_MOBILE_STATIC_TRUE"; then : + default_profile=mobile_static +fi +if test -z "$INSTALL_4_x_TRUE"; then : + default_profile=net_4_x +fi +DEFAULT_PROFILE=$default_profile +AC_SUBST(DEFAULT_PROFILE) + +# +# End build profile configuration +# + +if test x$USE_NLS = xprofile_default; then + +if test x$host_darwin = xyes; then +# We make the default value for USE_NLS +# "no" on OSX because it isn't available on most +# default OSX installs. The most common configurations will +# all disable it, so this saves us typing. + USE_NLS=no + AC_SUBST([USE_NLS]) + AC_MSG_RESULT([$USE_NLS]) +else + USE_NLS=yes + AC_SUBST([USE_NLS]) + AC_MSG_RESULT([$USE_NLS]) +fi + +fi + AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems. LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier, reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting, @@ -2577,13 +2788,17 @@ dnl ************** dnl *** LLVM *** dnl ************** -AC_ARG_ENABLE(llvm,[ --enable-llvm Enable the LLVM back-end], enable_llvm=$enableval, enable_llvm=no) +AC_ARG_ENABLE(llvm,[ --enable-llvm Enable the LLVM back-end], enable_llvm=$enableval, enable_llvm=default) AC_ARG_ENABLE(loadedllvm,[ --enable-loadedllvm Load the LLVM back-end dynamically], enable_llvm=$enableval && enable_loadedllvm=$enableval, enable_loadedllvm=no) AC_ARG_ENABLE(llvm-version-check,[ --enable-llvm-version-check Check that the LLVM matches the version expected by mono], enable_llvm_version_check=$enableval, enable_llvm_version_check=no) AC_ARG_ENABLE(llvm-runtime,[ --enable-llvm-runtime Enable runtime support for llvmonly code], enable_llvm_runtime=$enableval, enable_llvm_runtime=no) AC_ARG_WITH(llvm, [ --with-llvm= Enable the LLVM back-end], enable_llvm=yes,) +if test "x$enable_llvm" = "xdefault"; then + enable_llvm=$enable_llvm_default +fi + if test "x$enable_llvm" = "xyes"; then if test "x$with_llvm" != "x"; then LLVM_CONFIG=$with_llvm/bin/llvm-config @@ -2641,13 +2856,12 @@ if test "x$enable_llvm" = "xyes"; then LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -` llvm_jit_supported=yes llvm_jit_libs="jit mcjit $llvm_codegen" - if test $llvm_api_version -gt 100; then - # Based on llvm 3.9, only aot is currently supported - llvm_jit_libs="orcjit $llvm_codegen" - elif test "x$host" != "x$target"; then + if test "x$host" != "x$target"; then # No need for jit libs llvm_jit_supported=no llvm_jit_libs="" + elif test $llvm_api_version -gt 100; then + llvm_jit_libs="orcjit $llvm_codegen" fi LLVM_LIBS=`$LLVM_CONFIG --libs analysis core bitwriter $llvm_jit_libs` if test "x$LLVM_LIBS" = "x"; then @@ -3262,14 +3476,22 @@ dnl dnl Simple Generational checks (sgen) dnl SGEN_DEFINES= -AC_ARG_WITH(sgen, [ --with-sgen=yes,no Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=yes]) +AC_ARG_WITH(sgen, [ --with-sgen=yes,no Extra Generational GC, default=yes],[buildsgen=$with_sgen],[buildsgen=yes]) +AC_ARG_WITH(sgen-default-concurrent, [ --with-sgen-default-concurrent=yes,no Use Concurrent GC, default=no],[],[with_sgen_default_concurrent=no]) if test x$buildsgen = xyes; then AC_DEFINE(HAVE_MOVING_COLLECTOR, 1, [Moving collector]) SGEN_DEFINES="-DHAVE_SGEN_GC" + + conc_gc_msg="" + if test x$with_sgen_default_concurrent != xno; then + AC_DEFINE(HAVE_CONC_GC_AS_DEFAULT, 1, [Defaults to concurrent GC]) + conc_gc_msg=" (concurrent by default)" + fi + if test "x$gc_msg" = "x"; then - gc_msg="sgen" + gc_msg="sgen$conc_gc_msg" else - gc_msg="sgen and $gc_msg" + gc_msg="sgen$conc_gc_msg and $gc_msg" fi fi AC_SUBST(SGEN_DEFINES) @@ -3556,15 +3778,6 @@ case "x$libgc" in ;; esac -AC_ARG_WITH(profile4_x, [ --with-profile4=yes,no If you want to install the 4.6 FX (defaults to yes)], [], [with_profile4_x=yes]) -AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no]) -AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the Xamarin.iOS assemblies (defaults to no)], [], [with_monotouch=no]) -AC_ARG_WITH(monotouch_watch, [ --with-monotouch_watch=yes,no If you want to build the Xamarin.WatchOS assemblies (defaults to no)],[], [with_monotouch_watch=no]) -AC_ARG_WITH(monotouch_tv, [ --with-monotouch_tv=yes,no If you want to build the Xamarin.TVOS assemblies (defaults to no)], [], [with_monotouch_tv=no]) -AC_ARG_WITH(bitcode, [ --with-bitcode=yes,no If bitcode is enabled (defaults to no)], [], [with_bitcode=no]) -AC_ARG_WITH(xammac, [ --with-xammac=yes,no If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no]) -AC_ARG_WITH(mobile_static, [ --with-mobile_static=yes,no If you want to build the mobile_static assemblies (defaults to no)], [], [with_mobile_static=no]) - MALLOC_MEMPOOLS=no AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no Use malloc for each single mempool allocation (only for runtime debugging, defaults to no)],[ if test x$with_malloc_mempools = xyes; then @@ -3574,15 +3787,18 @@ AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no Use malloc for eac ]) -DISABLE_MCS_DOCS=no +DISABLE_MCS_DOCS=default AC_ARG_WITH(mcs_docs,[ --with-mcs-docs=yes,no If you want to build the documentation under mcs (defaults to yes)],[ if test x$with_mcs_docs != xyes; then DISABLE_MCS_DOCS=yes fi ]) -if test x$with_profile4_x != xyes; then +if test -n "$INSTALL_4_x_TRUE"; then : DISABLE_MCS_DOCS=yes fi +if test "x$DISABLE_MCS_DOCS" = "xdefault"; then + DISABLE_MCS_DOCS=$DISABLE_MCS_DOCS_default +fi AC_ARG_WITH(lazy_gc_thread_creation, [ --with-lazy-gc-thread-creation=yes|no Enable lazy runtime thread creation, embedding host must do it explicitly (defaults to no)],[ if test x$with_lazy_gc_thread_creation != xno ; then @@ -3590,11 +3806,15 @@ AC_ARG_WITH(lazy_gc_thread_creation, [ --with-lazy-gc-thread-creation=yes|no fi ], [with_lazy_gc_thread_creation=no]) -AC_ARG_WITH(cooperative_gc, [ --with-cooperative-gc=yes|no Enable cooperative stop-the-world garbage collection (sgen only) (defaults to no)],[ - if test x$with_cooperative_gc != xno ; then - AC_DEFINE(USE_COOP_GC,1,[Enable cooperative stop-the-world garbage collection.]) - fi -], [with_cooperative_gc=no]) +AC_ARG_WITH(cooperative_gc, [ --with-cooperative-gc=yes|no Enable cooperative stop-the-world garbage collection (sgen only) (defaults to no)], [], [with_cooperative_gc=default]) + +if test x$with_cooperative_gc = xdefault; then + with_cooperative_gc=$with_cooperative_gc_default +fi + +if test x$with_cooperative_gc != xno; then + AC_DEFINE(USE_COOP_GC,1,[Enable cooperative stop-the-world garbage collection.]) +fi AM_CONDITIONAL([ENABLE_COOP], [test x$with_cooperative_gc != xno]) @@ -3652,20 +3872,6 @@ else fi AC_SUBST(LIBMONO_LA) -dnl -dnl Consistency settings -dnl -if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then - DISABLE_MCS_DOCS=yes - with_profile4_x=no - with_monodroid=no - with_monotouch=no - with_monotouch_watch=no - with_monotouch_tv=no - with_xammac=no - with_mobile_static=no -fi - if test x$DISABLE_MCS_DOCS = xyes; then docs_dir="" else @@ -3678,15 +3884,6 @@ AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_bui libmono_ldflags="$libmono_ldflags $LIBS" -AM_CONDITIONAL(INSTALL_4_x, [test "x$with_profile4_x" = xyes]) -AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"]) -AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"]) -AM_CONDITIONAL(INSTALL_MONOTOUCH_WATCH, [test "x$with_monotouch_watch" != "xno"]) -AM_CONDITIONAL(INSTALL_MONOTOUCH_TV, [test "x$with_monotouch_tv" != "xno"]) -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"]) - AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC) @@ -3741,22 +3938,6 @@ else fi AC_SUBST(mono_cfg_dir) -default_profile=net_4_x -if test -z "$INSTALL_MONODROID_TRUE"; then : - default_profile=monodroid -fi -if test -z "$INSTALL_MONOTOUCH_TRUE"; then : - default_profile=monotouch -fi -if test -z "$INSTALL_XAMMAC_TRUE"; then : - default_profile=xammac -fi -if test -z "$INSTALL_4_x_TRUE"; then : - default_profile=net_4_x -fi -DEFAULT_PROFILE=$default_profile -AC_SUBST(DEFAULT_PROFILE) - AC_CONFIG_FILES([po/mcs/Makefile.in]) AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper]) @@ -3990,6 +4171,7 @@ tools/Makefile tools/locale-builder/Makefile tools/sgen/Makefile tools/monograph/Makefile +tools/pedump/Makefile runtime/Makefile msvc/Makefile po/Makefile @@ -4060,6 +4242,10 @@ fi echo "PLATFORM = darwin" >> $mcs_topdir/build/config.make fi + if test "x$PLATFORM_AOT_SUFFIX" != "x"; then + echo "PLATFORM_AOT_SUFFIX = $PLATFORM_AOT_SUFFIX" >> $mcs_topdir/build/config.make + fi + if test x$AOT_SUPPORTED = xyes -a x$enable_system_aot = xdefault; then enable_system_aot=yes fi @@ -4082,6 +4268,11 @@ fi echo "BCL_OPTIMIZE = 1" >> $srcdir/$mcsdir/build/config.make fi + if test "x$AOT_BUILD_FLAGS" != "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 ) @@ -4103,7 +4294,7 @@ echo " LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) Libraries: - .NET 4.6: $with_profile4_x + .NET 4.x: $with_profile4_x Xamarin.Android: $with_monodroid Xamarin.iOS: $with_monotouch Xamarin.WatchOS: $with_monotouch_watch