configure.in: Standardized help text case of --enable-hash-synchronization New configure...

* configure.in: Standardized help text case of
	--enable-hash-synchronization
	New configure switch --enable-libgcj-multifile and corresponding
	automake conditional ONESTEP.
	* configure: Rebuilt.
	* Makefile.am: Use automake conditional ONESTEP to determine
	whether classfiles should be compiled individually or all
	at once.
	* Makefile.in: Rebuilt.

From-SVN: r71459
This commit is contained in:
Mohan Embar 2003-09-17 14:59:28 +00:00 committed by Mohan Embar
parent 43bc5d6b3d
commit a28400bb6c
5 changed files with 439 additions and 355 deletions

View File

@ -1,3 +1,15 @@
2003-09-17 Mohan Embar <gnustuff@thisiscool.com>
* configure.in: Standardized help text case of
--enable-hash-synchronization
New configure switch --enable-libgcj-multifile and corresponding
automake conditional ONESTEP.
* configure: Rebuilt.
* Makefile.am: Use automake conditional ONESTEP to determine
whether classfiles should be compiled individually or all
at once.
* Makefile.in: Rebuilt.
2003-09-16 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java (construct):

View File

@ -339,6 +339,10 @@ all_java_source_files = \
all_java_class_files = $(all_java_source_files:.java=.class)
if ONESTEP
# Compile all classfiles in one go.
libgcj-@gcc_version@.jar: $(all_java_source_files)
-@rm -f libgcj-@gcc_version@.jar
@echo Compiling Java sourcefiles...
@ -356,6 +360,22 @@ libgcj-@gcc_version@.jar: $(all_java_source_files)
# is built.
$(all_java_class_files): libgcj-@gcc_version@.jar
else # !ONESTEP
# Compile each classfile individually.
.java.class:
$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $<
libgcj-@gcc_version@.jar: $(all_java_class_files)
-@rm -f libgcj-@gcc_version@.jar
## Note that we explicitly want to include directory information.
find java gnu javax org -type d -o -type f -name '*.class' | \
sed -e '/\/\./d' -e '/\/xlib/d' | \
$(ZIP) cfM0E@ $@
endif
# Note: The libtool objects are removed by mostlyclean-local
# because of command-line-length issues.
MOSTLYCLEANFILES = $(nat_headers) $(x_nat_headers)

View File

@ -4872,21 +4872,34 @@ $(gtk_c_headers): $(gtk_awt_peer_sources)
echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input
libgcj-@gcc_version@.jar: $(all_java_source_files)
-@rm -f libgcj-@gcc_version@.jar
@echo Compiling Java sourcefiles...
@: $(call write_entries_to_file,$?,libgcj.sourcelist)
$(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) @libgcj.sourcelist
find java gnu javax org -type d -o -type f -name '*.class' | \
sed -e '/\/\./d' -e '/\/xlib/d' | \
$(ZIP) cfM0E@ $@
# Compile all classfiles in one go.
@ONESTEP_TRUE@libgcj-@gcc_version@.jar: $(all_java_source_files)
@ONESTEP_TRUE@ -@rm -f libgcj-@gcc_version@.jar
@ONESTEP_TRUE@ @echo Compiling Java sourcefiles...
@ONESTEP_TRUE@ @: $(call write_entries_to_file,$?,libgcj.sourcelist)
@ONESTEP_TRUE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) @libgcj.sourcelist
@ONESTEP_TRUE@ find java gnu javax org -type d -o -type f -name '*.class' | \
@ONESTEP_TRUE@ sed -e '/\/\./d' -e '/\/xlib/d' | \
@ONESTEP_TRUE@ $(ZIP) cfM0E@ $@
# This next rule seems backward, but reflects the fact
# that 1) all classfiles are compiled in one go when the
# libgcj jarfile is built and 2) anything which depends
# on a particular .class file must wait until the jarfile
# is built.
$(all_java_class_files): libgcj-@gcc_version@.jar
@ONESTEP_TRUE@$(all_java_class_files): libgcj-@gcc_version@.jar
# Compile each classfile individually.
@ONESTEP_FALSE@.java.class:
@ONESTEP_FALSE@ $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $<
@ONESTEP_FALSE@libgcj-@gcc_version@.jar: $(all_java_class_files)
@ONESTEP_FALSE@ -@rm -f libgcj-@gcc_version@.jar
@ONESTEP_FALSE@ find java gnu javax org -type d -o -type f -name '*.class' | \
@ONESTEP_FALSE@ sed -e '/\/\./d' -e '/\/xlib/d' | \
@ONESTEP_FALSE@ $(ZIP) cfM0E@ $@
mostlyclean-local:
find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f

718
libjava/configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -80,12 +80,23 @@ dnl Currently works only for Linux X86/ia64
dnl Typically faster and more space-efficient
AC_ARG_ENABLE(hash-synchronization,
[ --enable-hash-synchronization
Use global hash table for monitor locks])
use global hash table for monitor locks])
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,
[ --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)
dnl configure.host sets slow_pthread_self if the synchronization code should
dnl try to avoid pthread_self calls by caching thread IDs in a hashtable.
if test "${slow_pthread_self}" = "yes"; then