diff options
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/Makefile.in | 15 | ||||
| -rw-r--r-- | libjava/include/config.h.in | 7 | ||||
| -rw-r--r-- | libjava/include/execution.h | 7 | ||||
| -rw-r--r-- | libjava/include/java-interp.h | 14 |
4 files changed, 29 insertions, 14 deletions
diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index bd2d95d..49f8767 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -41,7 +41,9 @@ subdir = include DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(tool_include__HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \ + $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/confsubdir.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/gxx-include-dir.m4 \ @@ -56,10 +58,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../config/tls.m4 \ $(top_srcdir)/../config/unwind_ipinfo.m4 \ - $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ - $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ - $(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \ - $(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \ + $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ + $(top_srcdir)/../ltversion.m4 $(top_srcdir)/mingwld.m4 \ + $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h @@ -149,6 +152,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTERPRETER = @INTERPRETER@ +INTERPRETER_FALSE = @INTERPRETER_FALSE@ +INTERPRETER_TRUE = @INTERPRETER_TRUE@ JAR = @JAR@ JAVA_HOME = @JAVA_HOME@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index b47f248..99da702 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -46,6 +46,9 @@ /* Define to 1 if you have the <bstring.h> header file. */ #undef HAVE_BSTRING_H +/* Define to 1 if the target assembler supports thread-local storage. */ +#undef HAVE_CC_TLS + /* Define to 1 if you have the `chmod' function. */ #undef HAVE_CHMOD @@ -379,6 +382,10 @@ library search path. */ #undef LTDL_SHLIBPATH_VAR +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Define if MinGW libgcj uses the Windows UNICODE OS API. */ #undef MINGW_LIBGCJ_UNICODE diff --git a/libjava/include/execution.h b/libjava/include/execution.h index eac6133..c48b2fc 100644 --- a/libjava/include/execution.h +++ b/libjava/include/execution.h @@ -199,6 +199,7 @@ struct _Jv_IndirectCompiledEngine : public _Jv_CompiledEngine _Jv_Free (aux->field_initializers); } +#ifdef INTERPRETER static _Jv_ClosureList **do_get_closure_list (jclass klass) { _Jv_IndirectCompiledClass *aux = get_aux_info (klass); @@ -208,9 +209,10 @@ struct _Jv_IndirectCompiledEngine : public _Jv_CompiledEngine return aux->closures; } +#endif }; - +#ifdef INTERPRETER // This handles interpreted code. class _Jv_InterpreterEngine : public _Jv_ExecutionEngine @@ -266,8 +268,9 @@ class _Jv_InterpreterEngine : public _Jv_ExecutionEngine } }; - extern _Jv_InterpreterEngine _Jv_soleInterpreterEngine; +#endif // INTERPRETER + extern _Jv_CompiledEngine _Jv_soleCompiledEngine; extern _Jv_IndirectCompiledEngine _Jv_soleIndirectCompiledEngine; #endif // __JAVA_EXECUTION_H__ diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h index f0b77f9..b0d0da4 100644 --- a/libjava/include/java-interp.h +++ b/libjava/include/java-interp.h @@ -15,6 +15,13 @@ details. */ #include <java-cpool.h> #include <gnu/gcj/runtime/NameFinder.h> +enum _Jv_FrameType +{ + frame_native, + frame_interpreter, + frame_proxy +}; + #ifdef INTERPRETER #pragma interface @@ -373,13 +380,6 @@ public: } }; -enum _Jv_FrameType -{ - frame_native, - frame_interpreter, - frame_proxy -}; - // The composite call stack as represented by a linked list of frames class _Jv_Frame { |