git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.ac (INTERPRETER): New AM_CONDITIONAL. 

* configure.ac (INTERPRETER): New AM_CONDITIONAL.
	* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
	as being for interpreter only.  Place interpreter related files in
	'if INTERPRETER' block.
	(interpreter_package_files): New list.
	(interpreter_header_vars): Ditto.
	(emit_package_rule_to_list): Renamed from emit_package_rule with
	new target list parameter.
	(emit_package_rule): Rewritten to call emit_package_rule_to_list.
	(emit_interpreter_rule): New function.
	(emit_source_var): Place interpreter related files in
	interpreter_header_vars.
	* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
	(libgcj_interpret_source_files): New variable.
	(libgcj_la_SOURCES): Move jvmti.cc and  interpret.cc to
	libgcj_interpret_source_files and include
	libgcj_interpret_source_files.
	(nat_jdwp_source_files): New variable.
	(nat_jvmti_source_files): Ditto.
	(nat_source_files): Move jdwp and jvmti related files to
	nat_jdwp_source_files and nat_jvmti_source_files and include
	nat_jdwp_source_files and nat_jvmti_source_files.
	* Makefile.in: Regenerate.
	* include/Makefile.in: Ditto.
	* testsuite/Makefile.in: Ditto.
	* gcj/Makefile.in: Ditto.
	* sources.am: Ditto.
	* configure: Ditto.
	* include/config.h.in: Ditto.
	* interpret.cc: Remove #ifdef INTERPRETER block.
	* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
	interpreter disabled.
	* include/java-interp.h (_Jv_FrameType): Move outside of
	#ifdef INTERPRETER block.
	* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
	_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
	#ifdef INTERPRETER block.
	* jni.cc (jvmti.h, jvmti-int.h):  Only include if INTERPRETER is
	defined.
	(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
	if INTERPRETER is defined.
	* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h):  Only
	include if INTERPRETER is defined.
	(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
	jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
	jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
	defined.
	(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
	(parse_init_args): Only process jvmti related options if
	INTERPRETER is defined.
	(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
	defined.
	(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
	defined.
	* link.cc (jvmti.h, jvmti-int.h):  Only include if INTERPRETER is
	defined.
	(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
	Define if if INTERPRETER is not defined.
	(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
	INTERPRETER is defined.
	* boehm.cc (closure_list_pointer, finalize_closure_list,
	_Jv_ClosureListFinalizer): Only define if INTERPRETER is
	defined.
	* java/lang/natThread.cc (jvmti.h, jvmti-int.h):  Only include if
	INTERPRETER is defined.
	(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
	INTERPRETER is defined.
	* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
	and friend declaration inside #ifdef INTERPRETER block.
	* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
	_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
	Only define if INTERPRETER is defined.
	* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
	Include.
	(generateProxyClass): Throw UnsupportedOperationException unless
	INTERPRETER is defined.

From-SVN: r127097
This commit is contained in:
David Daney 2007-07-31 16:17:21 +00:00 committed by David Daney
parent 68ae229af3
commit 86acf60c5b
23 changed files with 429 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libjava/ChangeLog
View File

@ -1,3 +1,82 @@
2007-07-31 David Daney <ddaney@avtrex.com>
* configure.ac (INTERPRETER): New AM_CONDITIONAL.
* scripts/makemake.tcl (package_map): Mark jdwp and jvmti packages
as being for interpreter only. Place interpreter related files in
'if INTERPRETER' block.
(interpreter_package_files): New list.
(interpreter_header_vars): Ditto.
(emit_package_rule_to_list): Renamed from emit_package_rule with
new target list parameter.
(emit_package_rule): Rewritten to call emit_package_rule_to_list.
(emit_interpreter_rule): New function.
(emit_source_var): Place interpreter related files in
interpreter_header_vars.
* Makefile.am (ACLOCAL_AMFLAGS): Add -I libltdl.
(libgcj_interpret_source_files): New variable.
(libgcj_la_SOURCES): Move jvmti.cc and interpret.cc to
libgcj_interpret_source_files and include
libgcj_interpret_source_files.
(nat_jdwp_source_files): New variable.
(nat_jvmti_source_files): Ditto.
(nat_source_files): Move jdwp and jvmti related files to
nat_jdwp_source_files and nat_jvmti_source_files and include
nat_jdwp_source_files and nat_jvmti_source_files.
* Makefile.in: Regenerate.
* include/Makefile.in: Ditto.
* testsuite/Makefile.in: Ditto.
* gcj/Makefile.in: Ditto.
* sources.am: Ditto.
* configure: Ditto.
* include/config.h.in: Ditto.
* interpret.cc: Remove #ifdef INTERPRETER block.
* stacktrace.cc (UnwindTraceFn): Do not handle proxy frames if
interpreter disabled.
* include/java-interp.h (_Jv_FrameType): Move outside of
#ifdef INTERPRETER block.
* include/execution.h (_Jv_IndirectCompiledEngine::do_get_closure_list,
_Jv_InterpreterEngine, _Jv_soleInterpreterEngine): Place in
#ifdef INTERPRETER block.
* jni.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_JNI_PopSystemFrame, _Jv_JNI_GetEnv): Only do jvmti processing
if INTERPRETER is defined.
* prims.cc (jvmti.h, jvmti-int.h, Jdwp.h, VMVirtualMachine.h): Only
include if INTERPRETER is defined.
(defaultJdwpOptions, jdwpOptions, jvmti_agent_onload_func,
jvmti_agent_onunload_func, jvmti_agentonload, jvmti_agentonunload,
jvmti_agent_opts, load_jvmti_agent): Only define if INTERPRETER is
defined.
(parse_x_arg): Only process 'runjdwp:' if INTERPRETER is defined.
(parse_init_args): Only process jvmti related options if
INTERPRETER is defined.
(_Jv_CreateJavaVM): Only call _Jv_JVMTI_Init if INTERPRETER is
defined.
(_Jv_RunMain): Only do jvmti and jdwp processing if INTERPRETER is
defined.
* link.cc (jvmti.h, jvmti-int.h): Only include if INTERPRETER is
defined.
(_Jv_ThrowNoClassDefFoundError, _Jv_Linker::create_error_method):
Define if if INTERPRETER is not defined.
(_Jv_Linker::wait_for_state): Only do jvmti proccessing if
INTERPRETER is defined.
* boehm.cc (closure_list_pointer, finalize_closure_list,
_Jv_ClosureListFinalizer): Only define if INTERPRETER is
defined.
* java/lang/natThread.cc (jvmti.h, jvmti-int.h): Only include if
INTERPRETER is defined.
(finish_, _Jv_NotifyThreadStart): Only do jvmti proccessing if
INTERPRETER is defined.
* java/lang/Class.h (_Jv_InterpreterEngine): Move declaration
and friend declaration inside #ifdef INTERPRETER block.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures,
_Jv_ClosureList::registerClosure, _Jv_GetInterpClassSourceFile):
Only define if INTERPRETER is defined.
* java/lang/reflect/natVMProxy.cc (UnsupportedOperationException.h):
Include.
(generateProxyClass): Throw UnsupportedOperationException unless
INTERPRETER is defined.
2007-07-29 Matthias Klose <doko@ubuntu.com> 2007-07-29 Matthias Klose <doko@ubuntu.com>
* HACKING: Document regenerating configure. * HACKING: Document regenerating configure.

33
libjava/Makefile.am
View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign subdir-objects AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I . -I .. -I ../config ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl
# May be used by various substitution variables. # May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@ -186,8 +186,14 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc stacktrace.cc \ if INTERPRETER
link.cc defineclass.cc interpret.cc verify.cc \ libgcj_interpret_source_files = jvmti.cc interpret.cc
else
libgcj_interpret_source_files =
endif
libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
link.cc defineclass.cc verify.cc $(libgcj_interpret_source_files) \
$(nat_source_files) $(nat_source_files)
## We need to compile at least the interpreter this way. ## We need to compile at least the interpreter this way.
@ -830,12 +836,22 @@ grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
grmiregistry_DEPENDENCIES = libgcj-tools.la grmiregistry_DEPENDENCIES = libgcj-tools.la
## ################################################################ ## ################################################################
if INTERPRETER
## This lists all the C++ source files in subdirectories. nat_jdwp_source_files = \
nat_source_files = \
gnu/classpath/jdwp/natVMFrame.cc \ gnu/classpath/jdwp/natVMFrame.cc \
gnu/classpath/jdwp/natVMMethod.cc \ gnu/classpath/jdwp/natVMMethod.cc \
gnu/classpath/jdwp/natVMVirtualMachine.cc \ gnu/classpath/jdwp/natVMVirtualMachine.cc
nat_jvmti_source_files = \
gnu/gcj/jvmti/natBreakpoint.cc \
gnu/gcj/jvmti/natNormalBreakpoint.cc
else
nat_jdwp_source_files =
nat_jvmti_source_files =
endif
## This lists all the C++ source files in subdirectories.
nat_source_files = \
$(nat_jdwp_source_files) \
gnu/classpath/natConfiguration.cc \ gnu/classpath/natConfiguration.cc \
gnu/classpath/natSystemProperties.cc \ gnu/classpath/natSystemProperties.cc \
gnu/classpath/natVMStackWalker.cc \ gnu/classpath/natVMStackWalker.cc \
@ -850,8 +866,7 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \ gnu/gcj/io/shs.cc \
gnu/gcj/jvmti/natBreakpoint.cc \ $(nat_jvmti_source_files) \
gnu/gcj/jvmti/natNormalBreakpoint.cc \
gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFinalizerThread.cc \
gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natSharedLibLoader.cc \
gnu/gcj/runtime/natSystemClassLoader.cc \ gnu/gcj/runtime/natSystemClassLoader.cc \

166
libjava/Makefile.in
View File

@ -79,7 +79,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
@XLIB_AWT_TRUE@am__append_17 = $(xlib_nat_headers) @XLIB_AWT_TRUE@am__append_17 = $(xlib_nat_headers)
subdir = . subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/confsubdir.m4 \
$(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/enable.m4 \
@ -155,18 +156,21 @@ lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS)
libgcj_tools_la_LIBADD = libgcj_tools_la_LIBADD =
am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo
libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS) libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS)
am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \ @INTERPRETER_TRUE@am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \
gnu/classpath/debug.lo gnu/classpath/jdwp.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/event.lo \
gnu/classpath/jdwp/event.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/event/filters.lo \
gnu/classpath/jdwp/event/filters.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/exception.lo \
gnu/classpath/jdwp/exception.lo gnu/classpath/jdwp/id.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/id.lo \
gnu/classpath/jdwp/processor.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/processor.lo \
gnu/classpath/jdwp/transport.lo gnu/classpath/jdwp/util.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/transport.lo \
gnu/classpath/jdwp/value.lo gnu/gcj.lo gnu/gcj/convert.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/util.lo \
gnu/gcj/io.lo gnu/gcj/jvmti.lo gnu/gcj/runtime.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/value.lo gnu/gcj/jvmti.lo
gnu/gcj/util.lo gnu/java/awt.lo gnu/java/awt/color.lo \ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
gnu/java/awt/dnd.lo gnu/java/awt/font.lo \ gnu/classpath/debug.lo gnu/gcj.lo gnu/gcj/convert.lo \
gnu/java/awt/font/autofit.lo gnu/java/awt/font/opentype.lo \ gnu/gcj/io.lo gnu/gcj/runtime.lo gnu/gcj/util.lo \
gnu/java/awt.lo gnu/java/awt/color.lo gnu/java/awt/dnd.lo \
gnu/java/awt/font.lo gnu/java/awt/font/autofit.lo \
gnu/java/awt/font/opentype.lo \
gnu/java/awt/font/opentype/truetype.lo gnu/java/awt/image.lo \ gnu/java/awt/font/opentype/truetype.lo gnu/java/awt/image.lo \
gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \ gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
gnu/java/awt/peer/headless.lo gnu/java/awt/print.lo \ gnu/java/awt/peer/headless.lo gnu/java/awt/print.lo \
@ -275,8 +279,9 @@ am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
javax/swing/text/rtf.lo javax/swing/tree.lo \ javax/swing/text/rtf.lo javax/swing/tree.lo \
javax/swing/undo.lo javax/transaction.lo \ javax/swing/undo.lo javax/transaction.lo \
javax/transaction/xa.lo org/ietf/jgss.lo sun/misc.lo \ javax/transaction/xa.lo org/ietf/jgss.lo sun/misc.lo \
sun/reflect.lo sun/reflect/annotation.lo sun/reflect/misc.lo sun/reflect.lo sun/reflect/annotation.lo sun/reflect/misc.lo \
am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \ $(am__DEPENDENCIES_1)
am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \ gnu-java-awt-peer-gtk.lo gnu-java-awt-peer-swing.lo \
gnu-java-beans.lo gnu-java-lang-management.lo \ gnu-java-beans.lo gnu-java-lang-management.lo \
gnu-java-util-prefs-gconf.lo gnu-javax-management.lo \ gnu-java-util-prefs-gconf.lo gnu-javax-management.lo \
@ -286,12 +291,12 @@ am__DEPENDENCIES_2 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
gnu-xml-validation.lo gnu-xml-xpath.lo java-lang-management.lo \ gnu-xml-validation.lo gnu-xml-xpath.lo java-lang-management.lo \
javax-imageio.lo javax-rmi.lo javax-xml.lo org-omg.lo \ javax-imageio.lo javax-rmi.lo javax-xml.lo org-omg.lo \
org-relaxng.lo org-w3c.lo org-xml.lo org-relaxng.lo org-w3c.lo org-xml.lo
am__DEPENDENCIES_3 = $(patsubst classpath/resource/%,%,$(addsuffix \ am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
.lo,$(property_files))) .lo,$(property_files)))
am__DEPENDENCIES_4 = am__DEPENDENCIES_5 =
am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \ stacktrace.cc link.cc defineclass.cc verify.cc jvmti.cc \
gnu/classpath/jdwp/natVMFrame.cc \ interpret.cc gnu/classpath/jdwp/natVMFrame.cc \
gnu/classpath/jdwp/natVMMethod.cc \ gnu/classpath/jdwp/natVMMethod.cc \
gnu/classpath/jdwp/natVMVirtualMachine.cc \ gnu/classpath/jdwp/natVMVirtualMachine.cc \
gnu/classpath/natConfiguration.cc \ gnu/classpath/natConfiguration.cc \
@ -355,10 +360,13 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
java/util/zip/natInflater.cc sun/misc/natUnsafe.cc boehm.cc \ java/util/zip/natInflater.cc sun/misc/natUnsafe.cc boehm.cc \
nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \ nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \
win32-threads.cc no-threads.cc win32-threads.cc no-threads.cc
am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \ @INTERPRETER_TRUE@am__objects_2 = jvmti.lo interpret.lo
gnu/classpath/jdwp/natVMMethod.lo \ @INTERPRETER_TRUE@am__objects_3 = gnu/classpath/jdwp/natVMFrame.lo \
gnu/classpath/jdwp/natVMVirtualMachine.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/natVMMethod.lo \
gnu/classpath/natConfiguration.lo \ @INTERPRETER_TRUE@ gnu/classpath/jdwp/natVMVirtualMachine.lo
@INTERPRETER_TRUE@am__objects_4 = gnu/gcj/jvmti/natBreakpoint.lo \
@INTERPRETER_TRUE@ gnu/gcj/jvmti/natNormalBreakpoint.lo
am__objects_5 = $(am__objects_3) gnu/classpath/natConfiguration.lo \
gnu/classpath/natSystemProperties.lo \ gnu/classpath/natSystemProperties.lo \
gnu/classpath/natVMStackWalker.lo gnu/gcj/natCore.lo \ gnu/classpath/natVMStackWalker.lo gnu/gcj/natCore.lo \
gnu/gcj/convert/JIS0208_to_Unicode.lo \ gnu/gcj/convert/JIS0208_to_Unicode.lo \
@ -369,9 +377,7 @@ am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \
gnu/gcj/convert/natOutput_EUCJIS.lo \ gnu/gcj/convert/natOutput_EUCJIS.lo \
gnu/gcj/convert/natOutput_SJIS.lo \ gnu/gcj/convert/natOutput_SJIS.lo \
gnu/gcj/io/natSimpleSHSStream.lo gnu/gcj/io/shs.lo \ gnu/gcj/io/natSimpleSHSStream.lo gnu/gcj/io/shs.lo \
gnu/gcj/jvmti/natBreakpoint.lo \ $(am__objects_4) gnu/gcj/runtime/natFinalizerThread.lo \
gnu/gcj/jvmti/natNormalBreakpoint.lo \
gnu/gcj/runtime/natFinalizerThread.lo \
gnu/gcj/runtime/natSharedLibLoader.lo \ gnu/gcj/runtime/natSharedLibLoader.lo \
gnu/gcj/runtime/natSystemClassLoader.lo \ gnu/gcj/runtime/natSystemClassLoader.lo \
gnu/gcj/runtime/natStringBuffer.lo gnu/gcj/util/natDebug.lo \ gnu/gcj/runtime/natStringBuffer.lo gnu/gcj/util/natDebug.lo \
@ -417,19 +423,19 @@ am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \
java/util/concurrent/atomic/natAtomicLong.lo \ java/util/concurrent/atomic/natAtomicLong.lo \
java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \ java/util/logging/natLogger.lo java/util/zip/natDeflater.lo \
java/util/zip/natInflater.lo sun/misc/natUnsafe.lo java/util/zip/natInflater.lo sun/misc/natUnsafe.lo
@USING_BOEHMGC_TRUE@am__objects_3 = boehm.lo @USING_BOEHMGC_TRUE@am__objects_6 = boehm.lo
@USING_NOGC_TRUE@am__objects_4 = nogc.lo @USING_NOGC_TRUE@am__objects_7 = nogc.lo
@USING_POSIX_PLATFORM_TRUE@am__objects_5 = posix.lo @USING_POSIX_PLATFORM_TRUE@am__objects_8 = posix.lo
@USING_WIN32_PLATFORM_TRUE@am__objects_6 = win32.lo @USING_WIN32_PLATFORM_TRUE@am__objects_9 = win32.lo
@USING_DARWIN_CRT_TRUE@am__objects_7 = darwin.lo @USING_DARWIN_CRT_TRUE@am__objects_10 = darwin.lo
@USING_POSIX_THREADS_TRUE@am__objects_8 = posix-threads.lo @USING_POSIX_THREADS_TRUE@am__objects_11 = posix-threads.lo
@USING_WIN32_THREADS_TRUE@am__objects_9 = win32-threads.lo @USING_WIN32_THREADS_TRUE@am__objects_12 = win32-threads.lo
@USING_NO_THREADS_TRUE@am__objects_10 = no-threads.lo @USING_NO_THREADS_TRUE@am__objects_13 = no-threads.lo
am_libgcj_la_OBJECTS = prims.lo jni.lo jvmti.lo exception.lo \ am_libgcj_la_OBJECTS = prims.lo jni.lo exception.lo stacktrace.lo \
stacktrace.lo link.lo defineclass.lo interpret.lo verify.lo \ link.lo defineclass.lo verify.lo $(am__objects_2) \
$(am__objects_2) $(am__objects_3) $(am__objects_4) \
$(am__objects_5) $(am__objects_6) $(am__objects_7) \ $(am__objects_5) $(am__objects_6) $(am__objects_7) \
$(am__objects_8) $(am__objects_9) $(am__objects_10) $(am__objects_8) $(am__objects_9) $(am__objects_10) \
$(am__objects_11) $(am__objects_12) $(am__objects_13)
libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS) libgcj_la_OBJECTS = $(am_libgcj_la_OBJECTS)
am_libgcj_bc_la_OBJECTS = libgcj_bc.lo am_libgcj_bc_la_OBJECTS = libgcj_bc.lo
libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS) libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS)
@ -624,6 +630,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
INTERPRETER_FALSE = @INTERPRETER_FALSE@
INTERPRETER_TRUE = @INTERPRETER_TRUE@
JAR = @JAR@ JAR = @JAR@
JAVA_HOME = @JAVA_HOME@ JAVA_HOME = @JAVA_HOME@
JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@
@ -800,7 +808,7 @@ toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@ toolexeclibdir = @toolexeclibdir@
toolexecmainlibdir = @toolexecmainlibdir@ toolexecmainlibdir = @toolexecmainlibdir@
AUTOMAKE_OPTIONS = foreign subdir-objects AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I . -I .. -I ../config ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl
# May be used by various substitution variables. # May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@ -890,8 +898,10 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc \ @INTERPRETER_FALSE@libgcj_interpret_source_files =
stacktrace.cc link.cc defineclass.cc interpret.cc verify.cc \ @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc
libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \
defineclass.cc verify.cc $(libgcj_interpret_source_files) \
$(nat_source_files) $(am__append_7) $(am__append_8) \ $(nat_source_files) $(am__append_7) $(am__append_8) \
$(am__append_9) $(am__append_10) $(am__append_11) \ $(am__append_9) $(am__append_10) $(am__append_11) \
$(am__append_12) $(am__append_13) $(am__append_14) $(am__append_12) $(am__append_13) $(am__append_14)
@ -7307,24 +7317,40 @@ sun_reflect_misc_source_files = \
sun/reflect/misc/ReflectUtil.java sun/reflect/misc/ReflectUtil.java
sun_reflect_misc_header_files = $(patsubst %.java,%.h,$(sun_reflect_misc_source_files)) sun_reflect_misc_header_files = $(patsubst %.java,%.h,$(sun_reflect_misc_source_files))
@INTERPRETER_FALSE@interpreter_packages_source_files =
@INTERPRETER_TRUE@interpreter_packages_source_files = \
@INTERPRETER_TRUE@ gnu/classpath/jdwp.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/event.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/event/filters.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/exception.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/id.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/processor.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/transport.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/util.list \
@INTERPRETER_TRUE@ gnu/classpath/jdwp/value.list \
@INTERPRETER_TRUE@ gnu/gcj/jvmti.list
@INTERPRETER_FALSE@interpreter_header_files =
@INTERPRETER_TRUE@interpreter_header_files = \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_event_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_event_filters_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_exception_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_id_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_processor_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_transport_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_util_header_files) \
@INTERPRETER_TRUE@ $(gnu_classpath_jdwp_value_header_files) \
@INTERPRETER_TRUE@ $(gnu_gcj_jvmti_header_files)
all_packages_source_files = \ all_packages_source_files = \
gnu/awt.list \ gnu/awt.list \
gnu/awt/j2d.list \ gnu/awt/j2d.list \
gnu/classpath.list \ gnu/classpath.list \
gnu/classpath/debug.list \ gnu/classpath/debug.list \
gnu/classpath/jdwp.list \
gnu/classpath/jdwp/event.list \
gnu/classpath/jdwp/event/filters.list \
gnu/classpath/jdwp/exception.list \
gnu/classpath/jdwp/id.list \
gnu/classpath/jdwp/processor.list \
gnu/classpath/jdwp/transport.list \
gnu/classpath/jdwp/util.list \
gnu/classpath/jdwp/value.list \
gnu/gcj.list \ gnu/gcj.list \
gnu/gcj/convert.list \ gnu/gcj/convert.list \
gnu/gcj/io.list \ gnu/gcj/io.list \
gnu/gcj/jvmti.list \
gnu/gcj/runtime.list \ gnu/gcj/runtime.list \
gnu/gcj/util.list \ gnu/gcj/util.list \
gnu/java/awt.list \ gnu/java/awt.list \
@ -7558,26 +7584,17 @@ all_packages_source_files = \
sun/misc.list \ sun/misc.list \
sun/reflect.list \ sun/reflect.list \
sun/reflect/annotation.list \ sun/reflect/annotation.list \
sun/reflect/misc.list sun/reflect/misc.list \
$(interpreter_packages_source_files)
ordinary_header_files = \ ordinary_header_files = \
$(gnu_awt_header_files) \ $(gnu_awt_header_files) \
$(gnu_awt_j2d_header_files) \ $(gnu_awt_j2d_header_files) \
$(gnu_classpath_header_files) \ $(gnu_classpath_header_files) \
$(gnu_classpath_debug_header_files) \ $(gnu_classpath_debug_header_files) \
$(gnu_classpath_jdwp_header_files) \
$(gnu_classpath_jdwp_event_header_files) \
$(gnu_classpath_jdwp_event_filters_header_files) \
$(gnu_classpath_jdwp_exception_header_files) \
$(gnu_classpath_jdwp_id_header_files) \
$(gnu_classpath_jdwp_processor_header_files) \
$(gnu_classpath_jdwp_transport_header_files) \
$(gnu_classpath_jdwp_util_header_files) \
$(gnu_classpath_jdwp_value_header_files) \
$(gnu_gcj_header_files) \ $(gnu_gcj_header_files) \
$(gnu_gcj_convert_header_files) \ $(gnu_gcj_convert_header_files) \
$(gnu_gcj_io_header_files) \ $(gnu_gcj_io_header_files) \
$(gnu_gcj_jvmti_header_files) \
$(gnu_gcj_runtime_header_files) \ $(gnu_gcj_runtime_header_files) \
$(gnu_gcj_tools_gcj_dbtool_header_files) \ $(gnu_gcj_tools_gcj_dbtool_header_files) \
$(gnu_gcj_util_header_files) \ $(gnu_gcj_util_header_files) \
@ -7808,7 +7825,8 @@ ordinary_header_files = \
$(sun_misc_header_files) \ $(sun_misc_header_files) \
$(sun_reflect_header_files) \ $(sun_reflect_header_files) \
$(sun_reflect_annotation_header_files) \ $(sun_reflect_annotation_header_files) \
$(sun_reflect_misc_header_files) $(sun_reflect_misc_header_files) \
$(interpreter_header_files)
bc_objects = \ bc_objects = \
gnu-CORBA.lo \ gnu-CORBA.lo \
@ -8046,10 +8064,19 @@ grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
grmiregistry_LINK = $(GCJLINK) grmiregistry_LINK = $(GCJLINK)
grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
grmiregistry_DEPENDENCIES = libgcj-tools.la grmiregistry_DEPENDENCIES = libgcj-tools.la
@INTERPRETER_FALSE@nat_jdwp_source_files =
@INTERPRETER_TRUE@nat_jdwp_source_files = \
@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMFrame.cc \
@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMMethod.cc \
@INTERPRETER_TRUE@gnu/classpath/jdwp/natVMVirtualMachine.cc
@INTERPRETER_FALSE@nat_jvmti_source_files =
@INTERPRETER_TRUE@nat_jvmti_source_files = \
@INTERPRETER_TRUE@gnu/gcj/jvmti/natBreakpoint.cc \
@INTERPRETER_TRUE@gnu/gcj/jvmti/natNormalBreakpoint.cc
nat_source_files = \ nat_source_files = \
gnu/classpath/jdwp/natVMFrame.cc \ $(nat_jdwp_source_files) \
gnu/classpath/jdwp/natVMMethod.cc \
gnu/classpath/jdwp/natVMVirtualMachine.cc \
gnu/classpath/natConfiguration.cc \ gnu/classpath/natConfiguration.cc \
gnu/classpath/natSystemProperties.cc \ gnu/classpath/natSystemProperties.cc \
gnu/classpath/natVMStackWalker.cc \ gnu/classpath/natVMStackWalker.cc \
@ -8064,8 +8091,7 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \
gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/natSimpleSHSStream.cc \
gnu/gcj/io/shs.cc \ gnu/gcj/io/shs.cc \
gnu/gcj/jvmti/natBreakpoint.cc \ $(nat_jvmti_source_files) \
gnu/gcj/jvmti/natNormalBreakpoint.cc \
gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natFinalizerThread.cc \
gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natSharedLibLoader.cc \
gnu/gcj/runtime/natSystemClassLoader.cc \ gnu/gcj/runtime/natSystemClassLoader.cc \
@ -9726,7 +9752,7 @@ distclean-tags:
distdir: $(DISTFILES) distdir: $(DISTFILES)
$(am__remove_distdir) $(am__remove_distdir)
mkdir $(distdir) mkdir $(distdir)
$(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/scripts $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../config $(distdir)/libltdl $(distdir)/scripts
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \ list='$(DISTFILES)'; for file in $$list; do \

2
libjava/boehm.cc
View File

@ -380,6 +380,7 @@ _Jv_AllocRawObj (jsize size)
return (void *) GC_MALLOC (size ? size : 1); return (void *) GC_MALLOC (size ? size : 1);
} }
#ifdef INTERPRETER
typedef _Jv_ClosureList *closure_list_pointer; typedef _Jv_ClosureList *closure_list_pointer;
/* Release closures in a _Jv_ClosureList. */ /* Release closures in a _Jv_ClosureList. */
@ -402,6 +403,7 @@ _Jv_ClosureListFinalizer ()
NULL, NULL, NULL); NULL, NULL, NULL);
return clpp; return clpp;
} }
#endif // INTERPRETER
static void static void
call_finalizer (GC_PTR obj, GC_PTR client_data) call_finalizer (GC_PTR obj, GC_PTR client_data)

