diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2013-02-25 19:12:30 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2013-02-25 19:12:30 +0400 |
| commit | 2f84b362abcce99427a6ff1926a1b56eb6454036 (patch) | |
| tree | b87a3086df3ddd896bef34ca9f3d443d256f522d /configure.in | |
| parent | feb5080d23ca3b0d53a13a77ae39c68734907b6a (diff) | |
| parent | a8bd364cf987905c26c42f1af9b601f3c1623d3a (diff) | |
Merge pull request #571 from igotti-google/jt2
Generic jumptables support (needed for ARM NaCl port),
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.in b/configure.in index be30e563c98..03f6712c699 100644 --- a/configure.in +++ b/configure.in @@ -237,6 +237,11 @@ case "$host" in libdl="-ldl" libgc_threads=pthreads use_sigposix=yes + if test "x$cross_compiling" != "xno"; then + # to bypass the underscore linker check, not + # available during cross-compilation + mono_cv_uscore=no + fi ;; *-*-nacl*) host_win32=no @@ -555,6 +560,8 @@ AC_ARG_WITH(mcs-path, [ --with-mcs-path=/path/to/mcs Specify an alternate fi ) +AC_ARG_WITH(jumptables, [ --with-jumptables=yes,no enable/disable support for jumptables (ARM-only for now) (defaults to no)],[],[with_jumptables=no]) + # # A sanity check to catch cases where the package was unpacked # with an ancient tar program (Solaris) @@ -2566,6 +2573,11 @@ case "$host" in JIT_SUPPORTED=yes sgen_supported=true AOT_SUPPORTED="yes" + if test "x$cross_compiling" != "xno"; then + # Provide sane defaults when cross-compiling + CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6=1" + NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6" + fi ;; s390-*-linux*) TARGET=S390; @@ -2959,6 +2971,12 @@ if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_bui fi fi +if test ${TARGET} = ARM; then + if test "x${with_jumptables}" = "xyes"; then + AC_DEFINE(USE_JUMP_TABLES, 1, Use jump tables in JIT) + fi +fi + if test ${TARGET} = unknown; then CPPFLAGS="$CPPFLAGS -DNO_PORT" AC_MSG_WARN("mono has not been ported to $host: some things may not work.") |