This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: automake 1.9 update for libgcj
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Thu, 5 Aug 2004 13:25:42 +0200
- Subject: Patch: automake 1.9 update for libgcj
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I work a little bit with the automake update patch Tom send me and its
now working as expected (at least I hope so). So send this patch here
for testing on various platforms. On my own i686-pc-linux-gnu (Debian
testing) it bootstraps libgcj and works successfully. It would be
great to get some feedback from other archs before committing.
A patch with only the edited files is attached for easier review. A
full patch with regenerated files (about 1.5 MB) can be found here:
http://www.ewetel.net/~katrin.salecker/gcj/auto.diff
Please test and give some feedback, good or bad.
Michael
2004-08-05 Thomas Fitzsimmons <fitzsim@redhat.com>
Michael Koch <konqueror@gmx.de>
* configure.in,
Makefile.am: Ported to automake 1.9.
* Makefile.in:
aclocal.m4
configure
gcj/Makefile.in
include/Makefile.in
testsuite/Makefile.in
include/config.h.in:
Regenerated.
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBEhk5WSOgCCdjSDsRAhPxAJ9wgo58XMcsRthVhkI/r+WvEbtPwwCfRDOs
ZPH7+ErQWar9mc8p6vElxCo=
=20QZ
-----END PGP SIGNATURE-----
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.397
diff -u -b -B -r1.397 Makefile.am
--- Makefile.am 4 Aug 2004 18:01:59 -0000 1.397
+++ Makefile.am 5 Aug 2004 11:10:43 -0000
@@ -1,9 +1,68 @@
## Process this file with automake to produce Makefile.in.
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I .
+## Garbage collector conditionals.
+if USING_BOEHMGC
+BOEHMGC_SRC = boehm.cc
+else
+BOEHMGC_SRC =
+endif
+
+if USING_NOGC
+NOGC_SRC = nogc.cc
+else
+NOGC_SRC =
+endif
+
+## Broken backtrace conditional.
+if SUPPLY_BACKTRACE
+BACKTRACE_SRC = sysdep/dwarf2-backtrace.cc
+else
+BACKTRACE_SRC =
+endif
+
+## Conditionals for platform-specific helper functions.
+if USING_POSIX_PLATFORM
+POSIX_PLATFORM_SRC = posix.cc
+else
+POSIX_PLATFORM_SRC =
+endif
+
+if USING_WIN32_PLATFORM
+WIN32_PLATFORM_SRC = win32.cc
+else
+WIN32_PLATFORM_SRC =
+endif
+
+if USING_ECOS_PLATFORM
+ECOS_PLATFORM_SRC = posix.cc
+else
+ECOS_PLATFORM_SRC =
+endif
+
+## Conditionals for platform-specific thread support.
+if USING_POSIX_THREADS
+POSIX_THREAD_SRC = posix-threads.cc
+else
+POSIX_THREAD_SRC =
+endif
+
+if USING_WIN32_THREADS
+WIN32_THREAD_SRC = win32-threads.cc
+else
+WIN32_THREAD_SRC =
+endif
+
+if USING_NO_THREADS
+NO_THREAD_SRC = no-threads.cc
+else
+NO_THREAD_SRC =
+endif
+
+## Testsuite conditional.
if TESTSUBDIR
SUBDIRS = $(DIRLTDL) testsuite gcj include
else
@@ -74,38 +133,38 @@
GCJH = @GCJH@
ZIP = @ZIP@
-## The compiler with whatever flags we want for both -c and -C
-## compiles.
-GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
-
-GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) -fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
-GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
-LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
-
-## We define this because otherwise libtool can be run with different
-## values of `CXX' and will then get confused and fail to work. So,
-## we use --tag explicitly. Someday automake will be changed to do
-## this automatically.
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-JAVAC = $(GCJ_WITH_FLAGS) -C
-
GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
WARNINGS = -Wextra -Wall
-## We need _GNU_SOURCE defined for some Linux builds. It doesn't hurt
-## to always define it.
-AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
-## Some systems don't allow `$' in identifiers by default, so we force it.
+## Some systems don't allow `$' in identifiers by default, so we force
+## it with -fdollars-in-identifiers. -Wswitch-enum detects bugs in
+## the verifier implementation, and maybe other places. We need
+## _GNU_SOURCE defined for some Linux builds. It doesn't hurt to
+## always define it. Some systems, including Linux, need
+## -D_FILE_OFFSET_BITS=64 to enable > 2GB file support.
+AM_CXXFLAGS = \
+ -I $(top_builddir) \
+ -fno-rtti \
+ -fnon-call-exceptions \
+ $(THREADCXXFLAGS) \
-fdollars-in-identifiers \
-## Detect bugs in the verifier implementation, and maybe other places.
-Wswitch-enum \
-## Some systems, including Linux, need this to enable > 2GB file support.
-D_FILE_OFFSET_BITS=64 \
- @LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
- -DPREFIX="\"$(prefix)\"" -DLIBDIR="\"$(libdir)\"" \
+ @LIBGCJ_CXXFLAGS@ \
+ @X_CFLAGS@ \
+ $(WARNINGS) \
+ -D_GNU_SOURCE \
+ -DPREFIX="\"$(prefix)\"" \
+ -DLIBDIR="\"$(libdir)\"" \
-DBOOT_CLASS_PATH="\"$(jardir)/$(jar_DATA)\"" \
-DJAVA_EXT_DIRS="\"$(jardir)/ext\""
+
+AM_GCJFLAGS = \
+ --encoding=UTF-8 \
+ -Wno-deprecated
+
+JAVAC = $(GCJ) $(GCJFLAGS) -C
+
if USING_GCC
AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
else
@@ -124,47 +183,37 @@
$(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \
$(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS)
+GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) $(GCJFLAGS) -fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
+GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+
## ################################################################
##
## How to build libgcj.a and libgcj.jar
##
-## Objects from C++ sources in subdirs.
-nat_files = $(nat_source_files:.cc=.lo)
-xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
-## Objects from C sources in subdirs.
-c_files = $(c_source_files:.c=.lo)
-extra_cc_files = $(extra_cc_source_files:.cc=.lo)
-## Objects from gtk-related C sources in subdirs.
-gtk_c_files = $(gtk_c_source_files:.c=.lo)
-## Objects from Java sources in subdirs.
-javao_files = $(java_source_files:.java=.lo) \
- $(built_java_source_files:.java=.lo)
-xlib_javao_files = $(xlib_java_source_files:.java=.lo)
-
libgij_la_SOURCES = gij.cc
libgcj_la_SOURCES = prims.cc jni.cc exception.cc \
resolve.cc defineclass.cc interpret.cc verify.cc \
- $(nat_source_files)
-EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
- win32-threads.cc posix.cc win32.cc $(c_source_files) \
- $(extra_cc_source_files) $(java_source_files) $(built_java_source_files)
-libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \
- $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \
- $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) \
- $(propertyo_files)
+ $(nat_source_files) $(math_c_source_files) $(java_source_files) \
+ $(built_java_source_files) \
+ $(BOEHMGC_SRC) $(NOGC_SRC) \
+ $(BACKTRACE_SRC) \
+ $(POSIX_PLATFORM_SRC) $(WIN32_PLATFORM_SRC) $(ECOS_PLATFORM_SRC) \
+ $(POSIX_THREAD_SRC) $(WIN32_THREAD_SRC) $(NO_THREAD_SRC)
+libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar \
+ java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h \
+ $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
+libgcj_la_LIBADD = \
+ $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) $(propertyo_files)
-libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \
- $(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files)
# Include THREADLIBS here to ensure that the correct version of
# certain linuxthread functions get linked:
## The mysterious backslash in the grep pattern is consumed by make.
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
- $(LIBLTDL) $(SYS_ZLIBS) \
+ $(SYS_ZLIBS) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
-libgcj_la_LINK = $(LIBLINK)
# Gtk/Cairo JNI sources.
if GTK_CAIRO
@@ -272,6 +321,10 @@
echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \
$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input
+## For the peer library, DEPENDENCIES need to come before OBJECTS so
+## that JNI headers are built before JNI C files.
+$(lib_gnu_java_awt_peer_gtk_la_OBJECTS): $(lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES)
+
lib_gnu_java_awt_peer_gtk_la_SOURCES = \
$(gtk_awt_peer_sources) \
$(gtk_c_source_files) \
@@ -282,6 +335,10 @@
jni/classpath/native_state.h \
jni/classpath/primlib.h
+lib_gnu_java_awt_peer_gtk_la_CFLAGS = \
+ -Ijniinclude -I$(srcdir)/jni/classpath \
+ -I$(srcdir)/jni/gtk-peer $(GTK_CFLAGS) $(LIBART_CFLAGS)
+lib_gnu_java_awt_peer_gtk_la_GCJFLAGS = $(AM_GCJFLAGS) -fjni
lib_gnu_java_awt_peer_gtk_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = $(gtk_jni_headers)
## The mysterious backslash in the grep pattern is consumed by make.
@@ -355,16 +414,16 @@
lib_org_xml_sax_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
-lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files)
-EXTRA_lib_gnu_awt_xlib_la_SOURCES = $(xlib_java_source_files)
-lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(xlib_javao_files)
+lib_gnu_awt_xlib_la_SOURCES = \
+ $(xlib_java_source_files) \
+ $(xlib_nat_source_files)
+lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-@gcc_version@.jar
lib_gnu_awt_xlib_la_LIBADD = $(xlib_javao_files)
## The mysterious backslash in the grep pattern is consumed by make.
lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
@X_PRE_LIBS@ @X_LIBS@ -lX11 @X_EXTRA_LIBS@ \
-rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
-lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
all_java_source_files = \
$(java_source_files) \
@@ -447,40 +506,6 @@
SUFFIXES = .class .java .h .properties
-.class.lo:
- $(GCJCOMPILE) -o $@ $<
-
-.java.lo:
- $(GCJCOMPILE) -o $@ $<
-
-## FIXME: For the .o files in subdirs, use a special rule. The
-## standard automake rule can't be overridden (this is a bug in
-## automake), and it also won't put the .o files into subdirs.
-$(nat_files) $(xlib_nat_files): %.lo: %.cc
- @echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \
- $(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<
- @-mv $(@:.lo=.pp) $(@:.lo=.d)
-
-## FIXME: see above
-$(c_files): %.lo: %.c
- $(LTCOMPILE) -c -o $@ $<
-
-$(extra_cc_files): %.lo: %.cc
- $(LTCXXCOMPILE) -c -o $@ $<
-
-$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
-
-## FIXME: see above
-## These JNI C files are shared with GNU Classpath which needs PEDANTIC_CFLAGS.
-$(gtk_c_files): %.lo: %.c
- $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer \
- $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \
- $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $<
-
-$(gtk_c_files): $(gtk_jni_headers)
-
-## FIXME: see above.
-
## Note: we omit StackTrace here, since it has an explicit rule a bit
## later, and GNU make will warn in this case.
$(filter-out gnu/gcj/runtime/StackTrace.lo, $(javao_files)) $(xlib_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java
@@ -495,19 +520,10 @@
gnu/gcj/runtime/StackTrace.lo: gnu/gcj/runtime/StackTrace.java
$(GCJCOMPILE) -fno-optimize-sibling-calls -o $@ $<
-## 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_la_LIBADD),libgcj.objectlist)
- $(libgcj_la_LINK) -objectlist libgcj.objectlist \
- @GCLIBS@ @LIBFFI@ @ZLIBS@ \
- -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
-
lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPENDENCIES)
@echo Creating list of files to link...
@: $(call write_entries_to_file,$(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_LIBADD),lib_gnu_awt_xlib.objectlist)
- $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \
+ -objectlist lib_gnu_awt_xlib.objectlist \
-rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS)
## ################################################################
@@ -740,19 +756,68 @@
if NATIVE
if MAINTAINER_MODE
noinst_PROGRAMS = gen-from-JIS
+
+gen_from_JIS_SOURCES = \
+ gnu/gcj/convert/gen-from-JIS.c \
+ gnu/gcj/convert/make-trie.c
+
+gen_from_JIS_DEPENDENCIES = \
+ gnu/gcj/convert/JIS0201.h \
+ gnu/gcj/convert/JIS0208.h \
+ gnu/gcj/convert/JIS0212.h
+
+$(srcdir)/gnu/gcj/convert/JIS0208_to_Unicode.cc: ./gen-from-JIS$(EXEEXT)
+ ./gen-from-JIS JIS0208 >$(srcdir)/gnu/gcj/convert/JIS0208_to_Unicode.cc
+
+$(srcdir)/gnu/gcj/convert/JIS0212_to_Unicode.cc: ./gen-from-JIS$(EXEEXT)
+ ./gen-from-JIS JIS0212 >$(srcdir)/gnu/gcj/convert/JIS0212_to_Unicode.cc
+
+$(srcdir)/gnu/gcj/convert/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT)
+ ./gen-from-JIS toJIS >$(srcdir)/gnu/gcj/convert/Unicode_to_JIS.cc
+
+# The Unicode consortium does not permit re-distributing the file JIS0201.TXT.
+# You can get it from
+# ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/
+
+$(srcdir)/gnu/gcj/convert/JIS0201.h: # gnu/gcj/convert/JIS0201.TXT
+ echo '/* This file is automatically generated from Unicode tables */' > tmp-0201; \
+ tr -d '\r' <$(srcdir)/gnu/gcj/convert/JIS0201.TXT \
+ | sed -n -e 's|\(0x..\).*\(0x....\).*#\(.*\)$$|MAP(0x00, \1, \2) /*\3 */|p' \
+ >> tmp-0201; \
+ mv tmp-0201 $(srcdir)/gnu/gcj/convert/JIS0201.h
+
+# The Unicode consortium does not permit re-distributing the file JIS0208.TXT.
+# You can get it from
+# ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/
+
+$(srcdir)/gnu/gcj/convert/JIS0208.h: # gnu/gcj/convert/JIS0208.TXT
+ echo '/* This file is automatically generated from Unicode tables */' > tmp-0208; \
+ tr -d '\r' <$(srcdir)/gnu/gcj/convert/JIS0208.TXT \
+ | sed -n -e 's|\(0x....\).*0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\2, 0x\3, \4) /*\5 */|p' \
+ >> tmp-0208; \
+ mv tmp-0208 $(srcdir)/gnu/gcj/convert/JIS0208.h
+
+# The Unicode consortium does not permit re-distributing the file JIS0212.TXT.
+# You can get it from
+# ftp://ftp.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS/
+
+$(srcdir)/gnu/gcj/convert/JIS0212.h: # gnu/gcj/convert/JIS0212.TXT
+ echo '/* This file is automatically generated from Unicode tables */' > tmp-0212; \
+ tr -d '\r' <$(srcdir)/gnu/gcj/convert/JIS0212.TXT \
+ | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \
+ >> tmp-0212; \
+ mv tmp-0212 $(srcdir)/gnu/gcj/convert/JIS0212.h
+
endif
endif
-CONVERT_DIR = gnu/gcj/convert
jv_convert_SOURCES =
-EXTRA_jv_convert_SOURCES = $(convert_source_files)
## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We
## need this because we are explicitly using libtool to link using the
## `.la' file.
jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-jv_convert_LINK = $(GCJLINK)
## We don't explicitly link in the libraries we need; libgcj.la brings
## in all dependencies. We need the -L so that gcj can find libgcj
## with `-lgcj', but it must come first, otherwise the -L flags
@@ -763,112 +828,41 @@
jv_convert_LDADD = -L$(here)/.libs libgcj.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
-jv_convert_DEPENDENCIES = $(convert_source_files:.java=.lo) \
- libgcj.la libgcj.spec
+jv_convert_DEPENDENCIES = libgcj.la libgcj.spec
+jv_convert_LINK = $(GCJLINK)
-gij_SOURCES = gij.cc
+gij_SOURCES =
## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We
## need this because we are explicitly using libtool to link using the
## `.la' file.
gij_LDFLAGS = -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-gij_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-gij_LDADD = -L$(here)/.libs libgcj.la
+gij_LDADD = -L$(here)/.libs libgcj.la libgij.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
-gij_DEPENDENCIES = libgcj.la libgcj.spec
+gij_DEPENDENCIES = libgcj.la libgcj.spec libgij.la
-grmic_SOURCES =
## This is a dummy definition.
-EXTRA_grmic_SOURCES = $(rmi_java_source_files)
+grmic_SOURCES =
grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-grmic_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-grmic_LDADD = -L$(here)/.libs libgcj.la
+grmic_LDADD = -L$(here)/.libs libgcj.la libgij.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
grmic_DEPENDENCIES = libgcj.la libgcj.spec
+grmic_LINK = $(GCJLINK)
-grmiregistry_SOURCES =
## This is a dummy definition.
-EXTRA_grmiregistry_SOURCES = $(rmi_java_source_files)
+grmiregistry_SOURCES =
grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-grmiregistry_LINK = $(GCJLINK)
## See jv_convert_LDADD.
-grmiregistry_LDADD = -L$(here)/.libs libgcj.la
+grmiregistry_LDADD = -L$(here)/.libs libgcj.la libgij.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
-
-# The Unicode consortium does not permit re-distributing the file JIS0201.TXT.
-# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/.
-
-$(srcdir)/$(CONVERT_DIR)/JIS0201.h: # $(CONVERT_DIR)/JIS0201.TXT
- echo '/* This file is automatically generated from Unicode tables */' > tmp-0201; \
- tr -d '\r' <$(CONVERT_DIR)/JIS0201.TXT \
- | sed -n -e 's|\(0x..\).*\(0x....\).*#\(.*\)$$|MAP(0x00, \1, \2) /*\3 */|p' \
- >> tmp-0201; \
- mv tmp-0201 $(srcdir)/$(CONVERT_DIR)/JIS0201.h
-
-# The Unicode consortium does not permit re-distributing the file JIS0208.TXT.
-# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/.
-
-$(srcdir)/$(CONVERT_DIR)/JIS0208.h: # $(CONVERT_DIR)/JIS0208.TXT
- echo '/* This file is automatically generated from Unicode tables */' > tmp-0208; \
- tr -d '\r' <$(CONVERT_DIR)/JIS0208.TXT \
- | sed -n -e 's|\(0x....\).*0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\2, 0x\3, \4) /*\5 */|p' \
- >> tmp-0208; \
- mv tmp-0208 $(srcdir)/$(CONVERT_DIR)/JIS0208.h
-
-# The Unicode consortium does not permit re-distributing the file JIS0212.TXT.
-# You can get it from ftp://ftp.unicode.org/Public/MAPPINGS/EASTASIA/JIS/.
-
-$(srcdir)/$(CONVERT_DIR)/JIS0212.h: # $(CONVERT_DIR)/JIS0212.TXT
- echo '/* This file is automatically generated from Unicode tables */' > tmp-0212; \
- tr -d '\r' <$(CONVERT_DIR)/JIS0212.TXT \
- | sed -n -e 's|0x\(..\)\(..\).*\(0x....\).*#\(.*\)$$|MAP(0x\1, 0x\2, \3) /*\4 */|p' \
- >> tmp-0212; \
- mv tmp-0212 $(srcdir)/$(CONVERT_DIR)/JIS0212.h
-
-
-gen_from_JIS_SOURCES =
-EXTRA_gen_from_JIS_SOURCES = $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \
- $(srcdir)/$(CONVERT_DIR)/make-trie.c \
- $(srcdir)/$(CONVERT_DIR)/JIS0201.h \
- $(srcdir)/$(CONVERT_DIR)/JIS0208.h \
- $(srcdir)/$(CONVERT_DIR)/JIS0212.h
-gen_from_JIS_LDADD = $(CONVERT_DIR)/gen-from-JIS.o $(CONVERT_DIR)/make-trie.o
-gen_from_JIS_DEPENDENCIES = $(CONVERT_DIR)/gen-from-JIS.o \
- $(CONVERT_DIR)/make-trie.o
-
-$(CONVERT_DIR)/gen-from-JIS.o: $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c \
- $(srcdir)/$(CONVERT_DIR)/JIS0201.h \
- $(srcdir)/$(CONVERT_DIR)/JIS0208.h \
- $(srcdir)/$(CONVERT_DIR)/JIS0212.h
- $(COMPILE) -c -o $(CONVERT_DIR)/gen-from-JIS.o \
- $(srcdir)/$(CONVERT_DIR)/gen-from-JIS.c
-
-$(CONVERT_DIR)/make-trie.o: $(srcdir)/$(CONVERT_DIR)/make-trie.c
- $(COMPILE) -c -o $(CONVERT_DIR)/make-trie.o \
- $(srcdir)/$(CONVERT_DIR)/make-trie.c
-
-if NATIVE
-if MAINTAINER_MODE
-
-$(srcdir)/$(CONVERT_DIR)/JIS0208_to_Unicode.cc: ./gen-from-JIS$(EXEEXT)
- ./gen-from-JIS JIS0208>$(srcdir)/$(CONVERT_DIR)/JIS0208_to_Unicode.cc
-
-$(srcdir)/$(CONVERT_DIR)/JIS0212_to_Unicode.cc: ./gen-from-JIS$(EXEEXT)
- ./gen-from-JIS JIS0212>$(srcdir)/$(CONVERT_DIR)/JIS0212_to_Unicode.cc
-
-$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc: ./gen-from-JIS$(EXEEXT)
- ./gen-from-JIS toJIS>$(srcdir)/$(CONVERT_DIR)/Unicode_to_JIS.cc
-
-endif # MAINTAINER_MODE
-endif # NATIVE
-
+grmiregistry_LINK = $(GCJLINK)
## ################################################################
@@ -2922,7 +2915,7 @@
java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
## Math library: C, not C++
-c_source_files = \
+math_c_source_files = \
java/lang/dtoa.c java/lang/k_rem_pio2.c java/lang/s_tan.c \
java/lang/e_acos.c java/lang/k_sin.c java/lang/strtod.c \
java/lang/e_asin.c java/lang/k_tan.c java/lang/w_acos.c \
@@ -2937,8 +2930,6 @@
java/lang/e_sqrt.c java/lang/s_scalbn.c java/lang/sf_rint.c \
java/lang/k_cos.c java/lang/s_sin.c java/lang/sf_fabs.c
-extra_cc_source_files = $(EXTRA_CC_FILES)
-
#java/awt/natToolkit.cc
## This lists all the C++ source files in subdirectories.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.203
diff -u -b -B -r1.203 configure.in
--- configure.in 4 Aug 2004 19:30:12 -0000 1.203
+++ configure.in 5 Aug 2004 11:10:44 -0000
@@ -1,6 +1,9 @@
dnl # Process this with autoconf to create configure
AC_PREREQ(2.59)
-AC_INIT(java/lang/System.java)
+# Still use "libjava" here to placate dejagnu.
+AC_INIT(libjava, version-unused,,)
+
+AC_CONFIG_SRCDIR(java/lang/System.java)
# We use these options to decide which functions to include.
AC_ARG_WITH(target-subdir,
@@ -32,13 +35,6 @@
libgcj_basedir=$srcdir/$toprel/./libjava
AC_SUBST(libgcj_basedir)
-AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
-if :; then :; else
- # This overrides the previous occurrence for automake, but not for
- # autoconf, which is exactly what we want.
- AC_CONFIG_AUX_DIR(..)
-fi
-
AC_CANONICAL_SYSTEM
_GCC_TOPLEV_NONCANONICAL_BUILD
_GCC_TOPLEV_NONCANONICAL_TARGET
@@ -112,10 +108,7 @@
AC_SUBST(CXXFLAGS)
AC_SUBST(LDFLAGS)
-# version is pulled out to make it a bit easier to change using sed.
-version=0.0.7
-# Still use "libjava" here to placate dejagnu.
-AM_INIT_AUTOMAKE(libjava, $version)
+AM_INIT_AUTOMAKE([1.9.0])
AC_CHECK_TOOL(AS, as)
AC_CHECK_TOOL(AR, ar)
@@ -163,7 +156,9 @@
AC_SUBST(LIBLTDL)
AC_SUBST(DIRLTDL)
AM_PROG_LIBTOOL
-AC_CONFIG_SUBDIRS($DIRLTDL)
+AM_PROG_GCJ
+AM_PROG_CC_C_O
+AC_CONFIG_SUBDIRS(libltdl)
if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
COMPPATH=.
@@ -382,23 +377,19 @@
TARGET_ECOS="$with_ecos"
)
-EXTRA_CC_FILES=
-AC_SUBST(EXTRA_CC_FILES)
+supply_backtrace=no
-PLATFORMOBJS=
case "$TARGET_ECOS" in
no) case "$host" in
*mingw*)
PLATFORM=Win32
PLATFORMNET=Win32
- PLATFORMOBJS=win32.lo
PLATFORMH=win32.h
CHECK_FOR_BROKEN_MINGW_LD
;;
*)
PLATFORM=Posix
PLATFORMNET=Posix
- PLATFORMOBJS=posix.lo
PLATFORMH=posix.h
;;
esac
@@ -407,11 +398,9 @@
PLATFORM=Ecos
PLATFORMNET=NoNet
AC_DEFINE(ECOS, 1, [Define if you're running eCos.])
- PLATFORMOBJS=posix.lo
PLATFORMH=posix.h
;;
esac
-AC_SUBST(PLATFORMOBJS)
AC_CONFIG_LINKS(include/platform.h:include/$PLATFORMH)
AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1,
@@ -423,6 +412,9 @@
AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1,
[Define if you have u_int32_t]))
+AM_CONDITIONAL(USING_WIN32_PLATFORM, test "$PLATFORM" = Win32)
+AM_CONDITIONAL(USING_POSIX_PLATFORM, test "$PLATFORM" = Posix)
+AM_CONDITIONAL(USING_ECOS_PLATFORM, test "$PLATFORM" = Ecos)
# These may not be defined in a non-ANS conformant embedded system.
# FIXME: Should these case a runtime exception in that case?
@@ -566,7 +558,6 @@
GCLIBS=
GCINCS=
GCDEPS=
-GCOBJS=
GCSPEC=
JC1GCSPEC=
GCTESTSPEC=
@@ -580,14 +571,12 @@
# We also want to pick up some cpp flags required when including
# boehm-config.h. Yuck.
GCINCS="`cat ../boehm-gc/boehm-cflags`"
- GCOBJS=boehm.lo
GCHDR=boehm-gc.h
# The POSIX thread support needs to know this.
AC_DEFINE(HAVE_BOEHM_GC, 1, [Define if Boehm GC in use.])
;;
no)
AC_MSG_RESULT(none)
- GCOBJS=nogc.lo
GCHDR=no-gc.h
;;
*)
@@ -597,11 +586,12 @@
AC_SUBST(GCLIBS)
AC_SUBST(GCINCS)
AC_SUBST(GCDEPS)
-AC_SUBST(GCOBJS)
AC_SUBST(GCSPEC)
AC_SUBST(JC1GCSPEC)
AC_SUBST(GCTESTSPEC)
AC_CONFIG_LINKS(include/java-gc.h:include/$GCHDR)
+AM_CONDITIONAL(USING_BOEHMGC, test "$GC" = boehm)
+AM_CONDITIONAL(USING_NOGC, test "$GC" = no)
AC_MSG_CHECKING([for thread model used by GCC])
@@ -635,7 +625,6 @@
THREADLIBS=
THREADINCS=
THREADDEPS=
-THREADOBJS=
THREADH=
THREADSPEC=
case "$THREADS" in
@@ -674,7 +663,6 @@
THREADSPEC=-lpthread
;;
esac
- THREADOBJS=posix-threads.lo
THREADH=posix-threads.h
# MIT pthreads doesn't seem to have the mutexattr functions.
# But for now we don't check for it. We just assume you aren't
@@ -690,12 +678,10 @@
;;
win32)
- THREADOBJS=win32-threads.lo
THREADH=win32-threads.h
;;
none)
- THREADOBJS=no-threads.lo
THREADH=no-threads.h
;;
esac
@@ -703,10 +689,12 @@
AC_SUBST(THREADLIBS)
AC_SUBST(THREADINCS)
AC_SUBST(THREADDEPS)
-AC_SUBST(THREADOBJS)
AC_SUBST(THREADSPEC)
AC_SUBST(THREADLDFLAGS)
AC_SUBST(THREADCXXFLAGS)
+AM_CONDITIONAL(USING_POSIX_THREADS, test "$THREADS" = posix)
+AM_CONDITIONAL(USING_WIN32_THREADS, test "$THREADS" = win32)
+AM_CONDITIONAL(USING_NO_THREADS, test "$THREADS" = none)
if test -d sysdep; then true; else mkdir sysdep; fi
AC_CONFIG_LINKS(sysdep/locks.h:sysdep/$sysdeps_dir/locks.h)
@@ -772,7 +760,7 @@
mips*-*-linux*)
# Has broken backtrace(), but we supply our own.
if test -d sysdep; then true; else mkdir -p sysdep; fi
- EXTRA_CC_FILES="${EXTRA_CC_FILES} sysdep/dwarf2-backtrace.cc"
+ supply_backtrace=yes
AC_DEFINE(HAVE_BACKTRACE, 1,
[Define if your platform has a working backtrace() function.])
;;
@@ -1020,6 +1008,7 @@
AC_CHECK_LIB(dl, main, SYSTEMSPEC="$SYSTEMSPEC -ldl")
fi
fi
+AM_CONDITIONAL(SUPPLY_BACKTRACE, test "$supply_backtrace" = yes)
if test -z "${with_multisubdir}"; then
builddotdot=.