23
libjava/configure vendored
View File

@ -459,7 +459,7 @@ ac_includes_default="\
#endif" #endif"
ac_subdirs_all="$ac_subdirs_all classpath libltdl" ac_subdirs_all="$ac_subdirs_all classpath libltdl"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM lt_ECHO CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM lt_ECHO CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -18487,6 +18487,16 @@ fi
INTERPRETER="$libgcj_interpreter" INTERPRETER="$libgcj_interpreter"
if test "$libgcj_interpreter" = yes; then
INTERPRETER_TRUE=
INTERPRETER_FALSE='#'
else
INTERPRETER_TRUE='#'
INTERPRETER_FALSE=
fi
echo "$as_me:$LINENO: checking for exception model to use" >&5 echo "$as_me:$LINENO: checking for exception model to use" >&5
echo $ECHO_N "checking for exception model to use... $ECHO_C" >&6 echo $ECHO_N "checking for exception model to use... $ECHO_C" >&6
ac_ext=cc ac_ext=cc
@ -18501,7 +18511,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
: :
else else
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 18504 "configure" #line 18514 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()
@ -27948,6 +27958,13 @@ echo "$as_me: error: conditional \"JAVA_HOME_SET\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${INTERPRETER_TRUE}" && test -z "${INTERPRETER_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"INTERPRETER\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"INTERPRETER\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USING_WIN32_PLATFORM_TRUE}" && test -z "${USING_WIN32_PLATFORM_FALSE}"; then if test -z "${USING_WIN32_PLATFORM_TRUE}" && test -z "${USING_WIN32_PLATFORM_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USING_WIN32_PLATFORM\" was never defined. { { echo "$as_me:$LINENO: error: conditional \"USING_WIN32_PLATFORM\" was never defined.
Usually this means the macro was only invoked conditionally." >&5 Usually this means the macro was only invoked conditionally." >&5
@ -29180,6 +29197,8 @@ s,@JAVA_HOME_SET_TRUE@,$JAVA_HOME_SET_TRUE,;t t
s,@JAVA_HOME_SET_FALSE@,$JAVA_HOME_SET_FALSE,;t t s,@JAVA_HOME_SET_FALSE@,$JAVA_HOME_SET_FALSE,;t t
s,@JAVA_HOME@,$JAVA_HOME,;t t s,@JAVA_HOME@,$JAVA_HOME,;t t
s,@INTERPRETER@,$INTERPRETER,;t t s,@INTERPRETER@,$INTERPRETER,;t t
s,@INTERPRETER_TRUE@,$INTERPRETER_TRUE,;t t
s,@INTERPRETER_FALSE@,$INTERPRETER_FALSE,;t t
s,@LIBFFI@,$LIBFFI,;t t s,@LIBFFI@,$LIBFFI,;t t
s,@LIBFFIINCS@,$LIBFFIINCS,;t t s,@LIBFFIINCS@,$LIBFFIINCS,;t t
s,@PLATFORM@,$PLATFORM,;t t s,@PLATFORM@,$PLATFORM,;t t

