diff options
-rw-r--r-- | mono/mini/.gitignore | 2 | ||||
-rwxr-xr-x | mono/mini/Makefile.am.in | 24 | ||||
-rw-r--r-- | mono/mini/driver.c | 2 | ||||
-rw-r--r-- | mono/mini/interp/hacks.h (renamed from mono/mini/interpreter/hacks.h) | 0 | ||||
-rw-r--r-- | mono/mini/interp/interp-internals.h (renamed from mono/mini/interpreter/interp-internals.h) | 0 | ||||
-rw-r--r-- | mono/mini/interp/interp.c (renamed from mono/mini/interpreter/interp.c) | 0 | ||||
-rw-r--r-- | mono/mini/interp/interp.h (renamed from mono/mini/interpreter/interp.h) | 0 | ||||
-rw-r--r-- | mono/mini/interp/mintops.c (renamed from mono/mini/interpreter/mintops.c) | 0 | ||||
-rw-r--r-- | mono/mini/interp/mintops.def (renamed from mono/mini/interpreter/mintops.def) | 0 | ||||
-rw-r--r-- | mono/mini/interp/mintops.h (renamed from mono/mini/interpreter/mintops.h) | 0 | ||||
-rw-r--r-- | mono/mini/interp/transform.c (renamed from mono/mini/interpreter/transform.c) | 0 | ||||
-rw-r--r-- | mono/mini/mini-exceptions.c | 2 | ||||
-rw-r--r-- | mono/mini/mini-runtime.c | 2 |
13 files changed, 16 insertions, 16 deletions
diff --git a/mono/mini/.gitignore b/mono/mini/.gitignore index f53010594c7..af434f4218a 100644 --- a/mono/mini/.gitignore +++ b/mono/mini/.gitignore @@ -8,7 +8,7 @@ /*.dll /*.mdb /*.lo -/interpreter/*.lo +/interp/*.lo /*.loT /*.la /.libs diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index e231385c8c8..1aa2808c3dc 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -43,7 +43,7 @@ RUNTIME_EXECUTABLE = $(if $(BOEHM),$(top_builddir)/mono/mini/mono-boehm,$(top_bu MINI_RUNTIME = MONO_PATH=$(CLASS) $(RUNTIME_EXECUTABLE) TOOLS_RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/build $(top_builddir)/runtime/mono-wrapper -INTERPRETER_RUNTIME = $(MINI_RUNTIME) --interpreter +INTERP_RUNTIME = $(MINI_RUNTIME) --interpreter RUNTIME_AOTCHECK = MONO_PATH="$(CLASS)$(PLATFORM_PATH_SEPARATOR)." $(RUNTIME_EXECUTABLE) MCS = CSC_SDK_PATH_DISABLED= $(TOOLS_RUNTIME) $(CSC) -unsafe -nowarn:0162 -nologo -noconfig -r:$(CLASS)/mscorlib.dll -r:$(CLASS)/System.dll -r:$(CLASS)/System.Core.dll @@ -388,15 +388,15 @@ endif endif if ENABLE_INTERPRETER -interpreter_sources = \ - interpreter/hacks.h \ - interpreter/interp.h \ - interpreter/interp-internals.h \ - interpreter/interp.c \ - interpreter/mintops.h \ - interpreter/mintops.def \ - interpreter/mintops.c \ - interpreter/transform.c +interp_sources = \ + interp/hacks.h \ + interp/interp.h \ + interp/interp-internals.h \ + interp/interp.c \ + interp/mintops.h \ + interp/mintops.def \ + interp/mintops.c \ + interp/transform.c endif if ENABLE_LLVM @@ -628,7 +628,7 @@ os_sources = $(darwin_sources) $(posix_sources) monobin_platform_ldflags=-framework CoreFoundation -framework Foundation endif -libmini_la_SOURCES = $(common_sources) $(llvm_sources) $(llvm_runtime_sources) $(interpreter_sources) $(arch_sources) $(os_sources) +libmini_la_SOURCES = $(common_sources) $(llvm_sources) $(llvm_runtime_sources) $(interp_sources) $(arch_sources) $(os_sources) libmini_la_CFLAGS = $(mono_CFLAGS) libmonoboehm_2_0_la_SOURCES = @@ -753,7 +753,7 @@ rcheck: mono $(regtests) $(MINI_RUNTIME) --regression $(regtests) richeck: mono $(iregtests) - $(INTERPRETER_RUNTIME) --regression $(iregtests) + $(INTERP_RUNTIME) --regression $(iregtests) if ARM check-seq-points: diff --git a/mono/mini/driver.c b/mono/mini/driver.c index 860e1ca626f..9674a350f90 100644 --- a/mono/mini/driver.c +++ b/mono/mini/driver.c @@ -56,7 +56,7 @@ #include "mini.h" #include "jit.h" #include "aot-compiler.h" -#include "interpreter/interp.h" +#include "interp/interp.h" #include <string.h> #include <ctype.h> diff --git a/mono/mini/interpreter/hacks.h b/mono/mini/interp/hacks.h index 9697ccbad6f..9697ccbad6f 100644 --- a/mono/mini/interpreter/hacks.h +++ b/mono/mini/interp/hacks.h diff --git a/mono/mini/interpreter/interp-internals.h b/mono/mini/interp/interp-internals.h index f26e4ff57b3..f26e4ff57b3 100644 --- a/mono/mini/interpreter/interp-internals.h +++ b/mono/mini/interp/interp-internals.h diff --git a/mono/mini/interpreter/interp.c b/mono/mini/interp/interp.c index 9c21f957355..9c21f957355 100644 --- a/mono/mini/interpreter/interp.c +++ b/mono/mini/interp/interp.c diff --git a/mono/mini/interpreter/interp.h b/mono/mini/interp/interp.h index 59428a882f2..59428a882f2 100644 --- a/mono/mini/interpreter/interp.h +++ b/mono/mini/interp/interp.h diff --git a/mono/mini/interpreter/mintops.c b/mono/mini/interp/mintops.c index 5b4d69269e8..5b4d69269e8 100644 --- a/mono/mini/interpreter/mintops.c +++ b/mono/mini/interp/mintops.c diff --git a/mono/mini/interpreter/mintops.def b/mono/mini/interp/mintops.def index 54c5422b27e..54c5422b27e 100644 --- a/mono/mini/interpreter/mintops.def +++ b/mono/mini/interp/mintops.def diff --git a/mono/mini/interpreter/mintops.h b/mono/mini/interp/mintops.h index e787526e2fe..e787526e2fe 100644 --- a/mono/mini/interpreter/mintops.h +++ b/mono/mini/interp/mintops.h diff --git a/mono/mini/interpreter/transform.c b/mono/mini/interp/transform.c index e5e2ec931d3..e5e2ec931d3 100644 --- a/mono/mini/interpreter/transform.c +++ b/mono/mini/interp/transform.c diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c index de5745a88db..272065388e6 100644 --- a/mono/mini/mini-exceptions.c +++ b/mono/mini/mini-exceptions.c @@ -73,7 +73,7 @@ #include "seq-points.h" #include "llvm-runtime.h" #include "mini-llvm.h" -#include "interpreter/interp.h" +#include "interp/interp.h" #ifdef ENABLE_LLVM #include "mini-llvm-cpp.h" diff --git a/mono/mini/mini-runtime.c b/mono/mini/mini-runtime.c index 2db0d997bee..9336b94f2d2 100644 --- a/mono/mini/mini-runtime.c +++ b/mono/mini/mini-runtime.c @@ -91,7 +91,7 @@ #endif #ifdef ENABLE_INTERPRETER -#include "interpreter/interp.h" +#include "interp/interp.h" #endif static guint32 default_opt = 0; |