[runtime] Remove build system support for the interpreter.

diff --git a/configure.ac b/configure.ac
index 66d9a98c35954be94753c5b8ded2cc0ec650f511..7e8f26199ad671a789abc1f32925281d0a9ed230 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2505,7 +2505,6 @@ AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes])
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
-JIT_SUPPORTED=no
 LIBC="libc.so.6"
 INTL="libc.so.6"
 SQLITE="libsqlite.so.0"
@@ -2526,7 +2525,6 @@ case "$host" in
                arch_target=mips;
                sgen_supported=true
                ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
 
                AC_MSG_CHECKING(for mips n32)
                AC_TRY_COMPILE([],[
@@ -2544,7 +2542,6 @@ case "$host" in
        i*86-*-*)
                TARGET=X86;
                arch_target=x86;
-               JIT_SUPPORTED=yes
                case $host_os in
                  solaris*)
                        LIBC="libc.so"
@@ -2590,7 +2587,6 @@ case "$host" in
        x86_64-*-* | amd64-*-*)
                TARGET=AMD64;
                arch_target=amd64;
-               JIT_SUPPORTED=yes
                if test "x$ac_cv_sizeof_void_p" = "x4"; then
                        AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
                        sizeof_register=8
@@ -2622,7 +2618,6 @@ case "$host" in
                TARGET=IA64
                arch_target=ia64
                ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
                LIBC="libc.so.6.1"
                INTL="libc.so.6.1"
                AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
@@ -2635,7 +2630,6 @@ case "$host" in
                        TARGET=SPARC
                fi
                arch_target=sparc;
-               JIT_SUPPORTED=yes
                ACCESS_UNALIGNED="no"
                case $host_os in
                  linux*) ;;
@@ -2668,7 +2662,6 @@ case "$host" in
                        CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
                fi
                arch_target=ppc;
-               JIT_SUPPORTED=yes
                case $host_os in
                  linux*|darwin*)
                        sgen_supported=true
@@ -2679,7 +2672,6 @@ case "$host" in
                TARGET=ARM;
                arch_target=arm;
                ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
                CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
                sgen_supported=true
                ;;
@@ -2687,7 +2679,6 @@ case "$host" in
                TARGET=ARM;
                arch_target=arm;
                ACCESS_UNALIGNED="no"
-               JIT_SUPPORTED=yes
                sgen_supported=true
                AOT_SUPPORTED="yes"
                CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
@@ -2697,7 +2688,6 @@ case "$host" in
 #              TARGET=ARM;
 #              arch_target=arm;
 #              ACCESS_UNALIGNED="no"
-#              JIT_SUPPORTED=yes
 #              sgen_supported=true
 #              AOT_SUPPORTED="no"
 #              ;;
@@ -2705,7 +2695,6 @@ case "$host" in
                # https://lkml.org/lkml/2012/7/15/133
                TARGET=ARM64
                arch_target=arm64
-               JIT_SUPPORTED=yes
                sgen_supported=true
                boehm_supported=false
                ;;
@@ -2713,7 +2702,6 @@ case "$host" in
                TARGET=S390X;
                arch_target=s390x;
                ACCESS_UNALIGNED="yes"
-               JIT_SUPPORTED=yes
                sgen_supported=true
                CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
                ;;
@@ -2729,9 +2717,7 @@ if test "x$host" != "x$target"; then
                TARGET=ARM;
                arch_target=arm;
                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
@@ -2769,7 +2755,6 @@ if test "x$host" != "x$target"; then
 #              arch_target=arm
 #              AC_DEFINE(TARGET_ARM, 1, [...])
 #              ACCESS_UNALIGNED="no"
-#              JIT_SUPPORTED=yes
 #              sizeof_register=4
 #               CPPFLAGS="$CPPFLAGS \
 #                    -D__ARM_EABI__ \
@@ -2779,7 +2764,6 @@ if test "x$host" != "x$target"; then
 #                    -DDISABLE_SOCKETS \
 #                    -DDISABLE_ATTACH \
 #                    -DUSE_NEWLIB"
-#              jit_wanted=true
                # Can't use tls, since it depends on the runtime detection of tls offsets
                # in mono-compiler.h
 #              with_tls=pthread
@@ -2796,9 +2780,7 @@ if test "x$host" != "x$target"; then
                AC_DEFINE(TARGET_ARM, 1, [...])
                AC_DEFINE(TARGET_ANDROID, 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
@@ -2818,9 +2800,7 @@ if test "x$host" != "x$target"; then
                arch_target=x86;
                AC_DEFINE(TARGET_X86, 1, [...])
                AC_DEFINE(TARGET_ANDROID, 1, [...])
-               JIT_SUPPORTED=yes
                CPPFLAGS="$CPPFLAGS"
-               jit_wanted=true
                sgen_supported=true
                # Can't use tls, since it depends on the runtime detection of tls offsets
                # in mono-compiler.h            
@@ -2829,8 +2809,6 @@ if test "x$host" != "x$target"; then
                ;;                      
        aarch64-*)
                TARGET=ARM64
-               JIT_SUPPORTED=yes
-               jit_wanted=true
                ;;
        *)
                AC_MSG_ERROR([Cross compiling is not supported for target $target])
@@ -2953,19 +2931,7 @@ fi
 AC_SUBST(SGEN_DEFINES)
 AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes)
 