1
libjava/configure.ac
View File

@ -564,6 +564,7 @@ if test "$libgcj_interpreter" = yes; then
fi fi
INTERPRETER="$libgcj_interpreter" INTERPRETER="$libgcj_interpreter"
AC_SUBST(INTERPRETER) AC_SUBST(INTERPRETER)
AM_CONDITIONAL(INTERPRETER, test "$libgcj_interpreter" = yes)
AC_MSG_CHECKING([for exception model to use]) AC_MSG_CHECKING([for exception model to use])
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)

15
libjava/gcj/Makefile.in
View File

@ -42,7 +42,9 @@ DIST_COMMON = $(gcj_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/libgcj-config.h.in \ $(srcdir)/Makefile.in $(srcdir)/libgcj-config.h.in \
$(toolgcj_HEADERS) $(toolgcj_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/depstand.m4 \
$(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/enable.m4 \
$(top_srcdir)/../config/gxx-include-dir.m4 \ $(top_srcdir)/../config/gxx-include-dir.m4 \
@ -57,10 +59,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../config/tls.m4 \ $(top_srcdir)/../config/tls.m4 \
$(top_srcdir)/../config/unwind_ipinfo.m4 \ $(top_srcdir)/../config/unwind_ipinfo.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
$(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/mingwld.m4 \
$(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
CONFIG_HEADER = $(top_builddir)/include/config.h libgcj-config.h CONFIG_HEADER = $(top_builddir)/include/config.h libgcj-config.h
@ -150,6 +153,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
INTERPRETER_FALSE = @INTERPRETER_FALSE@
INTERPRETER_TRUE = @INTERPRETER_TRUE@
JAR = @JAR@ JAR = @JAR@
JAVA_HOME = @JAVA_HOME@ JAVA_HOME = @JAVA_HOME@
JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@

15
libjava/include/Makefile.in
View File

@ -41,7 +41,9 @@ subdir = include
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(tool_include__HEADERS) $(srcdir)/config.h.in $(tool_include__HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/depstand.m4 \
$(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/enable.m4 \
$(top_srcdir)/../config/gxx-include-dir.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/no-executables.m4 \
$(top_srcdir)/../config/tls.m4 \ $(top_srcdir)/../config/tls.m4 \
$(top_srcdir)/../config/unwind_ipinfo.m4 \ $(top_srcdir)/../config/unwind_ipinfo.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
$(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/mingwld.m4 \
$(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h CONFIG_HEADER = config.h $(top_builddir)/gcj/libgcj-config.h
@ -149,6 +152,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
INTERPRETER_FALSE = @INTERPRETER_FALSE@
INTERPRETER_TRUE = @INTERPRETER_TRUE@
JAR = @JAR@ JAR = @JAR@
JAVA_HOME = @JAVA_HOME@ JAVA_HOME = @JAVA_HOME@
JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@

7
libjava/include/config.h.in
View File

@ -46,6 +46,9 @@
/* Define to 1 if you have the <bstring.h> header file. */ /* Define to 1 if you have the <bstring.h> header file. */
#undef HAVE_BSTRING_H #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. */ /* Define to 1 if you have the `chmod' function. */
#undef HAVE_CHMOD #undef HAVE_CHMOD
@ -379,6 +382,10 @@
library search path. */ library search path. */
#undef LTDL_SHLIBPATH_VAR #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. */ /* Define if MinGW libgcj uses the Windows UNICODE OS API. */
#undef MINGW_LIBGCJ_UNICODE #undef MINGW_LIBGCJ_UNICODE

7
libjava/include/execution.h
View File

@ -199,6 +199,7 @@ struct _Jv_IndirectCompiledEngine : public _Jv_CompiledEngine
_Jv_Free (aux->field_initializers); _Jv_Free (aux->field_initializers);
} }
#ifdef INTERPRETER
static _Jv_ClosureList **do_get_closure_list (jclass klass) static _Jv_ClosureList **do_get_closure_list (jclass klass)
{ {
_Jv_IndirectCompiledClass *aux = get_aux_info (klass); _Jv_IndirectCompiledClass *aux = get_aux_info (klass);
@ -208,9 +209,10 @@ struct _Jv_IndirectCompiledEngine : public _Jv_CompiledEngine
return aux->closures; return aux->closures;
} }
#endif
}; };
#ifdef INTERPRETER
// This handles interpreted code. // This handles interpreted code.
class _Jv_InterpreterEngine : public _Jv_ExecutionEngine class _Jv_InterpreterEngine : public _Jv_ExecutionEngine
@ -266,8 +268,9 @@ class _Jv_InterpreterEngine : public _Jv_ExecutionEngine
} }
}; };
extern _Jv_InterpreterEngine _Jv_soleInterpreterEngine; extern _Jv_InterpreterEngine _Jv_soleInterpreterEngine;
#endif // INTERPRETER
extern _Jv_CompiledEngine _Jv_soleCompiledEngine; extern _Jv_CompiledEngine _Jv_soleCompiledEngine;
extern _Jv_IndirectCompiledEngine _Jv_soleIndirectCompiledEngine; extern _Jv_IndirectCompiledEngine _Jv_soleIndirectCompiledEngine;
#endif // __JAVA_EXECUTION_H__ #endif // __JAVA_EXECUTION_H__

14
libjava/include/java-interp.h
View File

@ -15,6 +15,13 @@ details. */
#include <java-cpool.h> #include <java-cpool.h>
#include <gnu/gcj/runtime/NameFinder.h> #include <gnu/gcj/runtime/NameFinder.h>
enum _Jv_FrameType
{
frame_native,
frame_interpreter,
frame_proxy
};
#ifdef INTERPRETER #ifdef INTERPRETER
#pragma interface #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 // The composite call stack as represented by a linked list of frames
class _Jv_Frame class _Jv_Frame
{ {

4
libjava/interpret.cc
View File

@ -43,8 +43,6 @@ details. */
#include <gnu/gcj/jvmti/Breakpoint.h> #include <gnu/gcj/jvmti/Breakpoint.h>
#include <gnu/gcj/jvmti/BreakpointManager.h> #include <gnu/gcj/jvmti/BreakpointManager.h>
#ifdef INTERPRETER
// Execution engine for interpreted code. // Execution engine for interpreted code.
_Jv_InterpreterEngine _Jv_soleInterpreterEngine; _Jv_InterpreterEngine _Jv_soleInterpreterEngine;
@ -1932,5 +1930,3 @@ _Jv_CompileMethod (_Jv_InterpMethod* method)
} }
} }
#endif // DIRECT_THREADED #endif // DIRECT_THREADED
#endif // INTERPRETER

