X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=3843e74b1fbb1f792796a8e1c82fe384f6e4f242;hb=90f8bf7ffd9eb7f354e504b887e619b72caf7753;hp=602ea0bff319e323c41280620e2aa8beb8da2ae7;hpb=58fdac7b8a191881c721c1e04592fc4a8b4b6ab1;p=mono.git diff --git a/configure.in b/configure.in index 602ea0bff31..3843e74b1fb 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(mono,2.9) +AM_INIT_AUTOMAKE(mono,2.11) AM_MAINTAINER_MODE API_VER=2.0 @@ -86,7 +86,7 @@ case "$host" in host_win32=yes if test "x$cross_compiling" = "xno"; then target_win32=yes - if test "x$host" == "x$target"; then + if test "x$host" == "x$build"; then AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32]) fi CC="gcc -mno-cygwin -g" @@ -196,6 +196,7 @@ case "$host" in use_sigposix=yes ikvm_native=no AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support]) + AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support]) ;; *-*-hpux*) host_win32=no @@ -611,6 +612,10 @@ if test "x$enable_shared" = "xno"; then with_shared_mono=no fi +case $host in +*nacl* ) with_shared_mono=yes;; +esac + if test "x$host_win32" = "xyes"; then # Boehm GC requires the runtime to be in its own dll with_static_mono=no @@ -984,6 +989,7 @@ if test x$target_win32 = xno; then AC_CHECK_FUNCS(getpriority) AC_CHECK_FUNCS(setpriority) AC_CHECK_FUNCS(dl_iterate_phdr) + AC_CHECK_FUNCS(dladdr) AC_CHECK_FUNCS(sysconf) AC_CHECK_FUNCS(sched_setaffinity) @@ -1836,7 +1842,7 @@ try_dev_random=$enableval, try_dev_random=yes) AC_MSG_RESULT($try_dev_random) -case "{$target}" in +case "{$build}" in *-openbsd*) NAME_DEV_RANDOM="/dev/srandom" ;; @@ -1979,6 +1985,7 @@ dnl *** NaCl *** dnl ************** AC_ARG_ENABLE(nacl_codegen, [ --enable-nacl-codegen Enable Native Client code generation], enable_nacl_codegen=$enableval, enable_nacl_codegen=no) +AC_ARG_ENABLE(nacl_gc, [ --enable-nacl-gc Enable Native Client garbage collection], enable_nacl_gc=$enableval, enable_nacl_gc=no) AM_CONDITIONAL(NACL_CODEGEN, test x$enable_nacl_codegen != xno) if test "x$enable_nacl_codegen" = "xyes"; then @@ -1987,6 +1994,10 @@ if test "x$enable_nacl_codegen" = "xyes"; then AC_DEFINE(TARGET_NACL, 1, [...]) else MONO_NACL_ALIGN_MASK_OFF=0 + CPPFLAGS="$CPPFLAGS -D__default_codegen__" +fi +if test "x$enable_nacl_gc" = "xyes"; then + CPPFLAGS="$CPPFLAGS -finstrument-for-thread-suspension -D__native_client_gc__" fi AC_SUBST(MONO_NACL_ALIGN_MASK_OFF) @@ -2120,7 +2131,7 @@ case "$host" in sgen_supported=true AOT_SUPPORTED="yes" ;; - darwin*|openbsd*) + darwin*|openbsd*|freebsd*) sgen_supported=true ;; esac @@ -2135,10 +2146,16 @@ case "$host" in sgen_supported=true AOT_SUPPORTED="yes" ;; - darwin*|openbsd*) + darwin*|openbsd*|freebsd*) sgen_supported=true ;; esac + case "$host" in + x86_64-*-nacl*) + AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers]) + sizeof_register=8 + ;; + esac ;; ia64-*-*) TARGET=IA64 @@ -2290,6 +2307,14 @@ if test "x$host" != "x$target"; then sizeof_register=8 target_byte_order=G_BIG_ENDIAN ;; + x86_64-*-nacl) + TARGET=AMD64 + arch_target=amd64 + AC_DEFINE(TARGET_AMD64, 1, [...]) + AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) + AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers]) + sizeof_register=8 + ;; *) AC_MSG_WARN([Cross compiling is only supported for targets matching 'powerpc64-{ps3,xbox360}-linux-gnu']) esac @@ -2547,6 +2572,10 @@ case "x$gc" in if test x$TARGET = xSPARC -o x$TARGET = xSPARC64; then LIBGC_CPPFLAGS=`echo $LIBGC_CPPFLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//g'` fi + # Don't pass -finstrument-for-thread-suspension in, + # if these are instrumented it will be very bad news + # (infinite recursion, undefined parking behavior, etc) + LIBGC_CPPFLAGS=`echo $LIBGC_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'` ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$LIBGC_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\"" AC_CONFIG_SUBDIRS(libgc) ;; @@ -2592,11 +2621,17 @@ fi MOONLIGHT_DEFINES= AC_ARG_WITH(moonlight, [ --with-moonlight=yes|no|only If you want to build Mono for Moonlight (defaults to no)],[ - MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING" + if test x$with_moonlight != xno; then + MOONLIGHT_DEFINES="-DMOONLIGHT -DDISABLE_ASSEMBLY_REMAPPING " + fi ], [with_moonlight=no]) AC_SUBST(MOONLIGHT_DEFINES) - +AC_ARG_WITH(moon_gc, [ --with-moon-gc=boehm,sgen Select the gc to use with Moonlight (defaults to boehm)],[ + if test "x$with_moon_gc" != "xsgen"; then + with_moon_gc=boehm + fi +], [with_moon_gc=boehm]) AC_CHECK_HEADER([malloc.h], [AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], @@ -2624,6 +2659,9 @@ libmono_ldflags="$libmono_ldflags $LIBS" AM_CONDITIONAL(MOONLIGHT, [test "x$with_moonlight" != "xno"]) AM_CONDITIONAL(ONLY_MOONLIGHT, [test "x$with_moonlight" = "xonly"]) +AM_CONDITIONAL(MOONLIGHT_BOEHM, [test "x$with_moon_gc" = "xboehm"]) +AM_CONDITIONAL(MOONLIGHT_SGEN, [test "x$with_moon_gc" = "xsgen"]) + AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes]) AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" = xyes]) AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes]) @@ -2925,6 +2963,11 @@ fi enable_system_aot=yes fi + if test "x$enable_loadedllvm" = "xyes"; then + # This seems to fail on the x86 buildbots + enable_system_aot=no + fi + if test x$host_win32 = xno -a x$platform_darwin != xyes -a x$enable_system_aot = xyes; then echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make fi @@ -2965,7 +3008,6 @@ echo " Engine: GC: $gc_msg - GLIB: $with_glib TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status @@ -2976,7 +3018,7 @@ echo " LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) Libraries: - Moon Profile: $with_moonlight + Moon Profile: $with_moonlight ($with_moon_gc) MonoDroid: $with_monodroid MonoTouch: $with_monotouch JNI support: $jdk_headers_found