-USEJIT=false
-if test x$JIT_SUPPORTED = xyes; then
-   if $jit_wanted; then
-      USEJIT=true
-      jit_status="Building and using the JIT"
-   else
-      AC_ERROR(No JIT support available or selected.)
-   fi
-else
-   AC_ERROR(No JIT support available or selected.)
-fi
-
-AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
+jit_status="Building and using the JIT"
 
 libsuffix=".so"
 
@@ -3368,7 +3334,6 @@ AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
 AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64)
 AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target")
 
-AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$libgc = xincluded)
 
 AC_SUBST(LIBC)

diff --git a/data/Makefile.am b/data/Makefile.am
index 32a13623cb9d66f4c247fcd2332b771859bc7793..daf6f38a79b0f46601558a19b3da7f1952152b62 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -26,12 +26,8 @@ else
 SGENPCFILE=
 endif
 
-if JIT_SUPPORTED
 pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
                system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
-else
-pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
-endif
 
 DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
                system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py

diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index fd581ff5514d8c6a5cbe0dfb7a2b18098cae22a1..0a6e86d0c0cbda09e0dc599d65c87c5eaa2e0d16 100644 (file)
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -4,7 +4,6 @@ if HOST_WIN32
 export HOST_CC
 endif
 
-if JIT_SUPPORTED
 if !SHARED_MONO
 static_libs=   \
        $(top_builddir)/mono/metadata/libmonoruntime-static.la  \
@@ -17,9 +16,6 @@ runtime_lib=../mini/$(LIBMONO_LA) $(static_libs)
 else
 runtime_lib=../mini/$(LIBMONO_LA)
 endif
-else
-runtime_lib=../interpreter/libmint.la
-endif
 
 if DISABLE_EXECUTABLES
 bin_PROGRAMS =

diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in
index 104294b401a740f5244e6f0c7240f5b6a771a438..b4c85e1a4d318c7138c0ff43431c8eed3e8edbf4 100755 (executable)
--- a/mono/mini/Makefile.am.in
+++ b/mono/mini/Makefile.am.in
@@ -83,8 +83,6 @@ libmonoldflags=$(monoldflags) -version-info 1:0:0
 endif
 endif
 
-if JIT_SUPPORTED
-
 if SUPPORT_SGEN
 sgen_binaries = mono-sgen
 sgen_libraries = libmonosgen-2.0.la
@@ -166,8 +164,6 @@ libmono_llvm_la_LIBADD += $(top_builddir)/mono/mini/libmonoboehm-$(API_VER).la $
 endif
 endif
 
-endif
-
 mono_boehm_SOURCES = \
        main.c
 
@@ -196,7 +192,7 @@ endif
        @echo "const char *build_date = \"`date`\";" > buildver-boehm.h
 mono_boehm-main.$(OBJEXT): buildver-boehm.h
 main.c: buildver-boehm.h
-       
+
 endif
 
 if DISABLE_EXECUTABLES
@@ -730,11 +726,7 @@ clean-local:
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-if JIT_SUPPORTED
 BUILT_SOURCES = version.h $(arch_built)
-else
-BUILT_SOURCES = version.h
-endif
 
 CLEANFILES= $(BUILT_SOURCES) *.exe *.dll
 EXTRA_DIST = TestDriver.cs ldscript ldscript.mono \

diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index 585b5641829af3d4668b8035161874947dca3cea..25555809f1d2c425b7721bc56361777fe40f13fb 100644 (file)
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -3,7 +3,6 @@ if HOST_WIN32
 export HOST_CC
 endif
 
-if JIT_SUPPORTED
 if DISABLE_EXECUTABLES
 runtime_lib=../mini/$(LIBMONO_LA) $(static_libs)
 else
@@ -20,9 +19,6 @@ else
 runtime_lib=../mini/$(LIBMONO_LA)
 endif
 endif
-else
-runtime_lib=../interpreter/libmint.la
-endif
 
 if DISABLE_EXECUTABLES
 bin_PROGRAMS =

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 25bb9b51f707d608ed13a4e80d042ebdb38f6349..b0d1e2f77de31eb14d83c4acd3f8a0a841c43b12 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
 
 if !DISABLE_LIBRARIES
 if !DISABLE_PROFILER
-if JIT_SUPPORTED
 bin_PROGRAMS = mprof-report
 lib_LTLIBRARIES = libmono-profiler-cov.la libmono-profiler-aot.la libmono-profiler-iomap.la libmono-profiler-log.la
 if PLATFORM_DARWIN
@@ -22,7 +21,6 @@ libmono_profiler_log_la_LDFLAGS = -avoid-version
 endif
 endif
 endif
-endif
 
 if HAVE_OPROFILE
 # Do something that uses OPROFILE_CFLAGS and OPROFILE_LIBS

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ac0e3a9a95706952ae1719ba43a001794181e540..be62dd633ef71d23c7a1d6007d0af53db5f3dcbc 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -165,11 +165,7 @@ EXTRA_DIST =                       \
        get-cygwin-deps.sh      \
        mono-configuration-crypto.in
 
-if USE_JIT
 mono_interp = mono
-else
-mono_interp = mint
-endif
 
 if HOST_WIN32
 if CROSS_COMPILING