4
libjava/java/lang/Class.h
View File

@ -97,9 +97,9 @@ class _Jv_Linker;
class _Jv_ExecutionEngine; class _Jv_ExecutionEngine;
class _Jv_CompiledEngine; class _Jv_CompiledEngine;
class _Jv_IndirectCompiledEngine; class _Jv_IndirectCompiledEngine;
class _Jv_InterpreterEngine;
#ifdef INTERPRETER #ifdef INTERPRETER
class _Jv_InterpreterEngine;
class _Jv_ClassReader; class _Jv_ClassReader;
class _Jv_InterpClass; class _Jv_InterpClass;
class _Jv_InterpMethod; class _Jv_InterpMethod;
@ -619,6 +619,7 @@ private:
friend class ::_Jv_ClassReader; friend class ::_Jv_ClassReader;
friend class ::_Jv_InterpClass; friend class ::_Jv_InterpClass;
friend class ::_Jv_InterpMethod; friend class ::_Jv_InterpMethod;
friend class ::_Jv_InterpreterEngine;
#endif #endif
friend class ::_Jv_StackTrace; friend class ::_Jv_StackTrace;
@ -633,7 +634,6 @@ private:
friend class ::_Jv_ExecutionEngine; friend class ::_Jv_ExecutionEngine;
friend class ::_Jv_CompiledEngine; friend class ::_Jv_CompiledEngine;
friend class ::_Jv_IndirectCompiledEngine; friend class ::_Jv_IndirectCompiledEngine;
friend class ::_Jv_InterpreterEngine;
friend class ::_Jv_ClosureList; friend class ::_Jv_ClosureList;
friend void ::_Jv_sharedlib_register_hook (jclass klass); friend void ::_Jv_sharedlib_register_hook (jclass klass);

