X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=2c47b2c1939a591400f64928a38bb68870a2bd73;hb=5a3deb839ed870dc8b7e660662a83f88817e0b73;hp=ac9717d2a3155ac15c88aa3f674cf3615eb1ed7d;hpb=e4d9a7a2e93867ba54b6e88bec915ae2fff1fa94;p=mono.git diff --git a/configure.in b/configure.in index ac9717d2a31..2c47b2c1939 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,20 @@ -AC_INIT(README) +# Process this file with autoconf to produce a configure script. +#AC_PREREQ([2.62]) + +AC_INIT(mono, [2.11.2], + [http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono]) + +AC_CONFIG_SRCDIR([README]) +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM +AC_CANONICAL_HOST # Gross hack to enable 'make dist' on automake 1.9+tar 1.14. # The extra brackets are to foil regex-based scans. 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([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign]) +AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE API_VER=2.0 @@ -78,6 +86,7 @@ esac host_win32=no target_win32=no +platform_android=no case "$host" in *-mingw*|*-*-cygwin*) AC_DEFINE(HOST_WIN32,1,[Host Platform is Win32]) @@ -86,11 +95,21 @@ case "$host" in host_win32=yes if test "x$cross_compiling" = "xno"; then target_win32=yes - if test "x$host" == "x$build"; then + if test "x$host" == "x$build" -a "x$host" == "x$target"; then AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32]) fi - CC="gcc -mno-cygwin -g" - CXX="g++ -mno-cygwin -g" + # + # gcc-3/g++-3 are from the gcc-core/gcc-g++ cygwin packages. + # Other gcc packages will not work: + # - the gcc-4 packages no longer support -mno-cygwin + # - the mingw-gcc packages produce executables which depends on a libgcc<...> + # dll, which means we would have to distribute that file too. + # + if test "x$CC" != "x"; then + AC_ERROR(Don't set CC. mono can only be compiled with gcc-3 from the 'gcc-core' package) + fi + CC="gcc-3.exe -mno-cygwin -g" + CXX="g++-3.exe -mno-cygwin -g" # So libgc configure gets -mno-cygwin export CC export CXX @@ -172,6 +191,42 @@ case "$host" in with_sigaltstack=no use_sigposix=yes ;; + *-*-linux-android*) + host_win32=no + platform_android=yes + AC_DEFINE(PLATFORM_ANDROID,1,[Targeting the Android platform]) + AC_DEFINE(TARGET_ANDROID,1,[Targeting the Android platform]) + + CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP" + if test "x$disable_munmap" != "xyes"; then + CPPFLAGS="$CPPFLAGS -DUSE_MUNMAP" + fi + libmono_cflags="-D_REENTRANT" + libdl="-ldl" + libgc_threads=pthreads + use_sigposix=yes + + with_tls=pthread + with_sigaltstack=no + with_static_mono=no + + # Android doesn't support boehm, as it's missing + support_boehm=no + with_gc=sgen + + # isinf(3) requires -lm; see isinf check below + LDFLAGS="$LDFLAGS -lm" + + # Bionic's sets PTHREAD_STACK_MIN=2*PAGE_SIZE; doesn't define + # PAGE_SIZE; breaks mono/io-layer/collection.c + # Bionic doesn't provide S_IWRITE; breaks io-layer/io.c + CFLAGS="$CFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR" + CXXFLAGS="$CXXFLAGS -DPAGE_SIZE=4096 -DS_IWRITE=S_IWUSR" + + # to bypass the underscore linker check, can't work when cross-compiling + mono_cv_uscore=yes + mono_cv_clang=no + ;; *-*-linux*) host_win32=no CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP" @@ -248,12 +303,12 @@ case "$host" in if test "x$cross_compiling" = "xyes"; then has_broken_apple_cpp=yes fi - dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin10.0.0, but + dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin*, but dnl its gcc defaults to 64-bit mode. They have also deprecated the usage of ucontext dnl we need to set some flags to build our 32-bit binaries on 10.6 properly case "$host" in - dnl Snow Leopard config.guess reports as this - i*86-*-darwin10*) + dnl Snow Leopard and newer config.guess reports as this + i*86-*-darwin*) BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5" CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS" CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS" @@ -294,6 +349,7 @@ AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes) AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux) AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes) AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes) +AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes) AC_CHECK_TOOL(CC, gcc, gcc) AC_PROG_CC @@ -320,12 +376,6 @@ if test "x$CXX" = "xg++"; then fi fi -AC_CHECK_PROG(BISON, bison,yes,no) -if test "x$BISON" = "xno"; -then - AC_MSG_ERROR([You need to install bison]) -fi - dnl may require a specific autoconf version dnl AC_PROG_CC_FOR_BUILD dnl CC_FOR_BUILD not automatically detected @@ -364,10 +414,16 @@ if test "x$lt_cv_prog_gnu_ld" = "xno"; then no_version_script=yes fi +AM_ICONV() + AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes) AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h) -AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h) +AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h) +AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h], + [], [], [#include + #include + #include ]) AC_CHECK_HEADERS(sys/user.h, [], [], [ @@ -422,23 +478,39 @@ AC_TRY_LINK([#include ], [ AC_MSG_RESULT(no) ]) +# for Linux statfs support +AC_CHECK_HEADERS(linux/magic.h) # not 64 bit clean in cross-compile AC_CHECK_SIZEOF(void *, 4) WARN='' if test x"$GCC" = xyes; then - WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings' + WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch-enum' # The runtime code does not respect ANSI C strict aliasing rules CFLAGS="$CFLAGS -fno-strict-aliasing" ORIG_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -Wdeclaration-after-statement" AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc) - AC_TRY_COMPILE([], [ - void main () { } + AC_TRY_COMPILE([],[ + return 0; + ], [ + AC_MSG_RESULT(yes) + ], [ + AC_MSG_RESULT(no) + CFLAGS=$ORIG_CFLAGS + ]) + + ORIG_CFLAGS=$CFLAGS + # Check for the normal version, since gcc ignores unknown -Wno options + CFLAGS="$CFLAGS -Wunused-but-set-variable" + AC_MSG_CHECKING(for -Wno-unused-but-set-variable option to gcc) + AC_TRY_COMPILE([],[ + return 0; ], [ AC_MSG_RESULT(yes) + CFLAGS="$ORIG_CFLAGS -Wno-unused-but-set-variable" ], [ AC_MSG_RESULT(no) CFLAGS=$ORIG_CFLAGS @@ -455,6 +527,22 @@ fi CFLAGS="$CFLAGS -g $WARN" CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g" +AC_CACHE_CHECK([for clang], + mono_cv_clang,[ + AC_TRY_RUN([ + int main () { + #ifdef __clang__ + return 0; + #else + return 1; + #endif + } + ], + [mono_cv_clang=yes], + [mono_cv_clang=no], + []) +]) + # Where's the 'mcs' source tree? if test -d $srcdir/mcs; then mcsdir=mcs @@ -505,9 +593,6 @@ if test x$cross_compiling$host_win32 = xnoyes; then esac fi -## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. -AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno]) - AC_SUBST([mcs_topdir]) AC_SUBST([mcs_topdir_from_srcdir]) @@ -561,28 +646,15 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan fi ) -AC_ARG_WITH([glib], - [ --with-glib=embedded|system Choose glib API: system or embedded (default to embedded)], - [], [with_glib=embedded]) - ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\"" AC_CONFIG_SUBDIRS(eglib) -case $with_glib in -embedded) - GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src' - GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm' - BUILD_GLIB_CFLAGS="$GLIB_CFLAGS" - BUILD_GLIB_LIBS="$GLIB_LIBS" - GMODULE_CFLAGS="$GLIB_CFLAGS" - GMODULE_LIBS="$GLIB_LIBS" - ;; -system) - AC_MSG_ERROR([--with-glib=system is no longer supported as of Mono 2.8]) - ;; -*) - AC_MSG_ERROR([Invalid argument to --with-glib.]) -esac +GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src' +GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm' +BUILD_GLIB_CFLAGS="$GLIB_CFLAGS" +BUILD_GLIB_LIBS="$GLIB_LIBS" +GMODULE_CFLAGS="$GLIB_CFLAGS" +GMODULE_LIBS="$GLIB_LIBS" AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -626,13 +698,13 @@ AM_CONDITIONAL(SHARED_MONO, test x$with_shared_mono != xno) AC_ARG_ENABLE(mcs-build, [ --disable-mcs-build disable the build of the mcs directory], try_mcs_build=$enableval, enable_mcs_build=yes) AC_ARG_WITH(xen_opt, [ --with-xen_opt=yes,no Enable Xen-specific behaviour (defaults to yes)],[],[with_xen_opt=yes]) -if test "x$with_xen_opt" = "xyes"; then +if test "x$with_xen_opt" = "xyes" -a "x$mono_cv_clang" = "xno"; then AC_DEFINE(MONO_XEN_OPT, 1, [Xen-specific behaviour]) ORIG_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -mno-tls-direct-seg-refs" AC_MSG_CHECKING(for -mno-tls-direct-seg-refs option to gcc) AC_TRY_COMPILE([], [ - void main () { } + return 0; ], [ AC_MSG_RESULT(yes) # Pass it to libgc as well @@ -657,7 +729,7 @@ DISABLED_FEATURES=none AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems. LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, - reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, normalization, assembly_remapping.], + reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, normalization, assembly_remapping, shared_perfcounters.], [ for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do eval "mono_feature_disable_$feature='yes'" @@ -782,10 +854,20 @@ if test "x$mono_feature_disable_assembly_remapping" = "xyes"; then AC_MSG_NOTICE([Disabled Assembly remapping.]) fi +if test "x$mono_feature_disable_shared_perfcounters" = "xyes"; then + AC_DEFINE(DISABLE_SHARED_PERFCOUNTERS, 1, [Disable shared perfcounters.]) + AC_MSG_NOTICE([Disabled Shared perfcounters.]) +fi + +AC_ARG_ENABLE(executables, [ --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes) +AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno) + AC_MSG_CHECKING(for visibility __attribute__) -AC_TRY_COMPILE([], [ - void __attribute__ ((visibility ("hidden"))) doit (void) {} - void main () { doit (); } +AC_COMPILE_IFELSE([ + AC_LANG_SOURCE([[ + void __attribute__ ((visibility ("hidden"))) doit (void) {} + int main () { doit (); return 0; } + ]]) ], [ have_visibility_hidden=yes AC_MSG_RESULT(yes) @@ -813,10 +895,13 @@ if test x$enable_parallel_mark = xyes; then libgc_configure_args="$libgc_configure_args --enable-parallel-mark" fi +AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes}) +AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes) + dnl dnl Boehm GC configuration dnl -LIBGC_CFLAGS= +LIBGC_CPPFLAGS= LIBGC_LIBS= LIBGC_STATIC_LIBS= libgc_dir= @@ -851,13 +936,21 @@ case "x$gc" in if test "x$found_gc_enable" = "xyes"; then BOEHM_DEFINES="-DHAVE_GC_ENABLE $BOEHM_DEFINES" fi + + # check whether we need to explicitly allow + # thread registering + AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl) + if test "x$found_allow_register_threads" = "xyes"; then + AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration]) + fi + ;; xincluded) use_included_gc=yes libgc_dir=libgc - LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include' + LIBGC_CPPFLAGS='-I$(top_srcdir)/libgc/include' LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la' LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la' @@ -892,7 +985,7 @@ if test "x$large_heap" = "xyes"; then fi AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes) -AC_SUBST(LIBGC_CFLAGS) +AC_SUBST(LIBGC_CPPFLAGS) AC_SUBST(LIBGC_LIBS) AC_SUBST(LIBGC_STATIC_LIBS) AC_SUBST(libgc_dir) @@ -1006,10 +1099,9 @@ if test x$target_win32 = xno; then dnl **************************************************************** AC_MSG_CHECKING(for sched_setaffinity from glibc < 2.3.4) AC_TRY_COMPILE([#include ], [ - int main() { int mask = 1; sched_setaffinity(0, &mask); - } + return 0; ], [ # Yes, we have it... AC_MSG_RESULT(yes) @@ -1303,6 +1395,7 @@ if test x$target_win32 = xno; then AC_CHECK_HEADERS(pthread.h) AC_CHECK_FUNCS(pthread_mutex_timedlock) AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np) + AC_CHECK_FUNCS(pthread_kill) AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE) AC_TRY_COMPILE([ #include ], [ pthread_mutexattr_t attr; @@ -1390,12 +1483,11 @@ if test x$target_win32 = xno; then exit (0); } + volatile char*__ptr = NULL; static void * loop (void *ignored) { - char *ptr = NULL; - - *ptr = 0; + *__ptr = 0; return NULL; } @@ -1403,7 +1495,11 @@ if test x$target_win32 = xno; then child () { struct sigaction sa; + #ifdef __APPLE__ + stack_t sas; + #else struct sigaltstack sas; + #endif pthread_t id; pthread_attr_t attr; @@ -1415,6 +1511,11 @@ if test x$target_win32 = xno; then return; } + /* x86 darwin deliver segfaults using SIGBUS */ + if (sigaction (SIGBUS, &sa, NULL) == -1) { + perror ("sigaction"); + return; + } sas.ss_sp = malloc (SIGSTKSZ); sas.ss_size = SIGSTKSZ; sas.ss_flags = 0; @@ -1552,6 +1653,12 @@ if test x$target_win32 = xno; then AC_DEFINE(HAVE_EPOLL, 1, [epoll supported]) fi + havekqueue=no + AC_CHECK_FUNCS(kqueue, , AC_MSG_CHECKING(for kqueue in sys/event.h) + AC_TRY_LINK([#include ], + [ kqueue(); ], + AC_DEFINE(HAVE_KQUEUE, 1, [Have kqueue]) AC_MSG_RESULT(yes), + AC_MSG_RESULT(no))) dnl ****************************** dnl *** Checks for SIOCGIFCONF *** dnl ****************************** @@ -1746,6 +1853,11 @@ if test x$target_win32 = xno; then dnl * on xp+ AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available]) else + dnl ********************************* + dnl *** Checks for Windows compilation *** + dnl ********************************* + AC_CHECK_HEADERS(winternl.h) + jdk_headers_found=no AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?)) AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?)) @@ -2020,16 +2132,20 @@ if test "x$enable_llvm" = "xyes"; then # from LLVM classes. LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti" LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` - LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen` + LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit x86codegen` LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++" # Should be something like '2.6' or '2.7svn' llvm_version=`$LLVM_CONFIG --version` major_version=`echo $llvm_version | cut -c 1` minor_version=`echo $llvm_version | cut -c 3` + AC_MSG_CHECKING(LLVM version) + AC_MSG_RESULT($llvm_version) if echo $llvm_version | grep -q 'mono'; then AC_DEFINE(LLVM_MONO_BRANCH, 1, [Whenever we are using the mono branch of LLVM]) LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MONO_BRANCH" + else + AC_MSG_ERROR([Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm, with the GIT branch which matches this version of mono, i.e. 'mono-2-10' for Mono 2.10.]) fi AC_DEFINE_UNQUOTED(LLVM_MAJOR_VERSION, $major_version, [Major version of LLVM libraries]) @@ -2066,7 +2182,7 @@ X11="libX11.so" sizeof_register="SIZEOF_VOID_P" -jit_wanted=false +jit_wanted=true interp_wanted=false sgen_supported=false case "$host" in @@ -2077,17 +2193,16 @@ case "$host" in mips*) TARGET=MIPS; arch_target=mips; + sgen_supported=true ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true AC_MSG_CHECKING(for mips n32) - AC_TRY_COMPILE([], [ - void main () { + AC_TRY_COMPILE([],[ #if _MIPS_SIM != _ABIN32 #error Not mips n32 #endif - } + return 0; ],[ AC_MSG_RESULT(yes) sizeof_register=8 @@ -2099,7 +2214,6 @@ case "$host" in TARGET=X86; arch_target=x86; JIT_SUPPORTED=yes - jit_wanted=true case $host_os in solaris*) LIBC="libc.so" @@ -2120,8 +2234,10 @@ case "$host" in # foo.c:6: warning: visibility attribute not supported in this configuration; ignored # ld: fatal: relocation error: R_386_GOTOFF: file /var/tmp//ccxYR96k.o: symbol astruct: relocation must bind locally have_visibility_hidden=no + sgen_supported=true ;; cygwin*) + sgen_supported=true have_visibility_hidden=no ;; haiku*) @@ -2131,6 +2247,10 @@ case "$host" in sgen_supported=true AOT_SUPPORTED="yes" ;; + darwin*) + sgen_supported=true + AOT_SUPPORTED="yes" + ;; darwin*|openbsd*|freebsd*) sgen_supported=true ;; @@ -2140,7 +2260,6 @@ case "$host" in TARGET=AMD64; arch_target=amd64; JIT_SUPPORTED=yes - jit_wanted=true case $host_os in linux*) sgen_supported=true @@ -2162,7 +2281,6 @@ case "$host" in arch_target=ia64 ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true LIBC="libc.so.6.1" INTL="libc.so.6.1" AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)]) @@ -2183,7 +2301,6 @@ case "$host" in LIBC="libc.so" INTL="libintl.so" esac - jit_wanted=true if test x"$GCC" = xyes; then # We don't support v8 cpus CFLAGS="$CFLAGS -Wno-cast-align -mcpu=v9" @@ -2191,12 +2308,12 @@ case "$host" in if test x"$AR" = xfalse; then AC_MSG_ERROR([The required utility 'ar' is not found in your PATH. Usually it can be found in /usr/ccs/bin.]) fi + sgen_supported=true ;; alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true arch_target=alpha; CFLAGS="$CFLAGS -mieee -O0" case $host_os in @@ -2223,7 +2340,6 @@ case "$host" in arch_target=hppa; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true ;; macppc-*-openbsd* | powerpc*-*-linux* | powerpc-*-openbsd* | \ powerpc-*-sysv* | powerpc-*-darwin* | powerpc-*-netbsd* | powerpc-*-freebsd* ) @@ -2237,7 +2353,6 @@ case "$host" in fi arch_target=ppc; JIT_SUPPORTED=yes - jit_wanted=true case $host_os in linux*|darwin*) sgen_supported=true @@ -2249,8 +2364,9 @@ case "$host" in arch_target=arm; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" - jit_wanted=true + CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6=1" + # libgc's gc_locks.h depends on this + NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6" sgen_supported=true ;; arm*-linux*) @@ -2258,15 +2374,14 @@ case "$host" in arch_target=arm; ACCESS_UNALIGNED="no" JIT_SUPPORTED=yes - jit_wanted=true sgen_supported=true + AOT_SUPPORTED="yes" ;; s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="yes" JIT_SUPPORTED=yes - jit_wanted=true sgen_supported=true # Required CFLAGS for s390[x]. USE_STRING_INLINES is automatic with gcc 4.1 CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" @@ -2276,19 +2391,19 @@ case "$host" in arch_target=s390x; ACCESS_UNALIGNED="yes" JIT_SUPPORTED=yes - jit_wanted=true sgen_supported=true CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES" ;; esac if test "x$host" != "x$target"; then + AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) + enable_mcs_build=no case "$target" in powerpc64-ps3-linux-gnu) TARGET=POWERPC64 arch_target=powerpc64 AC_DEFINE(TARGET_PS3, 1, [...]) - AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) # It would be better to just use TARGET_POWERPC64, but lots of code already # uses this define AC_DEFINE(__mono_ppc64__, 1, [...]) @@ -2301,7 +2416,6 @@ if test "x$host" != "x$target"; then TARGET=POWERPC64 arch_target=powerpc64 AC_DEFINE(TARGET_XBOX360, 1, [...]) - AC_DEFINE(MONO_CROSS_COMPILE,1,[The runtime is compiled for cross-compiling mode]) # It would be better to just use TARGET_POWERPC64, but lots of code already # uses this define sizeof_register=8 @@ -2311,12 +2425,55 @@ if test "x$host" != "x$target"; then 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 ;; + *-*-nacl) + TARGET=X86 + arch_target=x86 + AC_DEFINE(TARGET_X86, 1, [...]) + sizeof_register=4 + ;; + armv7l-unknown-linux-gnueabi*) + # TEGRA + TARGET=ARM; + arch_target=arm; + AC_DEFINE(TARGET_ARM, 1, [...]) + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__" + jit_wanted=true + # Can't use tls, since it depends on the runtime detection of tls offsets + # in mono-compiler.h + with_tls=pthread + ;; + armv5tel-unknown-linux-gnueabi*) + TARGET=ARM; + arch_target=arm; + AC_DEFINE(TARGET_ARM, 1, [...]) + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" + jit_wanted=true + # Can't use tls, since it depends on the runtime detection of tls offsets + # in mono-compiler.h + with_tls=pthread + ;; + armv5-*-linux-androideabi*) + TARGET=ARM; + arch_target=arm; + AC_DEFINE(TARGET_ARM, 1, [...]) + AC_DEFINE(TARGET_ANDROID, 1, [...]) + ACCESS_UNALIGNED="no" + JIT_SUPPORTED=yes + CPPFLAGS="$CPPFLAGS -D__ARM_EABI__ -DARM_FPU_NONE=1" + jit_wanted=true + # Can't use tls, since it depends on the runtime detection of tls offset + # in mono-compiler.h + with_tls=pthread + ;; *) - AC_MSG_WARN([Cross compiling is only supported for targets matching 'powerpc64-{ps3,xbox360}-linux-gnu']) + AC_MSG_ERROR([Cross compiling is not supported for target $target]) esac fi @@ -2338,6 +2495,12 @@ POWERPC64) AC_DEFINE(TARGET_POWERPC, 1, [...]) AC_DEFINE(TARGET_POWERPC64, 1, [...]) ;; +S390x) + AC_DEFINE(TARGET_S390X, 1, [...]) + ;; +MIPS) + AC_DEFINE(TARGET_MIPS, 1, [...]) + ;; esac if test "x$sizeof_register" = "x4"; then @@ -2386,22 +2549,6 @@ fi AC_SUBST(SGEN_DEFINES) AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes) -AC_ARG_WITH(jit, [ --with-jit=yes,no If you want to build scripts that default to the JIT (defaults to no)],[ - if test x$withval = xyes; then - jit_wanted=true - else - jit_wanted=false - fi -]) - -AC_ARG_WITH(interp, [ --with-interp=yes,no If you want to build scripts that default to the interpreter (defaults to no)],[ - if test x$withval = xyes; then - interp_wanted=true - else - interp_wanted=false - fi -]) - USEJIT=false if test x$JIT_SUPPORTED = xyes; then if $jit_wanted; then @@ -2464,7 +2611,8 @@ case "$host" in done if test "x$X11" = "xlibX11.so"; then - AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]); + AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]); + X11=libX11.so.6 fi ;; esac @@ -2480,7 +2628,7 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then # undefined reference to `__tls_get_addr' # rm -f conftest.c conftest.so conftest - echo "static __thread int foo; void main () { foo = 5; }" > conftest.c + echo "static __thread int foo; int main () { foo = 5; return 0; }" > conftest.c $CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1 $CC -o conftest conftest.so > /dev/null 2>&1 if test ! -f conftest; then @@ -2494,7 +2642,7 @@ fi mono_debugger_supported=no AC_ARG_ENABLE(mono-debugger, [ --disable-mono-debugger disable support for the mdb debugger], try_mono_debugger=$enableval, try_mono_debugger=yes) if test "x$try_mono_debugger" = "xyes"; then - if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA"; then + if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86" -o "x$TARGET" = "xALPHA" -o "x$TARGET" = "xS390x"; then if test x$use_included_gc = xyes; then case "$host" in *-*-*linux*) @@ -2521,6 +2669,21 @@ fi AM_CONDITIONAL(MONO_DEBUGGER_SUPPORTED, test x$mono_debugger_supported = xyes) AC_MSG_RESULT($mono_debugger_supported) +AC_ARG_ENABLE(icall-symbol-map,[ --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no) +if test "x$icall_symbol_map" = "xyes"; then + AC_DEFINE(ENABLE_ICALL_SYMBOL_MAP, 1, [Icall symbol map enabled]) +fi + +AC_ARG_ENABLE(icall-export,[ --enable-icall-export Export icall functions], icall_export=$enableval, icall_export=no) +if test "x$icall_export" = "xyes"; then + AC_DEFINE(ENABLE_ICALL_EXPORT, 1, [Icall export enabled]) +fi + +AC_ARG_ENABLE(icall-tables,[ --disable-icall-tables Disable the runtime lookup of icalls], icall_tables=$enableval, icall_tables=yes) +if test "x$icall_tables" = "xno"; then + AC_DEFINE(DISABLE_ICALL_TABLES, 1, [Icall tables disabled]) +fi + if test "x$with_tls" = "x__thread"; then AC_DEFINE(HAVE_KW_THREAD, 1, [Have __thread keyword]) # Pass the information to libgc @@ -2529,7 +2692,10 @@ if test "x$with_tls" = "x__thread"; then AC_TRY_COMPILE([static __thread int foo __attribute__((tls_model("initial-exec")));], [ ], [ AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_TLS_MODEL_ATTR, 1, [tld_model available]) + # CLANG doesn't support this yet, and it prints warnings about it + if test "x$mono_cv_clang" = "xno"; then + AC_DEFINE(HAVE_TLS_MODEL_ATTR, 1, [tld_model available]) + fi ], [ AC_MSG_RESULT(no) ]) @@ -2541,13 +2707,41 @@ if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_bui dnl ****************************************** AC_MSG_CHECKING(which FPU to use) - AC_TRY_COMPILE([], [ - __asm__ ("ldfd f0, [r0]"); - ], fpu=FPA, fpu=NONE) + fpu=NONE + if gcc -v 2>&1 | grep -q -- '--with-float=hard'; then + fpu=VFP_HARD + fi + + if test x$fpu = xNONE; then + ORIG_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" + AC_TRY_RUN([ + int main () { __asm__ ("faddd d7, d6, d7"); return 0; } + ], fpu=VFP, fpu=NONE) + CFLAGS=$ORIG_CFLAGS + fi + + if test x$fpu = xNONE; then + AC_TRY_COMPILE([], [ + __asm__ ("ldfd f0, [r0]"); + ], fpu=FPA, fpu=NONE) + fi AC_MSG_RESULT($fpu) CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" unset fpu + + AC_MSG_CHECKING(for ARMV6) + AC_TRY_RUN([ + int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; } + ], armv6=yes, armv6=no) + + AC_MSG_RESULT($armv6) + if test ${armv6} = yes; then + AC_DEFINE(HAVE_ARMV6, 1, "Host supports ARMV6 instructions") + # libgc's gc_locks.h depends on this + NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6" + fi fi if test ${TARGET} = unknown; then @@ -2568,23 +2762,24 @@ case "x$gc" in # The problem with this approach, is that during a reconfigure, the main # configure scripts gets invoked with these arguments, so we use separate # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS. - LIBGC_CPPFLAGS="$CPPFLAGS $NESTED_LIBGC_FLAGS" + TMP_CPPFLAGS="$CPPFLAGS $NESTED_LIBGC_FLAGS" if test x$TARGET = xSPARC -o x$TARGET = xSPARC64; then - LIBGC_CPPFLAGS=`echo $LIBGC_CPPFLAGS | sed -e 's/-D_FILE_OFFSET_BITS=64//g'` + TMP_CPPFLAGS=`echo $TMP_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\"" + TMP_CPPFLAGS=`echo $TMP_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=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\"" AC_CONFIG_SUBDIRS(libgc) ;; esac #AC_ARG_WITH(profile2, [ --with-profile2=yes,no If you want to install the 2.0 FX (defaults to yes)], [], [with_profile2=yes]) -AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.0 FX (defaults to yes)], [], [with_profile4=yes]) +AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install the 4.x FX (defaults to yes)], [], [with_profile4=yes]) AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid 2.1 assemblies (defaults to no)], [], [with_monodroid=no]) AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no If you want to build the MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no]) +AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile 2.1 assemblies (defaults to no)], [], [with_mobile=no]) OPROFILE=no AC_ARG_WITH(oprofile,[ --with-oprofile=no, Enable oprofile support (defaults to no)],[ @@ -2637,6 +2832,15 @@ AC_CHECK_HEADER([malloc.h], [AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1], [Define to 1 if you have /usr/include/malloc.h.])],,) +# When --disable-shared is used, libtool transforms libmono-2.0.la into libmono-2.0.so +# instead of libmono-static.a +if test "x$enable_shared" = "xno"; then + LIBMONO_LA=.libs/libmono-static.a +else + LIBMONO_LA=libmono-$API_VER.la +fi +AC_SUBST(LIBMONO_LA) + dnl dnl Consistency settings dnl @@ -2651,6 +2855,9 @@ else fi AC_SUBST(docs_dir) +## Maybe should also disable if mcsdir is invalid. Let's punt the issue for now. +AM_CONDITIONAL(BUILD_MCS, [test x$cross_compiling = xno && test x$enable_mcs_build != xno]) + AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes) AC_SUBST(OPROFILE_CFLAGS) AC_SUBST(OPROFILE_LIBS) @@ -2665,6 +2872,7 @@ 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]) +AM_CONDITIONAL(INSTALL_MOBILE, [test "x$with_mobile" = xyes]) AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes) AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno) @@ -2823,9 +3031,43 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/4.0/web.config], cd $depth ],[LN_S='$LN_S']) +AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/machine.config], +[ depth=../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/4.5 + cd runtime/etc/mono/4.5 + rm -f machine.config + $LN_S $reldir/data/net_4_5/machine.config machine.config + cd $depth +],[LN_S='$LN_S']) + +AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config], +[ depth=../../../.. + case $srcdir in + [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;; + .) reldir=$depth ;; + *) reldir=$depth/$srcdir ;; + esac + $ac_aux_dir/install-sh -d runtime/etc/mono/4.5 + cd runtime/etc/mono/4.5 + rm -f web.config + $LN_S $reldir/data/net_4_5/web.config web.config + cd $depth +],[LN_S='$LN_S']) + if test x$enable_quiet_build = xyes; then - AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL]) - AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) + AC_CONFIG_COMMANDS([quiet], +[ for i in `find mono libgc support -name Makefile`; do + if [ grep -q 'generated by automake' $i ]; then + $srcdir/scripts/patch-quiet.sh $i; + fi; + done +], [shell=$SHELL]) + AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool]) fi AC_OUTPUT([ @@ -2866,6 +3108,7 @@ mono/monograph/Makefile mono/io-layer/Makefile mono/mini/Makefile mono/profiler/Makefile +m4/Makefile ikvm-native/Makefile scripts/Makefile man/Makefile @@ -2873,9 +3116,11 @@ docs/Makefile data/Makefile data/net_2_0/Makefile data/net_4_0/Makefile +data/net_4_5/Makefile data/net_2_0/Browsers/Makefile data/mint.pc data/mono-2.pc +data/monosgen-2.pc data/mono.pc data/mono-cairo.pc data/mono-nunit.pc @@ -2891,6 +3136,8 @@ data/system.web.extensions_1.0.pc data/system.web.extensions.design_1.0.pc data/system.web.mvc.pc data/system.web.mvc2.pc +data/system.web.mvc3.pc +data/aspnetwebstack.pc samples/Makefile support/Makefile data/config @@ -2902,6 +3149,9 @@ msvc/Makefile po/Makefile ]) +# Update all submodules recursively to ensure everything is checked out +$srcdir/scripts/update_submodules + if test x$host_win32 = xyes; then # Get rid of 'cyg' prefixes in library names sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool @@ -2932,7 +3182,6 @@ fi echo "exec_prefix=$exec_prefix" >> $mcs_topdir/build/config.make echo "sysconfdir=$sysconfdir" >> $mcs_topdir/build/config.make echo 'mono_libdir=${exec_prefix}/lib' >> $mcs_topdir/build/config.make - echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $mcs_topdir/build/config.make echo 'IL_FLAGS = /debug' >> $mcs_topdir/build/config.make echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $mcs_topdir/build/config.make echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $mcs_topdir/build/config.make @@ -2963,7 +3212,12 @@ fi enable_system_aot=yes fi - if test x$host_win32 = xno -a x$platform_darwin != xyes -a x$enable_system_aot = xyes; then + 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$enable_system_aot = xyes; then echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make fi @@ -2974,6 +3228,10 @@ fi if test x$with_moonlight != xno; then echo "MOONLIGHT = 1" >> $srcdir/$mcsdir/build/config.make fi + + if test x$with_profile4 != xyes; then + echo "DEFAULT_PROFILE = net_2_0" >> $srcdir/$mcsdir/build/config.make + fi fi @@ -3003,20 +3261,19 @@ echo " Engine: GC: $gc_msg - GLIB: $with_glib TLS: $with_tls SIGALTSTACK: $with_sigaltstack Engine: $jit_status oprofile: $OPROFILE BigArrays: $enable_big_arrays DTrace: $enable_dtrace - Parallel Mark: $enable_parallel_mark LLVM Back End: $enable_llvm (dynamically loaded: $enable_loadedllvm) Libraries: Moon Profile: $with_moonlight ($with_moon_gc) MonoDroid: $with_monodroid MonoTouch: $with_monotouch + Mobile: $with_mobile JNI support: $jdk_headers_found libgdiplus: $libgdiplus_msg zlib: $zlib_msg