mirror of git://gcc.gnu.org/git/gcc.git
configure.ac (--enable-libgcj-multifile): Remove.
2005-05-11 Paolo Bonzini <bonzini@gnu.org> * configure.ac (--enable-libgcj-multifile): Remove. * Makefile.am (all_native_compiled_source_files, (all_native_compiled_dirs, all_java_dirs, all_java_lo_files, all_libgcj_lo_files, all_xlib_lo_files, all_java_deps_files, all_java_stamp_files, all_java_filelist_files): New variables. (EXTRA_DIST): New Automake variable. (CLEANFILES): Add .stamp, .list and .lo files. (%.list, %.lo, %.stamp, Makefile.deps): New rules. (classes.stamp): Depend on $(all_java_stamp_files). (libgcj.la): Pass $(libgcj_la_LIBADD) to the linker without going through write_entries_to_file. (all_java_source_files, all_property_files): Move earlier. (libgcj_la_OBJECTS, javao_files, xlib_javao_files, all_java_class_files): Remove. (gtk_awt_peer_sources): Rename to... (gtk_awt_peer_source_files): ... this. Adjust throughout. (ONESTEP): Remove. (libgcj0_convenience_la_SOURCES): Remove Java source files. (libgcj0_convenience_la_LIBADD): Add $(all_libgcj_lo_files). (libgcj0_convenience_la_DEPENDENCIES): Likewise. (libgcj_la_SOURCES): Remove. (lib_gnu_awt_xlib_la_SOURCES): Remove Java source files. (lib_gnu_awt_xlib_la_LIBADD): Add $(all_xlib_lo_files). (lib_gnu_awt_xlib_la_DEPENDENCIES): Likewise. * configure: Regenerate. * Makefile.in: Regenerate. * external/Makefile.in: Regenerate. * external/sax/Makefile.in: Regenerate. * external/w3c_dom/Makefile.in: Regenerate. * gcj/Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * libltdl/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. From-SVN: r99823
This commit is contained in:
Paolo Bonzini
Paolo Bonzini
parent
f23b850118
commit
34bab46d1a
|
|
@ -1,3 +1,44 @@
|
|||
2005-05-17 Paolo Bonzini <bonzini@gnu.org>
|
||||
|
||||
* configure.ac (--enable-libgcj-multifile): Remove.
|
||||
|
||||
* Makefile.am (all_native_compiled_source_files,
|
||||
(all_native_compiled_dirs, all_java_dirs, all_java_lo_files,
|
||||
all_libgcj_lo_files, all_xlib_lo_files,
|
||||
all_java_deps_files, all_java_stamp_files,
|
||||
all_java_filelist_files): New variables.
|
||||
(EXTRA_DIST): New Automake variable.
|
||||
(CLEANFILES): Add .stamp, .list and .lo files.
|
||||
(%.list, %.lo, %.stamp, Makefile.deps): New rules.
|
||||
(classes.stamp): Depend on $(all_java_stamp_files).
|
||||
(libgcj.la): Pass $(libgcj_la_LIBADD) to the linker without
|
||||
going through write_entries_to_file.
|
||||
|
||||
(all_java_source_files, all_property_files): Move earlier.
|
||||
(libgcj_la_OBJECTS, javao_files, xlib_javao_files,
|
||||
all_java_class_files): Remove.
|
||||
(gtk_awt_peer_sources): Rename to...
|
||||
(gtk_awt_peer_source_files): ... this. Adjust throughout.
|
||||
|
||||
(ONESTEP): Remove.
|
||||
(libgcj0_convenience_la_SOURCES): Remove Java source files.
|
||||
(libgcj0_convenience_la_LIBADD): Add $(all_libgcj_lo_files).
|
||||
(libgcj0_convenience_la_DEPENDENCIES): Likewise.
|
||||
(libgcj_la_SOURCES): Remove.
|
||||
(lib_gnu_awt_xlib_la_SOURCES): Remove Java source files.
|
||||
(lib_gnu_awt_xlib_la_LIBADD): Add $(all_xlib_lo_files).
|
||||
(lib_gnu_awt_xlib_la_DEPENDENCIES): Likewise.
|
||||
|
||||
* configure: Regenerate.
|
||||
* Makefile.in: Regenerate.
|
||||
* external/Makefile.in: Regenerate.
|
||||
* external/sax/Makefile.in: Regenerate.
|
||||
* external/w3c_dom/Makefile.in: Regenerate.
|
||||
* gcj/Makefile.in: Regenerate.
|
||||
* include/Makefile.in: Regenerate.
|
||||
* libltdl/Makefile.in: Regenerate.
|
||||
* testsuite/Makefile.in: Regenerate.
|
||||
|
||||
2005-05-16 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* java/nio/charset/Charset.java (encode, decode): Synchronize on
|
||||
|
|
|
|||
|
|
@ -228,6 +228,63 @@ BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'
|
|||
|
||||
## ################################################################
|
||||
|
||||
# Files for which we build .lo files
|
||||
all_native_compiled_source_files = \
|
||||
$(java_source_files) \
|
||||
$(built_java_source_files) \
|
||||
$(xlib_java_source_files)
|
||||
|
||||
# Files for which we build .class files
|
||||
# It *must* begin with $(all_native_compiled_source_files)
|
||||
all_java_source_files = \
|
||||
$(all_native_compiled_source_files) \
|
||||
$(gtk_awt_peer_source_files) \
|
||||
$(gnu_xml_source_files) \
|
||||
$(javax_imageio_source_files) \
|
||||
$(javax_xml_source_files) \
|
||||
$(gnu_java_beans_source_files) \
|
||||
gnu/gcj/tools/gcj_dbtool/Main.java
|
||||
|
||||
EXTRA_DIST = $(all_java_source_files)
|
||||
|
||||
# Build a list of native and bytecode-compiled directories. The Makefile
|
||||
# depends on them, because they affect the definition of two variables
|
||||
# below.
|
||||
# Each directory's filelist file depends on the corresponding Java source files
|
||||
# Each class file depends on the its directory's .stamp file
|
||||
# Below, one .lo file is built per directory when the stamp file changes
|
||||
|
||||
Makefile.deps: $(srcdir)/Makefile.in
|
||||
@: $(call write_entries_to_file,$(all_java_source_files),files.tmplist)
|
||||
sed 's,/[^/]*$$,,' \
|
||||
files.tmplist | sort | uniq > bytecodes.list
|
||||
sed -n '1,$(words $(all_native_compiled_source_files))s,/[^/]*$$,,p' \
|
||||
files.tmplist | sort | uniq > native.list
|
||||
echo 's,^\(.*\)/\([^/]*\)\.java$$,\1.list: \0\' > tmpsed
|
||||
echo '\1/\2.class: \1.stamp,' >> tmpsed
|
||||
sed -ftmpsed files.tmplist \
|
||||
> Makefile.deps
|
||||
rm files.tmplist tmpsed
|
||||
|
||||
all_native_compiled_dirs := $(shell test -f native.list && cat native.list)
|
||||
all_java_dirs := $(shell test -f bytecodes.list && cat bytecodes.list)
|
||||
all_java_lo_files = $(all_native_compiled_dirs:=.lo)
|
||||
all_java_deps_files = $(all_java_dirs:=.deps)
|
||||
all_java_stamp_files = $(all_java_dirs:=.stamp)
|
||||
all_java_filelist_files = $(all_java_dirs:=.list)
|
||||
|
||||
# In the future these may be defined manually, if we decide to split libgcj.so
|
||||
# into multiple shared libraries. For now, everything but xlib goes into
|
||||
# all_libgcj_lo_files
|
||||
all_xlib_lo_files = gnu/gcj/xlib.lo gnu/awt/xlib.lo
|
||||
all_libgcj_lo_files = $(filter-out $(all_xlib_lo_files), $(all_java_lo_files))
|
||||
|
||||
# Include automatically generated dependencies between Java source files.
|
||||
-include Makefile.deps $(all_java_deps_files)
|
||||
|
||||
all_property_files = $(property_files) \
|
||||
java/util/logging/logging.properties
|
||||
|
||||
##
|
||||
## How to build libgcj.a and libgcj.jar
|
||||
##
|
||||
|
|
@ -246,23 +303,22 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
|
|||
# subsections in the linker, such as Alpha and MIPS.
|
||||
libgcj0_convenience_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \
|
||||
link.cc defineclass.cc interpret.cc verify.cc \
|
||||
$(nat_source_files) $(math_c_source_files) $(java_source_files) \
|
||||
$(built_java_source_files) \
|
||||
$(nat_source_files) $(math_c_source_files) \
|
||||
$(BOEHMGC_SRC) $(NOGC_SRC) \
|
||||
$(BACKTRACE_SRC) \
|
||||
$(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
|
||||
$(DARWIN_CRT_SRC) \
|
||||
$(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
|
||||
libgcj0_convenience_la_LIBADD = \
|
||||
$(all_libgcj_lo_files) \
|
||||
gnu-xml.lo javax-imageio.lo \
|
||||
javax-xml.lo gnu-java-beans.lo \
|
||||
external/sax/libsax-gcj.la \
|
||||
external/w3c_dom/libw3c-gcj.la
|
||||
libgcj0_convenience_la_DEPENDENCIES = $(libgcj0_convenience_la_LIBADD)
|
||||
|
||||
noinst_LTLIBRARIES = libgcj0_convenience.la
|
||||
|
||||
libgcj_la_SOURCES =
|
||||
|
||||
## Objects from C++ sources in subdirs.
|
||||
nat_files = $(nat_source_files:.cc=.lo)
|
||||
xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
|
||||
|
|
@ -344,7 +400,7 @@ jni/gtk-peer/gtk_jawt.c \
|
|||
jni/classpath/native_state.c
|
||||
|
||||
## Java sources for Gtk peers.
|
||||
gtk_awt_peer_sources = \
|
||||
gtk_awt_peer_source_files = \
|
||||
gnu/java/awt/peer/gtk/GdkTextLayout.java \
|
||||
gnu/java/awt/peer/gtk/GdkFontMetrics.java \
|
||||
gnu/java/awt/peer/gtk/GdkFontPeer.java \
|
||||
|
|
@ -393,7 +449,7 @@ gnu/java/awt/peer/gtk/GThreadMutex.java \
|
|||
gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java
|
||||
|
||||
|
||||
gtk_jni_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources)))
|
||||
gtk_jni_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_source_files)))
|
||||
|
||||
jniinclude/gnu_java_awt_peer_gtk_GdkGraphics.h: gnu/java/awt/peer/gtk/GdkGraphics.java
|
||||
jniinclude/gnu_java_awt_peer_gtk_GdkGraphics2D.h: gnu/java/awt/peer/gtk/GdkGraphics2D.java
|
||||
|
|
@ -510,11 +566,10 @@ libgcjawt_la_LDFLAGS = \
|
|||
$(LIBGCJ_LD_SYMBOLIC)
|
||||
libgcjawt_la_LINK = $(LIBLINK)
|
||||
|
||||
lib_gnu_awt_xlib_la_SOURCES = \
|
||||
$(xlib_java_source_files) \
|
||||
$(xlib_nat_source_files)
|
||||
lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la libgcj.spec
|
||||
lib_gnu_awt_xlib_la_LIBADD = $(xlib_javao_files)
|
||||
lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
|
||||
lib_gnu_awt_xlib_la_LIBADD = $(all_xlib_lo_files)
|
||||
lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar libgcj.la libgcj.spec \
|
||||
$(lib_gnu_awt_xlib_la_LIBADD)
|
||||
## We require libstdc++-v3 to be in the same build tree.
|
||||
lib_gnu_awt_xlib_la_CPPFLAGS = \
|
||||
$(AM_CPPFLAGS) \
|
||||
|
|
@ -528,21 +583,6 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
|
|||
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
||||
lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
|
||||
|
||||
all_java_source_files = \
|
||||
$(java_source_files) \
|
||||
$(built_java_source_files) \
|
||||
$(gtk_awt_peer_sources) \
|
||||
$(xlib_java_source_files) \
|
||||
$(gnu_xml_source_files) \
|
||||
$(javax_imageio_source_files) \
|
||||
$(javax_xml_source_files) \
|
||||
$(gnu_java_beans_source_files)
|
||||
|
||||
all_java_class_files = $(all_java_source_files:.java=.class)
|
||||
|
||||
all_property_files = $(property_files) \
|
||||
java/util/logging/logging.properties
|
||||
|
||||
## Build property files into the library.
|
||||
property_files = \
|
||||
gnu/regexp/MessagesBundle.properties \
|
||||
|
|
@ -554,32 +594,24 @@ propertyo_files = $(property_files:.properties=.properties.lo)
|
|||
%.properties.lo: %.properties
|
||||
$(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,`echo $@ | sed "s/\.lo$$//"`
|
||||
|
||||
if ONESTEP
|
||||
# Compile one directory in one go. If the files have to be compiled with the
|
||||
# binary compatibility ABI, only make the .class here -- the .lo is made
|
||||
# elsewhere in this Makefile.
|
||||
|
||||
# Compile all classfiles in one go.
|
||||
%.list:
|
||||
@: $(shell $(mkinstalldirs) $(basename $@))
|
||||
@: $(call write_entries_to_file,$^,$@)
|
||||
|
||||
classes.stamp: $(all_java_source_files) gnu/gcj/tools/gcj_dbtool/Main.java
|
||||
@echo Compiling Java sourcefiles...
|
||||
@: $(call write_entries_to_file,$?,libgcj.sourcelist)
|
||||
$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) @libgcj.sourcelist
|
||||
echo > classes.stamp
|
||||
# This next rule seems backward, but reflects the fact that 1) all
|
||||
# classfiles are compiled in one go when classes.stamp is built and 2)
|
||||
# anything which depends on a particular .class file must wait until
|
||||
# this file is built.
|
||||
$(all_java_class_files) gnu/gcj/tools/gcj_dbtool/Main.class: classes.stamp
|
||||
$(all_java_lo_files): %.lo: %.stamp
|
||||
$(LTGCJCOMPILE) -o $@ -c @${<:.stamp=.list}
|
||||
|
||||
else # !ONESTEP
|
||||
$(all_java_stamp_files): %.stamp: %.list
|
||||
$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) \
|
||||
-MD -MF ${@:.stamp=.deps} @$<
|
||||
echo timestamp > $@
|
||||
|
||||
# Compile each classfile individually.
|
||||
|
||||
.java.class:
|
||||
$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(BOOTCLASSPATH) -d $(here) $<
|
||||
|
||||
classes.stamp: $(all_java_class_files) $(all_property_files)
|
||||
echo > classes.stamp
|
||||
|
||||
endif
|
||||
classes.stamp: $(all_property_files) $(all_java_stamp_files)
|
||||
echo timestamp > classes.stamp
|
||||
|
||||
libgcj-$(gcc_version).jar: classes.stamp
|
||||
-@rm -f libgcj-$(gcc_version).jar
|
||||
|
|
@ -605,7 +637,9 @@ libgcj-$(gcc_version).jar: classes.stamp
|
|||
$(ZIP) -ufM0E@ $@; \
|
||||
done
|
||||
|
||||
CLEANFILES = libgcj-$(gcc_version).jar classes.stamp
|
||||
CLEANFILES = libgcj-$(gcc_version).jar classes.stamp $(all_java_stamp_files) \
|
||||
$(all_java_deps_files) $(all_java_filelist_files)
|
||||
DISTCLEANFILES = Makefile.deps native.dirs bytecompile.dirs
|
||||
|
||||
mostlyclean-local:
|
||||
## Use libtool rm to remove each libtool object
|
||||
|
|
@ -628,16 +662,10 @@ clean-nat:
|
|||
|
||||
SUFFIXES = .class .java .h .properties
|
||||
|
||||
$(javao_files) $(xlib_javao_files): %.lo: %.java
|
||||
$(LTGCJCOMPILE) -o $@ -c $<
|
||||
|
||||
## Pass the list of object files to libtool in a temporary file to
|
||||
## avoid tripping platform command line length limits.
|
||||
libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
|
||||
@echo Creating list of files to link...
|
||||
@: $(call write_entries_to_file,$(libgcj_la_OBJECTS),libgcj.objectlist)
|
||||
$(libgcj_la_LINK) -objectlist libgcj.objectlist \
|
||||
$(libgcj_la_LIBADD) \
|
||||
libgcj.la: $(libgcj_la_DEPENDENCIES)
|
||||
$(libgcj_la_LINK) $(libgcj_la_LIBADD) \
|
||||
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
|
||||
|
||||
lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES)
|
||||
|
|
@ -700,7 +728,7 @@ gnu-java-beans.lo: $(gnu_java_beans_source_files)
|
|||
|
||||
## Depend on the sources, even though we are going to compile the
|
||||
## classes.
|
||||
gtk-awt-peer.lo: $(gtk_awt_peer_sources)
|
||||
gtk-awt-peer.lo: $(gtk_awt_peer_source_files)
|
||||
## FIXME: this is ugly. We want to make sure the .class files have
|
||||
## been built, but we don't want a real dependency on them as this
|
||||
## would cause our target to be rebuilt whenever any .java file is
|
||||
|
|
|
|||
17996
libjava/Makefile.in
17996
libjava/Makefile.in
File diff suppressed because one or more lines are too long
|
|
@ -310,7 +310,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
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_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs 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 AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ONESTEP_TRUE ONESTEP_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC 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 HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES 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_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs 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 AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME LIBGCJDEBUG INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_ECOS_PLATFORM_TRUE USING_ECOS_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC 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 HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE GCJH ZIP CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL BACKTRACESPEC SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -865,9 +865,6 @@ Optional Features:
|
|||
don't set system properties from GCJ_PROPERTIES
|
||||
--enable-hash-synchronization
|
||||
use global hash table for monitor locks
|
||||
--enable-libgcj-multifile
|
||||
allow compilation of several files at once
|
||||
|
||||
--enable-libgcj-debug enable runtime debugging code
|
||||
--enable-gc-debug include full support for pointer backtracing etc.
|
||||
--enable-interpreter enable interpreter
|
||||
|
|
@ -4829,7 +4826,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
|
|||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4832 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4829 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5725,31 +5722,6 @@ if test -z "$enable_hash_synchronization"; then
|
|||
enable_hash_synchronization=$enable_hash_synchronization_default
|
||||
fi
|
||||
|
||||
# Do we allow intermodule optimizations (i.e. compiling many files at once)?
|
||||
# Check whether --enable-libgcj-multifile or --disable-libgcj-multifile was given.
|
||||
if test "${enable_libgcj_multifile+set}" = set; then
|
||||
enableval="$enable_libgcj_multifile"
|
||||
case "${enableval}" in
|
||||
yes) enable_libgcj_multifile=yes ;;
|
||||
no) enable_libgcj_multifile=no ;;
|
||||
*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-libgcj-multifile" >&5
|
||||
echo "$as_me: error: bad value ${enableval} for --enable-libgcj-multifile" >&2;}
|
||||
{ (exit 1); exit 1; }; } ;;
|
||||
esac
|
||||
else
|
||||
enable_libgcj_multifile=no
|
||||
fi;
|
||||
|
||||
|
||||
if test "$enable_libgcj_multifile" = yes; then
|
||||
ONESTEP_TRUE=
|
||||
ONESTEP_FALSE='#'
|
||||
else
|
||||
ONESTEP_TRUE='#'
|
||||
ONESTEP_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-java-home or --without-java-home was given.
|
||||
if test "${with_java_home+set}" = set; then
|
||||
|
|
@ -5873,7 +5845,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
|
|||
:
|
||||
else
|
||||
cat > conftest.$ac_ext << EOF
|
||||
#line 5876 "configure"
|
||||
#line 5848 "configure"
|
||||
struct S { ~S(); };
|
||||
void bar();
|
||||
void foo()
|
||||
|
|
@ -15954,13 +15926,6 @@ echo "$as_me: error: conditional \"TESTSUBDIR\" was never defined.
|
|||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${ONESTEP_TRUE}" && test -z "${ONESTEP_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"ONESTEP\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
echo "$as_me: error: conditional \"ONESTEP\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
if test -z "${JAVA_HOME_SET_TRUE}" && test -z "${JAVA_HOME_SET_FALSE}"; then
|
||||
{ { echo "$as_me:$LINENO: error: conditional \"JAVA_HOME_SET\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." >&5
|
||||
|
|
@ -16745,8 +16710,6 @@ s,@am__fastdepGCJ_FALSE@,$am__fastdepGCJ_FALSE,;t t
|
|||
s,@subdirs@,$subdirs,;t t
|
||||
s,@TESTSUBDIR_TRUE@,$TESTSUBDIR_TRUE,;t t
|
||||
s,@TESTSUBDIR_FALSE@,$TESTSUBDIR_FALSE,;t t
|
||||
s,@ONESTEP_TRUE@,$ONESTEP_TRUE,;t t
|
||||
s,@ONESTEP_FALSE@,$ONESTEP_FALSE,;t t
|
||||
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@,$JAVA_HOME,;t t
|
||||
|
|
|
|||
|
|
@ -202,17 +202,6 @@ if test -z "$enable_hash_synchronization"; then
|
|||
enable_hash_synchronization=$enable_hash_synchronization_default
|
||||
fi
|
||||
|
||||
# Do we allow intermodule optimizations (i.e. compiling many files at once)?
|
||||
AC_ARG_ENABLE(libgcj-multifile,
|
||||
AS_HELP_STRING([--enable-libgcj-multifile]
|
||||
[allow compilation of several files at once]),
|
||||
[case "${enableval}" in
|
||||
yes) enable_libgcj_multifile=yes ;;
|
||||
no) enable_libgcj_multifile=no ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-libgcj-multifile) ;;
|
||||
esac],[enable_libgcj_multifile=no])
|
||||
AM_CONDITIONAL(ONESTEP, test "$enable_libgcj_multifile" = yes)
|
||||
|
||||
AC_ARG_WITH(java-home,
|
||||
AS_HELP_STRING([--with-java-home=DIRECTORY],
|
||||
[value of java.home system property]),
|
||||
|
|
|
|||
|
|
@ -162,8 +162,6 @@ NATIVE_TRUE = @NATIVE_TRUE@
|
|||
NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
|
||||
NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
|
||||
OBJEXT = @OBJEXT@
|
||||
ONESTEP_FALSE = @ONESTEP_FALSE@
|
||||
ONESTEP_TRUE = @ONESTEP_TRUE@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
|
|
|
|||
|
|
@ -171,8 +171,6 @@ NATIVE_TRUE = @NATIVE_TRUE@
|
|||
NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
|
||||
NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
|
||||
OBJEXT = @OBJEXT@
|
||||
ONESTEP_FALSE = @ONESTEP_FALSE@
|
||||
ONESTEP_TRUE = @ONESTEP_TRUE@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
|
|
|
|||
|
|
@ -171,8 +171,6 @@ NATIVE_TRUE = @NATIVE_TRUE@
|
|||
NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
|
||||
NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
|
||||
OBJEXT = @OBJEXT@
|
||||
ONESTEP_FALSE = @ONESTEP_FALSE@
|
||||
ONESTEP_TRUE = @ONESTEP_TRUE@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
|
|
|
|||
|
|
@ -167,8 +167,6 @@ NATIVE_TRUE = @NATIVE_TRUE@
|
|||
NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
|
||||
NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
|
||||
OBJEXT = @OBJEXT@
|
||||
ONESTEP_FALSE = @ONESTEP_FALSE@
|
||||
ONESTEP_TRUE = @ONESTEP_TRUE@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
|
|
|
|||
|
|
@ -166,8 +166,6 @@ NATIVE_TRUE = @NATIVE_TRUE@
|
|||
NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
|
||||
NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
|
||||
OBJEXT = @OBJEXT@
|
||||
ONESTEP_FALSE = @ONESTEP_FALSE@
|
||||
ONESTEP_TRUE = @ONESTEP_TRUE@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
|
|
|
|||
|
|
@ -155,8 +155,6 @@ NATIVE_TRUE = @NATIVE_TRUE@
|
|||
NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
|
||||
NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
|
||||
OBJEXT = @OBJEXT@
|
||||
ONESTEP_FALSE = @ONESTEP_FALSE@
|
||||
ONESTEP_TRUE = @ONESTEP_TRUE@
|
||||
PACKAGE = @PACKAGE@
|
||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||
PACKAGE_NAME = @PACKAGE_NAME@
|
||||
|
|
|
|||
Loading…
Reference in New Issue