4
libjava/java/lang/natClass.cc
View File

@ -671,6 +671,7 @@ java::lang::Class::finalize (void)
engine->unregister(this); engine->unregister(this);
} }
#ifdef INTERPRETER
void void
_Jv_ClosureList::releaseClosures (_Jv_ClosureList **closures) _Jv_ClosureList::releaseClosures (_Jv_ClosureList **closures)
{ {
@ -692,6 +693,7 @@ _Jv_ClosureList::registerClosure (jclass klass, void *ptr)
this->next = *closures; this->next = *closures;
*closures = this; *closures = this;
} }
#endif
// This implements the initialization process for a class. From Spec // This implements the initialization process for a class. From Spec
// section 12.4.2. // section 12.4.2.
@ -2065,6 +2067,7 @@ _Jv_GetClassState (jclass klass)
return klass->state; return klass->state;
} }
#ifdef INTERPRETER
jstring jstring
_Jv_GetInterpClassSourceFile (jclass klass) _Jv_GetInterpClassSourceFile (jclass klass)
{ {
@ -2077,3 +2080,4 @@ _Jv_GetInterpClassSourceFile (jclass klass)
return NULL; return NULL;
} }
#endif

7
libjava/java/lang/natThread.cc
View File

@ -27,8 +27,11 @@ details. */
#include <java/lang/NullPointerException.h> #include <java/lang/NullPointerException.h>
#include <jni.h> #include <jni.h>
#ifdef INTERPRETER
#include <jvmti.h> #include <jvmti.h>
#include "jvmti-int.h" #include "jvmti-int.h"
#endif
#ifdef ENABLE_JVMPI #ifdef ENABLE_JVMPI
#include <jvmpi.h> #include <jvmpi.h>
@ -217,8 +220,10 @@ java::lang::Thread::finish_ ()
nt->park_helper.deactivate (); nt->park_helper.deactivate ();
group->removeThread (this); group->removeThread (this);
#ifdef INTERPRETER
if (JVMTI_REQUESTED_EVENT (ThreadEnd)) if (JVMTI_REQUESTED_EVENT (ThreadEnd))
_Jv_JVMTI_PostEvent (JVMTI_EVENT_THREAD_END, this, nt->jni_env); _Jv_JVMTI_PostEvent (JVMTI_EVENT_THREAD_END, this, nt->jni_env);
#endif
#ifdef ENABLE_JVMPI #ifdef ENABLE_JVMPI
if (_Jv_JVMPI_Notify_THREAD_END) if (_Jv_JVMPI_Notify_THREAD_END)
@ -258,11 +263,13 @@ java::lang::Thread::finish_ ()
static void static void
_Jv_NotifyThreadStart (java::lang::Thread* thread) _Jv_NotifyThreadStart (java::lang::Thread* thread)
{ {
#ifdef INTERPRETER
if (JVMTI_REQUESTED_EVENT (ThreadStart)) if (JVMTI_REQUESTED_EVENT (ThreadStart))
{ {
natThread *nt = reinterpret_cast<natThread *> (thread->data); natThread *nt = reinterpret_cast<natThread *> (thread->data);
_Jv_JVMTI_PostEvent (JVMTI_EVENT_THREAD_START, thread, nt->jni_env); _Jv_JVMTI_PostEvent (JVMTI_EVENT_THREAD_START, thread, nt->jni_env);
} }
#endif
#ifdef ENABLE_JVMPI #ifdef ENABLE_JVMPI
if (_Jv_JVMPI_Notify_THREAD_START) if (_Jv_JVMPI_Notify_THREAD_START)

12
libjava/java/lang/reflect/natVMProxy.cc
View File

@ -42,6 +42,7 @@ details. */
#include <java/lang/IllegalArgumentException.h> #include <java/lang/IllegalArgumentException.h>
#include <java/lang/Integer.h> #include <java/lang/Integer.h>
#include <java/lang/StringBuffer.h> #include <java/lang/StringBuffer.h>
#include <java/lang/UnsupportedOperationException.h>
#include <java/lang/VMClassLoader.h> #include <java/lang/VMClassLoader.h>
#include <java/lang/VMCompiler.h> #include <java/lang/VMCompiler.h>
#include <java/lang/reflect/InvocationHandler.h> #include <java/lang/reflect/InvocationHandler.h>
@ -65,6 +66,15 @@ details. */
using namespace java::lang::reflect; using namespace java::lang::reflect;
using namespace java::lang; using namespace java::lang;
#ifndef INTERPRETER
jclass
java::lang::reflect::VMProxy::generateProxyClass
(ClassLoader *, Proxy$ProxyData *)
{
throw new UnsupportedOperationException (
JvNewStringLatin1 ("Interpreter not available"));
}
#else
typedef void (*closure_fun) (ffi_cif*, void*, void**, void*); typedef void (*closure_fun) (ffi_cif*, void*, void**, void*);
static void *ncode (int method_index, jclass klass, _Jv_Method *self, closure_fun fun); static void *ncode (int method_index, jclass klass, _Jv_Method *self, closure_fun fun);
static void run_proxy (ffi_cif*, void*, void**, void*); static void run_proxy (ffi_cif*, void*, void**, void*);
@ -444,3 +454,5 @@ ncode (int method_index, jclass klass, _Jv_Method *self, closure_fun fun)
self->ncode = code; self->ncode = code;
return self->ncode; return self->ncode;
} }
#endif // INTERPRETER

7
libjava/jni.cc
View File

@ -22,9 +22,10 @@ details. */
#ifdef ENABLE_JVMPI #ifdef ENABLE_JVMPI
#include <jvmpi.h> #include <jvmpi.h>
#endif #endif
#ifdef INTERPRETER
#include <jvmti.h> #include <jvmti.h>
#include "jvmti-int.h" #include "jvmti-int.h"
#endif
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/ClassLoader.h> #include <java/lang/ClassLoader.h>
#include <java/lang/Throwable.h> #include <java/lang/Throwable.h>
@ -453,6 +454,7 @@ _Jv_JNI_PopSystemFrame (JNIEnv *env)
else else
env->locals = NULL; env->locals = NULL;
#ifdef INTERPRETER
if (__builtin_expect (env->ex != NULL, false)) if (__builtin_expect (env->ex != NULL, false))
{ {
jthrowable t = env->ex; jthrowable t = env->ex;
@ -461,6 +463,7 @@ _Jv_JNI_PopSystemFrame (JNIEnv *env)
_Jv_ReportJVMTIExceptionThrow (t); _Jv_ReportJVMTIExceptionThrow (t);
throw t; throw t;
} }
#endif
} }
template<typename T> T extract_from_jvalue(jvalue const & t); template<typename T> T extract_from_jvalue(jvalue const & t);
@ -2535,12 +2538,14 @@ _Jv_JNI_GetEnv (JavaVM *, void **penv, jint version)
} }
#endif #endif
#ifdef INTERPRETER
// Handle JVMTI requests // Handle JVMTI requests
if (version == JVMTI_VERSION_1_0) if (version == JVMTI_VERSION_1_0)
{ {
*penv = (void *) _Jv_GetJVMTIEnv (); *penv = (void *) _Jv_GetJVMTIEnv ();
return 0; return 0;
} }
#endif
// FIXME: do we really want to support 1.1? // FIXME: do we really want to support 1.1?
if (version != JNI_VERSION_1_4 && version != JNI_VERSION_1_2 if (version != JNI_VERSION_1_4 && version != JNI_VERSION_1_2

8
libjava/link.cc
View File

@ -33,8 +33,10 @@ details. */
#include <limits.h> #include <limits.h>
#include <java-cpool.h> #include <java-cpool.h>
#include <execution.h> #include <execution.h>
#ifdef INTERPRETER
#include <jvmti.h> #include <jvmti.h>
#include "jvmti-int.h" #include "jvmti-int.h"
#endif
#include <java/lang/Class.h> #include <java/lang/Class.h>
#include <java/lang/String.h> #include <java/lang/String.h>
#include <java/lang/StringBuffer.h> #include <java/lang/StringBuffer.h>
@ -853,7 +855,7 @@ _Jv_ThrowNoSuchMethodError ()
throw new java::lang::NoSuchMethodError; throw new java::lang::NoSuchMethodError;
} }
#if defined USE_LIBFFI && FFI_CLOSURES #if defined USE_LIBFFI && FFI_CLOSURES && defined(INTERPRETER)
// A function whose invocation is prepared using libffi. It gets called // A function whose invocation is prepared using libffi. It gets called
// whenever a static method of a missing class is invoked. The data argument // whenever a static method of a missing class is invoked. The data argument
// holds a reference to a String denoting the missing class. // holds a reference to a String denoting the missing class.
@ -1039,7 +1041,7 @@ _Jv_Linker::find_iindex (jclass *ifaces, jshort *offsets, jshort num)
return i; return i;
} }
#if defined USE_LIBFFI && FFI_CLOSURES #if defined USE_LIBFFI && FFI_CLOSURES && defined(INTERPRETER)
// We use a structure of this type to store the closure that // We use a structure of this type to store the closure that
// represents a missing method. // represents a missing method.
struct method_closure struct method_closure
@ -2069,6 +2071,7 @@ _Jv_Linker::wait_for_state (jclass klass, int state)
throw new java::lang::LinkageError; throw new java::lang::LinkageError;
} }
#ifdef INTERPRETER
if (__builtin_expect (klass->state == JV_STATE_LINKED, false) if (__builtin_expect (klass->state == JV_STATE_LINKED, false)
&& state >= JV_STATE_LINKED && state >= JV_STATE_LINKED
&& JVMTI_REQUESTED_EVENT (ClassPrepare)) && JVMTI_REQUESTED_EVENT (ClassPrepare))
@ -2077,4 +2080,5 @@ _Jv_Linker::wait_for_state (jclass klass, int state)
_Jv_JVMTI_PostEvent (JVMTI_EVENT_CLASS_PREPARE, self, jni_env, _Jv_JVMTI_PostEvent (JVMTI_EVENT_CLASS_PREPARE, self, jni_env,
klass); klass);
} }
#endif
} }

23
libjava/prims.cc
View File

@ -32,8 +32,10 @@ details. */
#include <java/lang/ThreadGroup.h> #include <java/lang/ThreadGroup.h>
#endif #endif
#ifdef INTERPRETER
#include <jvmti.h> #include <jvmti.h>
#include "jvmti-int.h" #include "jvmti-int.h"
#endif
#ifndef DISABLE_GETENV_PROPERTIES #ifndef DISABLE_GETENV_PROPERTIES
#include <ctype.h> #include <ctype.h>
@ -67,8 +69,12 @@ details. */
#include <gnu/gcj/runtime/ExtensionClassLoader.h> #include <gnu/gcj/runtime/ExtensionClassLoader.h>
#include <gnu/gcj/runtime/FinalizerThread.h> #include <gnu/gcj/runtime/FinalizerThread.h>
#include <execution.h> #include <execution.h>
#ifdef INTERPRETER
#include <gnu/classpath/jdwp/Jdwp.h> #include <gnu/classpath/jdwp/Jdwp.h>
#include <gnu/classpath/jdwp/VMVirtualMachine.h> #include <gnu/classpath/jdwp/VMVirtualMachine.h>
#endif // INTERPRETER
#include <gnu/java/lang/MainThread.h> #include <gnu/java/lang/MainThread.h>
#ifdef USE_LTDL #ifdef USE_LTDL
@ -105,6 +111,7 @@ int _Jv_argc;
// Debugging options // Debugging options
static bool remoteDebug = false; static bool remoteDebug = false;
#ifdef INTERPRETER
static char defaultJdwpOptions[] = ""; static char defaultJdwpOptions[] = "";
static char *jdwpOptions = defaultJdwpOptions; static char *jdwpOptions = defaultJdwpOptions;
@ -117,6 +124,7 @@ typedef jint jvmti_agent_onunload_func (JavaVM *vm);
static jvmti_agent_onload_func *jvmti_agentonload = NULL; static jvmti_agent_onload_func *jvmti_agentonload = NULL;
static jvmti_agent_onunload_func *jvmti_agentonunload = NULL; static jvmti_agent_onunload_func *jvmti_agentonunload = NULL;
static char *jvmti_agent_opts; static char *jvmti_agent_opts;
#endif // INTERPRETER
// Argument support. // Argument support.
int int
@ -1173,6 +1181,7 @@ parse_x_arg (char* option_string)
{ {
remoteDebug = true; remoteDebug = true;
} }
#ifdef INTERPRETER
else if (! strncmp (option_string, "runjdwp:", 8)) else if (! strncmp (option_string, "runjdwp:", 8))
{ {
if (strlen (option_string) > 8) if (strlen (option_string) > 8)
@ -1184,6 +1193,7 @@ parse_x_arg (char* option_string)
return -1; return -1;
} }
} }
#endif // INTERPRETER
else if (! strncmp (option_string, "bootclasspath:", 14)) else if (! strncmp (option_string, "bootclasspath:", 14))
{ {
// FIXME: add a parse_bootclasspath_arg function // FIXME: add a parse_bootclasspath_arg function
@ -1372,6 +1382,7 @@ parse_verbose_args (char* option_string,
return 0; return 0;
} }
#ifdef INTERPRETER
// This function loads the agent functions for JVMTI from the library indicated // This function loads the agent functions for JVMTI from the library indicated
// by name. It returns a negative value on failure, the value of which // by name. It returns a negative value on failure, the value of which
// indicates where ltdl failed, it also prints an error message. // indicates where ltdl failed, it also prints an error message.
@ -1427,6 +1438,7 @@ load_jvmti_agent (const char *name)
// If LTDL cannot be used, return an error code indicating this. // If LTDL cannot be used, return an error code indicating this.
return -99; return -99;
} }
#endif // INTERPRETER
static jint static jint
parse_init_args (JvVMInitArgs* vm_args) parse_init_args (JvVMInitArgs* vm_args)
@ -1481,6 +1493,7 @@ parse_init_args (JvVMInitArgs* vm_args)
continue; continue;
} }
#ifdef INTERPRETER
else if (! strncmp (option_string, "-agentlib", sizeof ("-agentlib") - 1)) else if (! strncmp (option_string, "-agentlib", sizeof ("-agentlib") - 1))
{ {
char *strPtr; char *strPtr;
@ -1575,6 +1588,7 @@ parse_init_args (JvVMInitArgs* vm_args)
JVMTI::enabled = true; JVMTI::enabled = true;
continue; continue;
} }
#endif // INTERPRETER
else else
{ {
int r = -1; int r = -1;
@ -1666,7 +1680,10 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args)
_Jv_platform_initialize (); _Jv_platform_initialize ();
_Jv_JNI_Init (); _Jv_JNI_Init ();
#ifdef INTERPRETER
_Jv_JVMTI_Init (); _Jv_JVMTI_Init ();
#endif
_Jv_GCInitializeFinalizers (&::gnu::gcj::runtime::FinalizerThread::finalizerReady); _Jv_GCInitializeFinalizers (&::gnu::gcj::runtime::FinalizerThread::finalizerReady);
@ -1735,6 +1752,7 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc,
arg_vec, is_jar); arg_vec, is_jar);
_Jv_AttachCurrentThread (main_thread); _Jv_AttachCurrentThread (main_thread);
#ifdef INTERPRETER
// Start JVMTI if an agent function has been found. // Start JVMTI if an agent function has been found.
if (jvmti_agentonload) if (jvmti_agentonload)
(*jvmti_agentonload) (_Jv_GetJavaVM (), jvmti_agent_opts, NULL); (*jvmti_agentonload) (_Jv_GetJavaVM (), jvmti_agent_opts, NULL);
@ -1755,6 +1773,7 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc,
// Send VMInit // Send VMInit
if (JVMTI_REQUESTED_EVENT (VMInit)) if (JVMTI_REQUESTED_EVENT (VMInit))
_Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_INIT, main_thread); _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_INIT, main_thread);
#endif // INTERPRETER
} }
catch (java::lang::Throwable *t) catch (java::lang::Throwable *t)
{ {
@ -1769,6 +1788,7 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc,
_Jv_ThreadRun (main_thread); _Jv_ThreadRun (main_thread);
#ifdef INTERPRETER
// Send VMDeath // Send VMDeath
if (JVMTI_REQUESTED_EVENT (VMDeath)) if (JVMTI_REQUESTED_EVENT (VMDeath))
{ {
@ -1777,9 +1797,10 @@ _Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc,
_Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_DEATH, thread, jni_env); _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_DEATH, thread, jni_env);
} }
// Run JVMTI AgentOnUnload if it exists and an agent is loaded. // Run JVMTI AgentOnUnload if it exists and an agent is loaded.
if (jvmti_agentonunload) if (jvmti_agentonunload)
(*jvmti_agentonunload) (_Jv_GetJavaVM ()); (*jvmti_agentonunload) (_Jv_GetJavaVM ());
#endif // INTERPRETER
// If we got here then something went wrong, as MainThread is not // If we got here then something went wrong, as MainThread is not
// supposed to terminate. // supposed to terminate.

66
libjava/scripts/makemake.tcl
View File

@ -36,6 +36,11 @@ proc verbose {text} {
# objects in this package are not used. Note however that # objects in this package are not used. Note however that
# most ignored files are actually handled by listing them in # most ignored files are actually handled by listing them in
# 'standard.omit' # 'standard.omit'
# * interpreter
# objects in this package (and possibly sub-packages,
# if they do not appear in the map) are only compiled if
# the interpreter is enabled. They are compiled as with the
# 'package' specifier.
# #
# If a package does not appear in the map, the default is 'package'. # If a package does not appear in the map, the default is 'package'.
global package_map global package_map
@ -93,6 +98,19 @@ set package_map(gnu/javax/swing/text/html/parser/support) package
set package_map(gnu/gcj/xlib) package set package_map(gnu/gcj/xlib) package
set package_map(gnu/awt/xlib) package set package_map(gnu/awt/xlib) package
# These packages should only be included if the interpreter is
# enabled.
set package_map(gnu/classpath/jdwp) interpreter
set package_map(gnu/classpath/jdwp/event) interpreter
set package_map(gnu/classpath/jdwp/event/filters) interpreter
set package_map(gnu/classpath/jdwp/exception) interpreter
set package_map(gnu/classpath/jdwp/id) interpreter
set package_map(gnu/classpath/jdwp/processor) interpreter
set package_map(gnu/classpath/jdwp/transport) interpreter
set package_map(gnu/classpath/jdwp/util) interpreter
set package_map(gnu/classpath/jdwp/value) interpreter
set package_map(gnu/gcj/jvmti) interpreter
# Some BC ABI packages have classes which must not be compiled BC. # Some BC ABI packages have classes which must not be compiled BC.
# This maps such packages to a grep expression for excluding such # This maps such packages to a grep expression for excluding such
# classes. # classes.
@ -138,9 +156,16 @@ set properties_files {}
# List of all '@' files that we are going to compile. # List of all '@' files that we are going to compile.
set package_files {} set package_files {}
# List of all '@' files that we are going to compile if the
# interpreter is enabled.
set interpreter_package_files {}
# List of all header file variables. # List of all header file variables.
set header_vars {} set header_vars {}
# List of all header file variables for interpreter packages.
set interpreter_header_vars {}
# List of all BC object files. # List of all BC object files.
set bc_objects {} set bc_objects {}
@ -300,8 +325,8 @@ proc emit_bc_rule {package} {
} }
# Emit a rule for a 'package' package. # Emit a rule for a 'package' package.
proc emit_package_rule {package} { proc emit_package_rule_to_list {package package_files_list} {
global package_map exclusion_map package_files global package_map exclusion_map $package_files_list
if {$package == "."} { if {$package == "."} {
set pkgname ordinary set pkgname ordinary
@ -333,10 +358,20 @@ proc emit_package_rule {package} {
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib" if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"
&& $pkgname != "gnu/gcj/tools/gcj_dbtool"} { && $pkgname != "gnu/gcj/tools/gcj_dbtool"} {
lappend package_files $lname lappend $package_files_list $lname
} }
} }
proc emit_package_rule {package} {
global package_files
emit_package_rule_to_list $package package_files
}
proc emit_interpreter_rule {package} {
global interpreter_package_files
emit_package_rule_to_list $package interpreter_package_files
}
# Emit a rule to build a package full of 'ordinary' files, that is, # Emit a rule to build a package full of 'ordinary' files, that is,
# one .o for each .java. # one .o for each .java.
proc emit_ordinary_rule {package} { proc emit_ordinary_rule {package} {
@ -382,7 +417,7 @@ proc emit_process_package_rule {platform} {
# Emit a source file variable for a package, and corresponding header # Emit a source file variable for a package, and corresponding header
# file variable, if needed. # file variable, if needed.
proc emit_source_var {package} { proc emit_source_var {package} {
global package_map name_map dir_map header_vars global package_map name_map dir_map header_vars interpreter_header_vars
if {$package == "."} { if {$package == "."} {
set pkgname ordinary set pkgname ordinary
@ -428,7 +463,11 @@ proc emit_source_var {package} {
puts "${uname}_header_files = $result" puts "${uname}_header_files = $result"
puts "" puts ""
if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"} { if {$pkgname != "gnu/gcj/xlib" && $pkgname != "gnu/awt/xlib"} {
lappend header_vars "${uname}_header_files" if {$package_map($package) == "interpreter"} {
lappend interpreter_header_vars "${uname}_header_files"
} else {
lappend header_vars "${uname}_header_files"
}
} }
} }
} }
@ -490,6 +529,8 @@ foreach package [lsort [array names package_map]] {
emit_ordinary_rule $package emit_ordinary_rule $package
} elseif {$package_map($package) == "package"} { } elseif {$package_map($package) == "package"} {
emit_package_rule $package emit_package_rule $package
} elseif {$package_map($package) == "interpreter"} {
emit_interpreter_rule $package
} else { } else {
error "unrecognized type: $package_map($package)" error "unrecognized type: $package_map($package)"
} }
@ -499,6 +540,21 @@ emit_process_package_rule Ecos
emit_process_package_rule Win32 emit_process_package_rule Win32
emit_process_package_rule Posix emit_process_package_rule Posix
puts "if INTERPRETER"
pp_var interpreter_packages_source_files $interpreter_package_files
pp_var interpreter_header_files $interpreter_header_vars "\$(" ")"
puts ""
puts "else"
puts ""
puts "interpreter_packages_source_files="
puts ""
puts "interpreter_header_files="
puts ""
puts "endif"
lappend package_files {$(interpreter_packages_source_files)}
lappend header_vars interpreter_header_files
pp_var all_packages_source_files $package_files pp_var all_packages_source_files $package_files
pp_var ordinary_header_files $header_vars "\$(" ")" pp_var ordinary_header_files $header_vars "\$(" ")"
pp_var bc_objects $bc_objects pp_var bc_objects $bc_objects

51
libjava/sources.am
View File

@ -8537,12 +8537,9 @@ java/process-Posix.list: java/lang/PosixProcess.java
-include java/process-Posix.deps -include java/process-Posix.deps
if INTERPRETER
all_packages_source_files = \ interpreter_packages_source_files = \
gnu/awt.list \
gnu/awt/j2d.list \
gnu/classpath.list \
gnu/classpath/debug.list \
gnu/classpath/jdwp.list \ gnu/classpath/jdwp.list \
gnu/classpath/jdwp/event.list \ gnu/classpath/jdwp/event.list \
gnu/classpath/jdwp/event/filters.list \ gnu/classpath/jdwp/event/filters.list \
@ -8552,10 +8549,36 @@ all_packages_source_files = \
gnu/classpath/jdwp/transport.list \ gnu/classpath/jdwp/transport.list \
gnu/classpath/jdwp/util.list \ gnu/classpath/jdwp/util.list \
gnu/classpath/jdwp/value.list \ gnu/classpath/jdwp/value.list \
gnu/gcj/jvmti.list
interpreter_header_files = \
$(gnu_classpath_jdwp_header_files) \
$(gnu_classpath_jdwp_event_header_files) \
$(gnu_classpath_jdwp_event_filters_header_files) \
$(gnu_classpath_jdwp_exception_header_files) \
$(gnu_classpath_jdwp_id_header_files) \
$(gnu_classpath_jdwp_processor_header_files) \
$(gnu_classpath_jdwp_transport_header_files) \
$(gnu_classpath_jdwp_util_header_files) \
$(gnu_classpath_jdwp_value_header_files) \
$(gnu_gcj_jvmti_header_files)
else
interpreter_packages_source_files=
interpreter_header_files=
endif
all_packages_source_files = \
gnu/awt.list \
gnu/awt/j2d.list \
gnu/classpath.list \
gnu/classpath/debug.list \
gnu/gcj.list \ gnu/gcj.list \
gnu/gcj/convert.list \ gnu/gcj/convert.list \
gnu/gcj/io.list \ gnu/gcj/io.list \
gnu/gcj/jvmti.list \
gnu/gcj/runtime.list \ gnu/gcj/runtime.list \
gnu/gcj/util.list \ gnu/gcj/util.list \
gnu/java/awt.list \ gnu/java/awt.list \
@ -8789,26 +8812,17 @@ all_packages_source_files = \
sun/misc.list \ sun/misc.list \
sun/reflect.list \ sun/reflect.list \
sun/reflect/annotation.list \ sun/reflect/annotation.list \
sun/reflect/misc.list sun/reflect/misc.list \
$(interpreter_packages_source_files)
ordinary_header_files = \ ordinary_header_files = \
$(gnu_awt_header_files) \ $(gnu_awt_header_files) \
$(gnu_awt_j2d_header_files) \ $(gnu_awt_j2d_header_files) \
$(gnu_classpath_header_files) \ $(gnu_classpath_header_files) \
$(gnu_classpath_debug_header_files) \ $(gnu_classpath_debug_header_files) \
$(gnu_classpath_jdwp_header_files) \
$(gnu_classpath_jdwp_event_header_files) \
$(gnu_classpath_jdwp_event_filters_header_files) \
$(gnu_classpath_jdwp_exception_header_files) \
$(gnu_classpath_jdwp_id_header_files) \
$(gnu_classpath_jdwp_processor_header_files) \
$(gnu_classpath_jdwp_transport_header_files) \
$(gnu_classpath_jdwp_util_header_files) \
$(gnu_classpath_jdwp_value_header_files) \
$(gnu_gcj_header_files) \ $(gnu_gcj_header_files) \
$(gnu_gcj_convert_header_files) \ $(gnu_gcj_convert_header_files) \
$(gnu_gcj_io_header_files) \ $(gnu_gcj_io_header_files) \
$(gnu_gcj_jvmti_header_files) \
$(gnu_gcj_runtime_header_files) \ $(gnu_gcj_runtime_header_files) \
$(gnu_gcj_tools_gcj_dbtool_header_files) \ $(gnu_gcj_tools_gcj_dbtool_header_files) \
$(gnu_gcj_util_header_files) \ $(gnu_gcj_util_header_files) \
@ -9039,7 +9053,8 @@ ordinary_header_files = \
$(sun_misc_header_files) \ $(sun_misc_header_files) \
$(sun_reflect_header_files) \ $(sun_reflect_header_files) \
$(sun_reflect_annotation_header_files) \ $(sun_reflect_annotation_header_files) \
$(sun_reflect_misc_header_files) $(sun_reflect_misc_header_files) \
$(interpreter_header_files)
bc_objects = \ bc_objects = \
gnu-CORBA.lo \ gnu-CORBA.lo \

2
libjava/stacktrace.cc
View File

@ -138,7 +138,6 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
state->interp_frame = state->interp_frame->next_interp; state->interp_frame = state->interp_frame->next_interp;
} }
else else
#endif
// We handle proxies in the same way as interpreted classes // We handle proxies in the same way as interpreted classes
if (_Jv_is_proxy (func_addr)) if (_Jv_is_proxy (func_addr))
{ {
@ -148,6 +147,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
state->interp_frame = state->interp_frame->next_interp; state->interp_frame = state->interp_frame->next_interp;
} }
else else
#endif
{ {
#ifdef HAVE_GETIPINFO #ifdef HAVE_GETIPINFO
_Unwind_Ptr ip; _Unwind_Ptr ip;

15
libjava/testsuite/Makefile.in
View File

@ -39,7 +39,9 @@ target_triplet = @target@
subdir = testsuite subdir = testsuite
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 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/depstand.m4 \
$(top_srcdir)/../config/enable.m4 \ $(top_srcdir)/../config/enable.m4 \
$(top_srcdir)/../config/gxx-include-dir.m4 \ $(top_srcdir)/../config/gxx-include-dir.m4 \
@ -54,10 +56,11 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../config/tls.m4 \ $(top_srcdir)/../config/tls.m4 \
$(top_srcdir)/../config/unwind_ipinfo.m4 \ $(top_srcdir)/../config/unwind_ipinfo.m4 \
$(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltoptions.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \
$(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
$(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \ $(top_srcdir)/../ltversion.m4 $(top_srcdir)/mingwld.m4 \
$(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4) $(ACLOCAL_M4)
CONFIG_HEADER = $(top_builddir)/include/config.h \ CONFIG_HEADER = $(top_builddir)/include/config.h \
@ -138,6 +141,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERPRETER = @INTERPRETER@ INTERPRETER = @INTERPRETER@
INTERPRETER_FALSE = @INTERPRETER_FALSE@
INTERPRETER_TRUE = @INTERPRETER_TRUE@
JAR = @JAR@ JAR = @JAR@
JAVA_HOME = @JAVA_HOME@ JAVA_HOME = @JAVA_HOME@
JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@ JAVA_HOME_SET_FALSE = @JAVA_HOME_SET_FALSE@