OSDN Git Service

(root) / pf3gnuchains / gcc-fork.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
PR bootstrap/39454
[pf3gnuchains/gcc-fork.git] / libjava / Makefile.in
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index ba48788..4de0b31 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -44,27 +44,23 @@ target_triplet = @target@
 @USE_LIBGCJ_BC_TRUE@am__append_2 = libgcj_bc.la
 @XLIB_AWT_TRUE@am__append_3 = lib-gnu-awt-xlib.la
 @INSTALL_ECJ_JAR_TRUE@am__append_4 = $(ECJ_BUILD_JAR)
-@NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
-@NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
-@NATIVE_TRUE@  gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
-@NATIVE_TRUE@  gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \
-@NATIVE_TRUE@  gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \
-@NATIVE_TRUE@  gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \
-@NATIVE_TRUE@  grmid$(EXEEXT) gserialver$(EXEEXT) \
-@NATIVE_TRUE@  gtnameserv$(EXEEXT) gc-analyze$(EXEEXT)
-@INSTALL_AOT_RPM_TRUE@am__append_5 = contrib/aot-compile-rpm
+@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__append_5 = gjdoc
+@NATIVE_TRUE@noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
+@INSTALL_BINARIES_TRUE@@NATIVE_TRUE@bin_PROGRAMS = $(am__EXEEXT_2)
+@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__append_6 = $(bin_programs)
+@INSTALL_AOT_RPM_TRUE@am__append_7 = contrib/aot-compile-rpm
 @BUILD_ECJ1_TRUE@libexecsub_PROGRAMS = ecjx$(EXEEXT)
-@ANONVERSCRIPT_TRUE@am__append_6 = -Wl,--version-script=$(srcdir)/libgcj.ver
-@USING_GCC_TRUE@am__append_7 = $(WARNINGS)
-@USING_BOEHMGC_TRUE@am__append_8 = boehm.cc
-@USING_NOGC_TRUE@am__append_9 = nogc.cc
-@USING_POSIX_PLATFORM_TRUE@am__append_10 = posix.cc
-@USING_WIN32_PLATFORM_TRUE@am__append_11 = win32.cc
-@USING_DARWIN_CRT_TRUE@am__append_12 = darwin.cc
-@USING_POSIX_THREADS_TRUE@am__append_13 = posix-threads.cc
-@USING_WIN32_THREADS_TRUE@am__append_14 = win32-threads.cc
-@USING_NO_THREADS_TRUE@am__append_15 = no-threads.cc
-@ANONVERSCRIPT_TRUE@am__append_16 = $(srcdir)/libgcj.ver
+@ANONVERSCRIPT_TRUE@am__append_8 = -Wl,--version-script=$(srcdir)/libgcj.ver
+@USING_GCC_TRUE@am__append_9 = $(WARNINGS)
+@USING_BOEHMGC_TRUE@am__append_10 = boehm.cc
+@USING_NOGC_TRUE@am__append_11 = nogc.cc
+@USING_POSIX_PLATFORM_TRUE@am__append_12 = posix.cc
+@USING_WIN32_PLATFORM_TRUE@am__append_13 = win32.cc
+@USING_DARWIN_CRT_TRUE@am__append_14 = darwin.cc
+@USING_POSIX_THREADS_TRUE@am__append_15 = posix-threads.cc
+@USING_WIN32_THREADS_TRUE@am__append_16 = win32-threads.cc
+@USING_NO_THREADS_TRUE@am__append_17 = no-threads.cc
+@ANONVERSCRIPT_TRUE@am__append_18 = $(srcdir)/libgcj.ver
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(srcdir)/../config.guess $(srcdir)/../config.sub \
        $(srcdir)/../depcomp $(srcdir)/../install-sh \
@@ -78,10 +74,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../compile \
        $(top_srcdir)/contrib/aotcompile.py.in \
        $(top_srcdir)/contrib/rebuild-gcj-db.in \
        $(top_srcdir)/scripts/jar.in COPYING ChangeLog NEWS THANKS
-@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@noinst_PROGRAMS =  \
-@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)
-@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_17 = libgcj_bc.la
-@XLIB_AWT_TRUE@am__append_18 = $(xlib_nat_headers)
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__append_19 = gen-from-JIS
+@NATIVE_TRUE@@USE_LIBGCJ_BC_TRUE@am__append_20 = libgcj_bc.la
+@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__append_21 = libgcj.la
+@XLIB_AWT_TRUE@am__append_22 = $(xlib_nat_headers)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
@@ -104,9 +100,9 @@ am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
        $(top_srcdir)/../config/unwind_ipinfo.m4 \
        $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \
        $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
-       $(top_srcdir)/../ltversion.m4 $(top_srcdir)/mingwld.m4 \
-       $(top_srcdir)/pkg.m4 $(top_srcdir)/shlibpath.m4 \
-       $(top_srcdir)/configure.ac
+       $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
+       $(top_srcdir)/mingwld.m4 $(top_srcdir)/pkg.m4 \
+       $(top_srcdir)/shlibpath.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -121,7 +117,8 @@ CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
        gnu/java/net/natPlainSocketImpl.cc \
        gnu/java/net/natPlainDatagramSocketImpl.cc \
        gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
-       gnu/java/nio/channels/natFileChannelImpl.cc sysdep/locks.h \
+       gnu/java/nio/channels/natFileChannelImpl.cc \
+       gnu/java/security/jce/prng/natVMSecureRandom.cc sysdep/locks.h \
        sysdep/backtrace.h sysdep/descriptor.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -183,14 +180,14 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/java/awt/java2d.lo gnu/java/awt/peer.lo \
        gnu/java/awt/peer/headless.lo gnu/java/awt/print.lo \
        gnu/java/io.lo gnu/java/lang.lo gnu/java/lang/reflect.lo \
-       gnu/java/locale.lo gnu/java/math.lo gnu/java/net.lo \
-       gnu/java/net/loader.lo gnu/java/net/local.lo \
-       gnu/java/net/protocol/core.lo gnu/java/net/protocol/file.lo \
-       gnu/java/net/protocol/ftp.lo gnu/java/net/protocol/gcjlib.lo \
-       gnu/java/net/protocol/http.lo gnu/java/net/protocol/https.lo \
-       gnu/java/net/protocol/jar.lo gnu/java/nio.lo \
-       gnu/java/nio/channels.lo gnu/java/nio/charset.lo \
-       gnu/java/rmi.lo gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
+       gnu/java/locale.lo gnu/java/net.lo gnu/java/net/loader.lo \
+       gnu/java/net/local.lo gnu/java/net/protocol/core.lo \
+       gnu/java/net/protocol/file.lo gnu/java/net/protocol/ftp.lo \
+       gnu/java/net/protocol/gcjlib.lo gnu/java/net/protocol/http.lo \
+       gnu/java/net/protocol/https.lo gnu/java/net/protocol/jar.lo \
+       gnu/java/nio.lo gnu/java/nio/channels.lo \
+       gnu/java/nio/charset.lo gnu/java/rmi.lo \
+       gnu/java/rmi/activation.lo gnu/java/rmi/dgc.lo \
        gnu/java/rmi/registry.lo gnu/java/rmi/server.lo \
        gnu/java/security.lo gnu/java/security/action.lo \
        gnu/java/security/ber.lo gnu/java/security/der.lo \
@@ -204,18 +201,18 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        gnu/java/security/x509.lo gnu/java/security/x509/ext.lo \
        gnu/java/text.lo gnu/java/util.lo gnu/java/util/jar.lo \
        gnu/java/util/prefs.lo gnu/java/util/regex.lo \
-       gnu/javax/crypto.lo gnu/javax/crypto/assembly.lo \
-       gnu/javax/crypto/cipher.lo gnu/javax/crypto/jce.lo \
-       gnu/javax/crypto/jce/cipher.lo gnu/javax/crypto/jce/key.lo \
-       gnu/javax/crypto/jce/keyring.lo gnu/javax/crypto/jce/mac.lo \
-       gnu/javax/crypto/jce/params.lo gnu/javax/crypto/jce/prng.lo \
-       gnu/javax/crypto/jce/sig.lo gnu/javax/crypto/jce/spec.lo \
-       gnu/javax/crypto/key.lo gnu/javax/crypto/key/dh.lo \
-       gnu/javax/crypto/key/srp6.lo gnu/javax/crypto/keyring.lo \
-       gnu/javax/crypto/kwa.lo gnu/javax/crypto/mac.lo \
-       gnu/javax/crypto/mode.lo gnu/javax/crypto/pad.lo \
-       gnu/javax/crypto/prng.lo gnu/javax/crypto/sasl.lo \
-       gnu/javax/crypto/sasl/anonymous.lo \
+       gnu/javax/activation/viewers.lo gnu/javax/crypto.lo \
+       gnu/javax/crypto/assembly.lo gnu/javax/crypto/cipher.lo \
+       gnu/javax/crypto/jce.lo gnu/javax/crypto/jce/cipher.lo \
+       gnu/javax/crypto/jce/key.lo gnu/javax/crypto/jce/keyring.lo \
+       gnu/javax/crypto/jce/mac.lo gnu/javax/crypto/jce/params.lo \
+       gnu/javax/crypto/jce/prng.lo gnu/javax/crypto/jce/sig.lo \
+       gnu/javax/crypto/jce/spec.lo gnu/javax/crypto/key.lo \
+       gnu/javax/crypto/key/dh.lo gnu/javax/crypto/key/srp6.lo \
+       gnu/javax/crypto/keyring.lo gnu/javax/crypto/kwa.lo \
+       gnu/javax/crypto/mac.lo gnu/javax/crypto/mode.lo \
+       gnu/javax/crypto/pad.lo gnu/javax/crypto/prng.lo \
+       gnu/javax/crypto/sasl.lo gnu/javax/crypto/sasl/anonymous.lo \
        gnu/javax/crypto/sasl/crammd5.lo \
        gnu/javax/crypto/sasl/plain.lo gnu/javax/crypto/sasl/srp.lo \
        gnu/javax/imageio.lo gnu/javax/imageio/bmp.lo \
@@ -263,16 +260,17 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        java/util/concurrent/atomic.lo java/util/concurrent/locks.lo \
        java/util/jar.lo java/util/logging.lo java/util/prefs.lo \
        java/util/regex.lo java/util/spi.lo java/util/zip.lo \
-       javax/accessibility.lo javax/activity.lo javax/crypto.lo \
-       javax/crypto/interfaces.lo javax/crypto/spec.lo \
-       javax/management.lo javax/management/loading.lo \
-       javax/management/openmbean.lo javax/management/remote.lo \
-       javax/management/remote/rmi.lo javax/naming.lo \
-       javax/naming/directory.lo javax/naming/event.lo \
-       javax/naming/ldap.lo javax/naming/spi.lo javax/net.lo \
-       javax/net/ssl.lo javax/print.lo javax/print/attribute.lo \
-       javax/print/attribute/standard.lo javax/print/event.lo \
-       javax/security/auth.lo javax/security/auth/callback.lo \
+       javax/accessibility.lo javax/activation.lo javax/activity.lo \
+       javax/crypto.lo javax/crypto/interfaces.lo \
+       javax/crypto/spec.lo javax/management.lo \
+       javax/management/loading.lo javax/management/openmbean.lo \
+       javax/management/remote.lo javax/management/remote/rmi.lo \
+       javax/naming.lo javax/naming/directory.lo \
+       javax/naming/event.lo javax/naming/ldap.lo javax/naming/spi.lo \
+       javax/net.lo javax/net/ssl.lo javax/print.lo \
+       javax/print/attribute.lo javax/print/attribute/standard.lo \
+       javax/print/event.lo javax/security/auth.lo \
+       javax/security/auth/callback.lo \
        javax/security/auth/kerberos.lo javax/security/auth/login.lo \
        javax/security/auth/spi.lo javax/security/auth/x500.lo \
        javax/security/cert.lo javax/security/sasl.lo \
@@ -292,7 +290,7 @@ am__DEPENDENCIES_2 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \
        sun/reflect/misc.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-beans.lo gnu-java-lang-management.lo \
+       gnu-java-beans.lo gnu-java-lang-management.lo gnu-java-math.lo \
        gnu-java-util-prefs-gconf.lo gnu-javax-management.lo \
        gnu-javax-rmi.lo gnu-javax-sound-midi.lo gnu-xml-aelfred2.lo \
        gnu-xml-dom.lo gnu-xml-libxmlj.lo gnu-xml-pipeline.lo \
@@ -345,19 +343,19 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
        gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
        gnu/java/nio/natNIOServerSocket.cc \
        gnu/java/nio/natVMChannel.cc \
-       gnu/java/nio/channels/natFileChannelImpl.cc java/io/natFile.cc \
-       java/io/natVMObjectInputStream.cc \
+       gnu/java/nio/channels/natFileChannelImpl.cc \
+       gnu/java/security/jce/prng/natVMSecureRandom.cc \
+       java/io/natFile.cc java/io/natVMObjectInputStream.cc \
        java/io/natVMObjectStreamClass.cc java/lang/natCharacter.cc \
        java/lang/natClass.cc java/lang/natClassLoader.cc \
        java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \
        java/lang/natVMFloat.cc java/lang/natMath.cc \
        java/lang/natObject.cc java/lang/natRuntime.cc \
-       java/lang/natString.cc java/lang/natStringBuffer.cc \
-       java/lang/natStringBuilder.cc java/lang/natSystem.cc \
-       java/lang/natThread.cc java/lang/natThreadLocal.cc \
-       java/lang/natVMClassLoader.cc java/lang/natVMProcess.cc \
-       java/lang/natVMThrowable.cc java/lang/ref/natReference.cc \
-       java/lang/reflect/natArray.cc \
+       java/lang/natString.cc java/lang/natAbstractStringBuffer.cc \
+       java/lang/natSystem.cc java/lang/natThread.cc \
+       java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \
+       java/lang/natVMProcess.cc java/lang/natVMThrowable.cc \
+       java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \
        java/lang/reflect/natConstructor.cc \
        java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
        java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \
@@ -410,19 +408,19 @@ am__objects_5 = $(am__objects_3) gnu/classpath/natConfiguration.lo \
        gnu/java/nio/natVMPipe.lo gnu/java/nio/natVMSelector.lo \
        gnu/java/nio/natNIOServerSocket.lo \
        gnu/java/nio/natVMChannel.lo \
-       gnu/java/nio/channels/natFileChannelImpl.lo java/io/natFile.lo \
-       java/io/natVMObjectInputStream.lo \
+       gnu/java/nio/channels/natFileChannelImpl.lo \
+       gnu/java/security/jce/prng/natVMSecureRandom.lo \
+       java/io/natFile.lo java/io/natVMObjectInputStream.lo \
        java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
        java/lang/natClass.lo java/lang/natClassLoader.lo \
        java/lang/natConcreteProcess.lo java/lang/natVMDouble.lo \
        java/lang/natVMFloat.lo java/lang/natMath.lo \
        java/lang/natObject.lo java/lang/natRuntime.lo \
-       java/lang/natString.lo java/lang/natStringBuffer.lo \
-       java/lang/natStringBuilder.lo java/lang/natSystem.lo \
-       java/lang/natThread.lo java/lang/natThreadLocal.lo \
-       java/lang/natVMClassLoader.lo java/lang/natVMProcess.lo \
-       java/lang/natVMThrowable.lo java/lang/ref/natReference.lo \
-       java/lang/reflect/natArray.lo \
+       java/lang/natString.lo java/lang/natAbstractStringBuffer.lo \
+       java/lang/natSystem.lo java/lang/natThread.lo \
+       java/lang/natThreadLocal.lo java/lang/natVMClassLoader.lo \
+       java/lang/natVMProcess.lo java/lang/natVMThrowable.lo \
+       java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
        java/lang/reflect/natConstructor.lo \
        java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
        java/lang/reflect/natVMProxy.lo java/net/natVMInetAddress.lo \
@@ -457,11 +455,25 @@ am_libgij_la_OBJECTS = gij.lo
 libgij_la_OBJECTS = $(am_libgij_la_OBJECTS)
 am_libjvm_la_OBJECTS = jni-libjvm.lo
 libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS)
+@CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT)
+@NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \
+@NATIVE_TRUE@  grmic$(EXEEXT) grmiregistry$(EXEEXT) \
+@NATIVE_TRUE@  gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
+@NATIVE_TRUE@  gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \
+@NATIVE_TRUE@  gjar$(EXEEXT) gcjh$(EXEEXT) gjavah$(EXEEXT) \
+@NATIVE_TRUE@  gnative2ascii$(EXEEXT) gorbd$(EXEEXT) \
+@NATIVE_TRUE@  grmid$(EXEEXT) gserialver$(EXEEXT) \
+@NATIVE_TRUE@  gtnameserv$(EXEEXT) gc-analyze$(EXEEXT) \
+@NATIVE_TRUE@  $(am__EXEEXT_1)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 libexecsubPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+@INSTALL_BINARIES_FALSE@@NATIVE_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2)
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am__EXEEXT_4 =  \
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gen-from-JIS$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexecsub_PROGRAMS) $(noinst_PROGRAMS)
-am_ecjx_OBJECTS =
+am_ecjx_OBJECTS = ecjx.$(OBJEXT)
 ecjx_OBJECTS = $(am_ecjx_OBJECTS)
+@NATIVE_TRUE@@USE_LIBGCJ_BC_FALSE@am__DEPENDENCIES_6 = libgcj.la
 am_gappletviewer_OBJECTS =
 gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS)
 am_gc_analyze_OBJECTS =
@@ -471,7 +483,7 @@ gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS)
 am_gcjh_OBJECTS =
 gcjh_OBJECTS = $(am_gcjh_OBJECTS)
 am__gen_from_JIS_SOURCES_DIST = gnu/gcj/convert/gen-from-JIS.c \
-       gnu/gcj/convert/make-trie.c
+       gnu/gcj/convert/make-trie.c gnu/gcj/convert/make-trie.h
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@am_gen_from_JIS_OBJECTS = gnu/gcj/convert/gen-from-JIS.$(OBJEXT) \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.$(OBJEXT)
 gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS)
@@ -484,6 +496,8 @@ am_gjarsigner_OBJECTS =
 gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
 am_gjavah_OBJECTS =
 gjavah_OBJECTS = $(am_gjavah_OBJECTS)
+am_gjdoc_OBJECTS =
+gjdoc_OBJECTS = $(am_gjdoc_OBJECTS)
 am_gkeytool_OBJECTS =
 gkeytool_OBJECTS = $(am_gkeytool_OBJECTS)
 am_gnative2ascii_OBJECTS =
@@ -521,8 +535,6 @@ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
        $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-       $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS)
 LTGCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ) \
        $(AM_GCJFLAGS) $(GCJFLAGS)
@@ -533,10 +545,11 @@ SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \
        $(libjvm_la_SOURCES) $(ecjx_SOURCES) $(gappletviewer_SOURCES) \
        $(gc_analyze_SOURCES) $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
        $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \
-       $(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gkeytool_SOURCES) \
-       $(gnative2ascii_SOURCES) $(gorbd_SOURCES) $(grmic_SOURCES) \
-       $(grmid_SOURCES) $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
-       $(gtnameserv_SOURCES) $(jv_convert_SOURCES)
+       $(gjarsigner_SOURCES) $(gjavah_SOURCES) $(gjdoc_SOURCES) \
+       $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
+       $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
+       $(gserialver_SOURCES) $(gtnameserv_SOURCES) \
+       $(jv_convert_SOURCES)
 DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
        $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
        $(EXTRA_libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
@@ -545,10 +558,10 @@ DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
        $(gcj_dbtool_SOURCES) $(gcjh_SOURCES) \
        $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \
        $(gjar_SOURCES) $(gjarsigner_SOURCES) $(gjavah_SOURCES) \
-       $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) $(gorbd_SOURCES) \
-       $(grmic_SOURCES) $(grmid_SOURCES) $(grmiregistry_SOURCES) \
-       $(gserialver_SOURCES) $(gtnameserv_SOURCES) \
-       $(jv_convert_SOURCES)
+       $(gjdoc_SOURCES) $(gkeytool_SOURCES) $(gnative2ascii_SOURCES) \
+       $(gorbd_SOURCES) $(grmic_SOURCES) $(grmid_SOURCES) \
+       $(grmiregistry_SOURCES) $(gserialver_SOURCES) \
+       $(gtnameserv_SOURCES) $(jv_convert_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-exec-recursive install-info-recursive \
@@ -579,6 +592,7 @@ AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 ANONVERSCRIPT_FALSE = @ANONVERSCRIPT_FALSE@
 ANONVERSCRIPT_TRUE = @ANONVERSCRIPT_TRUE@
+ANTLR_JAR = @ANTLR_JAR@
 AR = @AR@
 AS = @AS@
 AUTOCONF = @AUTOCONF@
@@ -588,6 +602,8 @@ AWK = @AWK@
 BACKTRACESPEC = @BACKTRACESPEC@
 BUILD_ECJ1_FALSE = @BUILD_ECJ1_FALSE@
 BUILD_ECJ1_TRUE = @BUILD_ECJ1_TRUE@
+BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE = @BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@
+BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE = @BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE@
 BUILD_VERSION = @BUILD_VERSION@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -597,6 +613,8 @@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPU = @CPU@
+CREATE_GJDOC_FALSE = @CREATE_GJDOC_FALSE@
+CREATE_GJDOC_TRUE = @CREATE_GJDOC_TRUE@
 CREATE_JAVA_HOME_FALSE = @CREATE_JAVA_HOME_FALSE@
 CREATE_JAVA_HOME_TRUE = @CREATE_JAVA_HOME_TRUE@
 CXX = @CXX@
@@ -608,6 +626,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DIRLTDL = @DIRLTDL@
 DIVIDESPEC = @DIVIDESPEC@
+DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -643,6 +662,8 @@ IEEESPEC = @IEEESPEC@
 INCLTDL = @INCLTDL@
 INSTALL_AOT_RPM_FALSE = @INSTALL_AOT_RPM_FALSE@
 INSTALL_AOT_RPM_TRUE = @INSTALL_AOT_RPM_TRUE@
+INSTALL_BINARIES_FALSE = @INSTALL_BINARIES_FALSE@
+INSTALL_BINARIES_TRUE = @INSTALL_BINARIES_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_ECJ_JAR_FALSE = @INSTALL_ECJ_JAR_FALSE@
 INSTALL_ECJ_JAR_TRUE = @INSTALL_ECJ_JAR_TRUE@
@@ -690,6 +711,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBSTDCXXSPEC = @LIBSTDCXXSPEC@
 LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
@@ -703,8 +725,12 @@ NATIVE_TRUE = @NATIVE_TRUE@
 NEEDS_DATA_START_FALSE = @NEEDS_DATA_START_FALSE@
 NEEDS_DATA_START_TRUE = @NEEDS_DATA_START_TRUE@
 NM = nm
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OS = @OS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -717,7 +743,6 @@ PKG_CONFIG = @PKG_CONFIG@
 PLATFORM = @PLATFORM@
 RANLIB = @RANLIB@
 SDK_BIN_DIR = @SDK_BIN_DIR@
-SDK_DIR = @SDK_DIR@
 SDK_INCLUDE_DIR = @SDK_INCLUDE_DIR@
 SDK_LIB_DIR = @SDK_LIB_DIR@
 SDK_LNK = @SDK_LNK@
@@ -779,8 +804,14 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_AS = @ac_ct_AS@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 ac_ct_LD = @ac_ct_LD@
+ac_ct_LIPO = @ac_ct_LIPO@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
+ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
+ac_ct_OTOOL = @ac_ct_OTOOL@
+ac_ct_OTOOL64 = @ac_ct_OTOOL64@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -807,7 +838,7 @@ dbexecdir = @dbexecdir@
 exec_prefix = @exec_prefix@
 extra_gij_ldflags = @extra_gij_ldflags@
 extra_ldflags = @extra_ldflags@
-extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_6)
+extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_8)
 gcc_suffix = @gcc_suffix@
 gcjsubdir = @gcjsubdir@
 gxx_include_dir = @gxx_include_dir@
@@ -893,16 +924,24 @@ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
 @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
 db_name = classmap.db
 db_pathtail = $(gcjsubdir)/$(db_name)
+@NATIVE_TRUE@bin_programs = jv-convert gij grmic grmiregistry \
+@NATIVE_TRUE@  gcj-dbtool gappletviewer gjarsigner gkeytool gjar \
+@NATIVE_TRUE@  gcjh gjavah gnative2ascii gorbd grmid gserialver \
+@NATIVE_TRUE@  gtnameserv gc-analyze $(am__append_5)
 @NATIVE_TRUE@dbexec_DATA = $(db_name)
-bin_SCRIPTS = addr2name.awk contrib/rebuild-gcj-db contrib/aot-compile \
-       $(am__append_5)
+bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile \
+       $(am__append_7)
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
+LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
-          $(LDFLAGS) -o $@
+          $(LTLDFLAGS) -o $@
 
 GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@
 LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
-          $(LDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@
+          $(LTLDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@
+
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+       $(CXXFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@
 
 WARNINGS = -Wextra -Wall
 AM_CXXFLAGS = \
@@ -933,9 +972,11 @@ AM_GCJFLAGS = \
        --encoding=UTF-8 \
        -Wno-deprecated -fbootstrap-classes
 
-AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_7)
+AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_9)
 @SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes
 @SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = 
+@BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE@LIBGCJ_REDUCED_REFLECTION_FLAGS = 
+@BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE@LIBGCJ_REDUCED_REFLECTION_FLAGS = -freduced-reflection
 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
 JCFLAGS = -g
 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
@@ -958,9 +999,9 @@ libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
 @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_8) $(am__append_9) \
-       $(am__append_10) $(am__append_11) $(am__append_12) \
-       $(am__append_13) $(am__append_14) $(am__append_15)
+       $(nat_source_files) $(am__append_10) $(am__append_11) \
+       $(am__append_12) $(am__append_13) $(am__append_14) \
+       $(am__append_15) $(am__append_16) $(am__append_17)
 nat_files = $(nat_source_files:.cc=.lo)
 xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
@@ -984,7 +1025,7 @@ libgcj_la_LIBADD = \
 libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar java/lang/Object.lo \
        java/lang/Class.lo java/process-$(PLATFORM).lo \
        $(all_packages_source_files:.list=.lo) $(LIBLTDL) \
-       $(libgcj_la_LIBADD) $(am__append_16)
+       $(libgcj_la_LIBADD) $(am__append_18)
 libgcj_la_LINK = $(LIBLINK)
 EXTRA_libgcj_la_SOURCES = java/lang/Object.java
 libgcj_tools_la_SOURCES = classpath/tools/tools.zip
@@ -1223,7 +1264,7 @@ gnu/awt/xlib/XToolkit.java
 
 gnu_awt_xlib_header_files = $(patsubst %.java,%.h,$(gnu_awt_xlib_source_files))
 gnu_classpath_source_files = \
-gnu/classpath/Configuration.java \
+classpath/gnu/classpath/Configuration.java \
 classpath/gnu/classpath/NotImplementedException.java \
 classpath/gnu/classpath/Pair.java \
 classpath/gnu/classpath/Pointer.java \
@@ -1854,10 +1895,12 @@ classpath/gnu/java/io/PlatformHelper.java
 gnu_java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_io_source_files)))
 gnu_java_lang_source_files = \
 classpath/gnu/java/lang/ArrayHelper.java \
+classpath/gnu/java/lang/CPStringBuilder.java \
 classpath/gnu/java/lang/CharData.java \
 classpath/gnu/java/lang/ClassHelper.java \
 classpath/gnu/java/lang/InstrumentationImpl.java \
 gnu/java/lang/MainThread.java \
+gnu/java/lang/VMCPStringBuilder.java \
 gnu/java/lang/VMInstrumentationImpl.java
 
 gnu_java_lang_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_source_files)))
@@ -1899,9 +1942,9 @@ classpath/gnu/java/locale/LocaleHelper.java
 gnu_java_locale_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_locale_source_files)))
 gnu_java_math_source_files = \
 classpath/gnu/java/math/Fixed.java \
+classpath/gnu/java/math/GMP.java \
 classpath/gnu/java/math/MPN.java
 
-gnu_java_math_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_math_source_files)))
 gnu_java_net_source_files = \
 classpath/gnu/java/net/CRLFInputStream.java \
 classpath/gnu/java/net/CRLFOutputStream.java \
@@ -2226,6 +2269,7 @@ classpath/gnu/java/security/jce/prng/Sha256RandomSpi.java \
 classpath/gnu/java/security/jce/prng/Sha384RandomSpi.java \
 classpath/gnu/java/security/jce/prng/Sha512RandomSpi.java \
 classpath/gnu/java/security/jce/prng/TigerRandomSpi.java \
+gnu/java/security/jce/prng/VMSecureRandom.java \
 classpath/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java
 
 gnu_java_security_jce_prng_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_security_jce_prng_source_files)))
@@ -2404,7 +2448,6 @@ classpath/gnu/java/util/jar/JarUtils.java
 
 gnu_java_util_jar_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_jar_source_files)))
 gnu_java_util_prefs_source_files = \
-classpath/gnu/java/util/prefs/EventDispatcher.java \
 classpath/gnu/java/util/prefs/FileBasedFactory.java \
 classpath/gnu/java/util/prefs/FileBasedPreferences.java \
 classpath/gnu/java/util/prefs/GConfBasedFactory.java \
@@ -2452,6 +2495,12 @@ classpath/gnu/java/util/regex/RETokenWordBoundary.java \
 classpath/gnu/java/util/regex/UncheckedRE.java
 
 gnu_java_util_regex_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_util_regex_source_files)))
+gnu_javax_activation_viewers_source_files = \
+classpath/gnu/javax/activation/viewers/ImageViewer.java \
+classpath/gnu/javax/activation/viewers/TextEditor.java \
+classpath/gnu/javax/activation/viewers/TextViewer.java
+
+gnu_javax_activation_viewers_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_javax_activation_viewers_source_files)))
 gnu_javax_crypto_source_files = \
 classpath/gnu/javax/crypto/RSACipherImpl.java
 
@@ -4212,6 +4261,7 @@ classpath/java/io/Writer.java
 java_io_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_io_source_files)))
 java_lang_source_files = \
 classpath/java/lang/AbstractMethodError.java \
+java/lang/AbstractStringBuffer.java \
 classpath/java/lang/Appendable.java \
 classpath/java/lang/ArithmeticException.java \
 classpath/java/lang/ArrayIndexOutOfBoundsException.java \
@@ -4295,6 +4345,7 @@ java/lang/Thread.java \
 classpath/java/lang/ThreadDeath.java \
 classpath/java/lang/ThreadGroup.java \
 java/lang/ThreadLocal.java \
+classpath/java/lang/ThreadLocalMap.java \
 classpath/java/lang/Throwable.java \
 classpath/java/lang/TypeNotPresentException.java \
 classpath/java/lang/UnknownError.java \
@@ -4700,8 +4751,7 @@ classpath/java/security/Signer.java \
 classpath/java/security/UnrecoverableKeyException.java \
 classpath/java/security/UnresolvedPermission.java \
 java/security/VMAccessControlState.java \
-java/security/VMAccessController.java \
-java/security/VMSecureRandom.java
+java/security/VMAccessController.java
 
 java_security_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(java_security_source_files)))
 java_security_acl_source_files = \
@@ -4933,6 +4983,7 @@ classpath/external/jsr166/java/util/Queue.java \
 classpath/java/util/Random.java \
 classpath/java/util/RandomAccess.java \
 classpath/java/util/ResourceBundle.java \
+classpath/java/util/Scanner.java \
 classpath/java/util/ServiceConfigurationError.java \
 classpath/java/util/ServiceLoader.java \
 classpath/java/util/Set.java \
@@ -5136,6 +5187,29 @@ classpath/javax/accessibility/AccessibleTextSequence.java \
 classpath/javax/accessibility/AccessibleValue.java
 
 javax_accessibility_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_accessibility_source_files)))
+javax_activation_source_files = \
+classpath/javax/activation/ActivationDataFlavor.java \
+classpath/javax/activation/CommandInfo.java \
+classpath/javax/activation/CommandMap.java \
+classpath/javax/activation/CommandObject.java \
+classpath/javax/activation/DataContentHandler.java \
+classpath/javax/activation/DataContentHandlerFactory.java \
+classpath/javax/activation/DataHandler.java \
+classpath/javax/activation/DataHandlerDataSource.java \
+classpath/javax/activation/DataSource.java \
+classpath/javax/activation/DataSourceDataContentHandler.java \
+classpath/javax/activation/FileDataSource.java \
+classpath/javax/activation/FileTypeMap.java \
+classpath/javax/activation/MailcapCommandMap.java \
+classpath/javax/activation/MimeType.java \
+classpath/javax/activation/MimeTypeParameterList.java \
+classpath/javax/activation/MimeTypeParseException.java \
+classpath/javax/activation/MimetypesFileTypeMap.java \
+classpath/javax/activation/ObjectDataContentHandler.java \
+classpath/javax/activation/URLDataSource.java \
+classpath/javax/activation/UnsupportedDataTypeException.java
+
+javax_activation_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(javax_activation_source_files)))
 javax_activity_source_files = \
 classpath/javax/activity/ActivityCompletedException.java \
 classpath/javax/activity/ActivityRequiredException.java \
@@ -7346,7 +7420,6 @@ all_packages_source_files = \
   gnu/java/lang.list \
   gnu/java/lang/reflect.list \
   gnu/java/locale.list \
-  gnu/java/math.list \
   gnu/java/net.list \
   gnu/java/net/loader.list \
   gnu/java/net/local.list \
@@ -7390,6 +7463,7 @@ all_packages_source_files = \
   gnu/java/util/jar.list \
   gnu/java/util/prefs.list \
   gnu/java/util/regex.list \
+  gnu/javax/activation/viewers.list \
   gnu/javax/crypto.list \
   gnu/javax/crypto/assembly.list \
   gnu/javax/crypto/cipher.list \
@@ -7508,6 +7582,7 @@ all_packages_source_files = \
   java/util/spi.list \
   java/util/zip.list \
   javax/accessibility.list \
+  javax/activation.list \
   javax/activity.list \
   javax/crypto.list \
   javax/crypto/interfaces.list \
@@ -7598,7 +7673,6 @@ ordinary_header_files = \
   $(gnu_java_lang_management_header_files) \
   $(gnu_java_lang_reflect_header_files) \
   $(gnu_java_locale_header_files) \
-  $(gnu_java_math_header_files) \
   $(gnu_java_net_header_files) \
   $(gnu_java_net_loader_header_files) \
   $(gnu_java_net_local_header_files) \
@@ -7642,6 +7716,7 @@ ordinary_header_files = \
   $(gnu_java_util_jar_header_files) \
   $(gnu_java_util_prefs_header_files) \
   $(gnu_java_util_regex_header_files) \
+  $(gnu_javax_activation_viewers_header_files) \
   $(gnu_javax_crypto_header_files) \
   $(gnu_javax_crypto_assembly_header_files) \
   $(gnu_javax_crypto_cipher_header_files) \
@@ -7755,6 +7830,7 @@ ordinary_header_files = \
   $(java_util_spi_header_files) \
   $(java_util_zip_header_files) \
   $(javax_accessibility_header_files) \
+  $(javax_activation_header_files) \
   $(javax_activity_header_files) \
   $(javax_crypto_header_files) \
   $(javax_crypto_interfaces_header_files) \
@@ -7823,6 +7899,7 @@ bc_objects = \
   gnu-java-awt-peer-swing.lo \
   gnu-java-beans.lo \
   gnu-java-lang-management.lo \
+  gnu-java-math.lo \
   gnu-java-util-prefs-gconf.lo \
   gnu-javax-management.lo \
   gnu-javax-rmi.lo \
@@ -7867,7 +7944,9 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_aa_ER_SAAHO.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_aa_ET.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_af.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_af_NA.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_af_ZA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ak.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_am.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_am_ET.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ar.properties \
@@ -7890,11 +7969,14 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_bg_BG.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_bn.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_bn_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bo.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_bs.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_byn.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_byn_ER.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ca.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ca_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cch.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cop.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_cs.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_cs_CZ.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_cy.properties \
@@ -7912,6 +7994,7 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_dv_MV.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_dz.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_dz_BT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ee.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_el.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_el_CY.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_el_GR.properties \
@@ -7922,18 +8005,23 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_en_BW.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_BZ.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_CA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_Dsrt.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_GB.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_GU.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_HK.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_IE.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_JM.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_MH.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_MP.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_MT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_NA.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_NZ.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_PH.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_PK.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_SG.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_Shaw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_TT.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_UM.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_US.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties \
@@ -7971,6 +8059,7 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_fa_IR.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fi.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fi_FI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fil.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fo.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fo_FO.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fr.properties \
@@ -7978,8 +8067,10 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_fr_CA.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fr_CH.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_fr_LU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fur.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ga.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ga_IE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gaa.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_gez.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_gez_ER.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_gez_ET.properties \
@@ -7989,6 +8080,8 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_gu_IN.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_gv.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_gv_GB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ha.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ha_Arab.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_haw.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_haw_US.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_he.properties \
@@ -8001,8 +8094,11 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_hy.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_hy_AM.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_hy_AM_REVISED.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ia.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_id.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_id_ID.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ig.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ii.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_is.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_is_IS.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_it.properties \
@@ -8012,6 +8108,10 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_ja.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ja_JP.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ka.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kaj.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kam.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kcg.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kfo.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kk.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kk_KZ.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kl.properties \
@@ -8024,9 +8124,14 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_ko_KR.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kok.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kok_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kpe.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ku.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ku_Arab.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ku_Latn.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kw.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_kw_GB.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ky.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ln.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_lo.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_lo_LA.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_lt.properties \
@@ -8044,19 +8149,25 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_ms_MY.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_mt.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_mt_MT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_my.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nb.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nb_NO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ne.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nl.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nl_BE.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nl_NL.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nn.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_nn_NO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nso.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ny.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_om.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_om_ET.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_om_KE.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_or.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_or_IN.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_pa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pa_Arab.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_pa_IN.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_pl.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_pl_PL.properties \
@@ -8070,8 +8181,12 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_ru.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ru_RU.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ru_UA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_rw.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sa.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sa_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_se.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_se_FI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_si.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sid.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sid_ET.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sk.properties \
@@ -8090,6 +8205,11 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Latn.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sr_Cyrl.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sr_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_ME_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_RS_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ss.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ssy.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_st.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sv.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sv_FI.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_sv_SE.properties \
@@ -8102,6 +8222,7 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_ta_IN.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_te.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_te_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tg.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_th.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_th_TH.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ti.properties \
@@ -8109,20 +8230,30 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_ti_ET.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_tig.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_tig_ER.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_to.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_tr.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_tr_TR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_trv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ts.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_tt.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_tt_RU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ug.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_uk.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_uk_UA.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_ur.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ur_IN.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_uz.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_uz_AF_Arab.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_uz_Arab.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_uz_Latn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ve.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_vi.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_wal.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_wal_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_wo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_xh.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_yo.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_zh.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_zh_CN_Hans.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_zh_HK_Hant.properties \
@@ -8130,13 +8261,16 @@ property_files = \
   classpath/resource/gnu/java/locale/LocaleInformation_zh_MO_Hant.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_zh_SG_Hans.properties \
   classpath/resource/gnu/java/locale/LocaleInformation_zh_TW_Hant.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zu.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
   classpath/resource/gnu/javax/print/PrinterDialog.properties \
   classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
   classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
+  classpath/resource/java/text/metazones.properties \
   classpath/resource/java/util/iso4217.properties \
+  classpath/resource/java/util/weeks.properties \
   classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
   classpath/resource/javax/swing/text/html/default.css \
   classpath/resource/org/ietf/jgss/MessagesBundle.properties \
@@ -8176,7 +8310,8 @@ extra_headers = java/lang/Object.h java/lang/Class.h
 install_data_local_split = 50
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@gen_from_JIS_SOURCES = \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/gen-from-JIS.c \
-@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.c
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.c \
+@MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/make-trie.h
 
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@gen_from_JIS_DEPENDENCIES = \
 @MAINTAINER_MODE_TRUE@@NATIVE_TRUE@    gnu/gcj/convert/JIS0201.h \
@@ -8214,7 +8349,7 @@ gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
 gij_LINK = $(GCJLINK)
 gij_LDADD = -L$(here)/.libs libgij.la
 gij_DEPENDENCIES = libgij.la
-ecjx_SOURCES = 
+ecjx_SOURCES = ecjx.cc
 ECJX_BASE_FLAGS = -findirect-dispatch \
        --main=org.eclipse.jdt.internal.compiler.batch.GCCMain
 
@@ -8224,10 +8359,11 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
 @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
 @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
 @NATIVE_FALSE@ecjx_LDADD = 
-@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
+@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
+@NATIVE_TRUE@  $(am__append_21)
 @NATIVE_FALSE@ecjx_DEPENDENCIES = 
 @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
-@NATIVE_TRUE@  $(am__append_17)
+@NATIVE_TRUE@  $(am__append_20)
 gappletviewer_SOURCES = 
 gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
@@ -8319,6 +8455,14 @@ grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
 grmiregistry_LINK = $(GCJLINK)
 grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
 grmiregistry_DEPENDENCIES = libgcj-tools.la
+gjdoc_SOURCES = 
+gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main \
+       -Djava.class.path=$(ANTLR_JAR) \
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
+
+gjdoc_LINK = $(GCJLINK)
+gjdoc_LDADD = -L$(here)/.libs libgcj-tools.la
+gjdoc_DEPENDENCIES = libgcj-tools.la
 @INTERPRETER_FALSE@nat_jdwp_source_files = 
 @INTERPRETER_TRUE@nat_jdwp_source_files = \
 @INTERPRETER_TRUE@gnu/classpath/jdwp/natVMFrame.cc \
@@ -8371,6 +8515,7 @@ gnu/java/nio/natVMSelector.cc \
 gnu/java/nio/natNIOServerSocket.cc \
 gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
+gnu/java/security/jce/prng/natVMSecureRandom.cc \
 java/io/natFile.cc \
 java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
@@ -8384,8 +8529,7 @@ java/lang/natMath.cc \
 java/lang/natObject.cc \
 java/lang/natRuntime.cc        \
 java/lang/natString.cc \
-java/lang/natStringBuffer.cc \
-java/lang/natStringBuilder.cc \
+java/lang/natAbstractStringBuffer.cc \
 java/lang/natSystem.cc \
 java/lang/natThread.cc \
 java/lang/natThreadLocal.cc \
@@ -8436,7 +8580,7 @@ gnu/gcj/xlib/natXImage.cc \
 gnu/gcj/xlib/natXUnmapEvent.cc
 
 sourcesdir = $(jardir)
-headers_to_make = $(nat_headers) $(am__append_18)
+headers_to_make = $(nat_headers) $(am__append_22)
 
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
@@ -8464,6 +8608,7 @@ AM_MAKEFLAGS = \
        "SHELL=$(SHELL)" \
        "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
        "exec_prefix=$(exec_prefix)" \
+       "datadir=$(datadir)" \
        "infodir=$(infodir)" \
        "libdir=$(libdir)" \
        "mandir=$(mandir)" \
@@ -8864,6 +9009,15 @@ gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp):
 gnu/java/nio/channels/natFileChannelImpl.lo:  \
        gnu/java/nio/channels/$(am__dirstamp) \
        gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp)
+gnu/java/security/jce/prng/$(am__dirstamp):
+       @$(mkdir_p) gnu/java/security/jce/prng
+       @: > gnu/java/security/jce/prng/$(am__dirstamp)
+gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp):
+       @$(mkdir_p) gnu/java/security/jce/prng/$(DEPDIR)
+       @: > gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp)
+gnu/java/security/jce/prng/natVMSecureRandom.lo:  \
+       gnu/java/security/jce/prng/$(am__dirstamp) \
+       gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp)
 java/io/$(am__dirstamp):
        @$(mkdir_p) java/io
        @: > java/io/$(am__dirstamp)
@@ -8902,9 +9056,7 @@ java/lang/natRuntime.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natString.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natStringBuffer.lo: java/lang/$(am__dirstamp) \
-       java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natStringBuilder.lo: java/lang/$(am__dirstamp) \
+java/lang/natAbstractStringBuffer.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natSystem.lo: java/lang/$(am__dirstamp) \
        java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -9148,6 +9300,9 @@ gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES)
 gjavah$(EXEEXT): $(gjavah_OBJECTS) $(gjavah_DEPENDENCIES) 
        @rm -f gjavah$(EXEEXT)
        $(gjavah_LINK) $(gjavah_LDFLAGS) $(gjavah_OBJECTS) $(gjavah_LDADD) $(LIBS)
+gjdoc$(EXEEXT): $(gjdoc_OBJECTS) $(gjdoc_DEPENDENCIES) 
+       @rm -f gjdoc$(EXEEXT)
+       $(gjdoc_LINK) $(gjdoc_LDFLAGS) $(gjdoc_OBJECTS) $(gjdoc_LDADD) $(LIBS)
 gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) 
        @rm -f gkeytool$(EXEEXT)
        $(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS)
@@ -9328,6 +9483,8 @@ mostlyclean-compile:
        -rm -f gnu/java/nio/natVMPipe.lo
        -rm -f gnu/java/nio/natVMSelector.$(OBJEXT)
        -rm -f gnu/java/nio/natVMSelector.lo
+       -rm -f gnu/java/security/jce/prng/natVMSecureRandom.$(OBJEXT)
+       -rm -f gnu/java/security/jce/prng/natVMSecureRandom.lo
        -rm -f java/io/natFile.$(OBJEXT)
        -rm -f java/io/natFile.lo
        -rm -f java/io/natVMObjectInputStream.$(OBJEXT)
@@ -9336,6 +9493,8 @@ mostlyclean-compile:
        -rm -f java/io/natVMObjectStreamClass.lo
        -rm -f java/lang/Object.$(OBJEXT)
        -rm -f java/lang/Object.lo
+       -rm -f java/lang/natAbstractStringBuffer.$(OBJEXT)
+       -rm -f java/lang/natAbstractStringBuffer.lo
        -rm -f java/lang/natCharacter.$(OBJEXT)
        -rm -f java/lang/natCharacter.lo
        -rm -f java/lang/natClass.$(OBJEXT)
@@ -9352,10 +9511,6 @@ mostlyclean-compile:
        -rm -f java/lang/natRuntime.lo
        -rm -f java/lang/natString.$(OBJEXT)
        -rm -f java/lang/natString.lo
-       -rm -f java/lang/natStringBuffer.$(OBJEXT)
-       -rm -f java/lang/natStringBuffer.lo
-       -rm -f java/lang/natStringBuilder.$(OBJEXT)
-       -rm -f java/lang/natStringBuilder.lo
        -rm -f java/lang/natSystem.$(OBJEXT)
        -rm -f java/lang/natSystem.lo
        -rm -f java/lang/natThread.$(OBJEXT)
@@ -9419,6 +9574,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boehm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/darwin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/defineclass.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecjx.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exception.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gij.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interpret.Plo@am__quote@
@@ -9503,10 +9659,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMPipe.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMSelector.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/channels/$(DEPDIR)/natFileChannelImpl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/security/jce/prng/$(DEPDIR)/natVMSecureRandom.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natFile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natAbstractStringBuffer.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natCharacter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClassLoader.Plo@am__quote@
@@ -9515,8 +9673,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natRuntime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natString.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natStringBuilder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natSystem.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThreadLocal.Plo@am__quote@
@@ -9810,6 +9966,7 @@ clean-libtool:
        -rm -rf gnu/java/net/protocol/core/.libs gnu/java/net/protocol/core/_libs
        -rm -rf gnu/java/nio/.libs gnu/java/nio/_libs
        -rm -rf gnu/java/nio/channels/.libs gnu/java/nio/channels/_libs
+       -rm -rf gnu/java/security/jce/prng/.libs gnu/java/security/jce/prng/_libs
        -rm -rf java/io/.libs java/io/_libs
        -rm -rf java/lang/.libs java/lang/_libs
        -rm -rf java/lang/ref/.libs java/lang/ref/_libs
@@ -10218,6 +10375,8 @@ distclean-generic:
        -rm -f gnu/java/nio/$(am__dirstamp)
        -rm -f gnu/java/nio/channels/$(DEPDIR)/$(am__dirstamp)
        -rm -f gnu/java/nio/channels/$(am__dirstamp)
+       -rm -f gnu/java/security/jce/prng/$(DEPDIR)/$(am__dirstamp)
+       -rm -f gnu/java/security/jce/prng/$(am__dirstamp)
        -rm -f java/io/$(DEPDIR)/$(am__dirstamp)
        -rm -f java/io/$(am__dirstamp)
        -rm -f java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -10259,7 +10418,7 @@ clean-am: clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \
 
 distclean: distclean-multi distclean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
-       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/security/jce/prng/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
        -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
        distclean-libtool distclean-local distclean-tags
@@ -10292,7 +10451,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-multi maintainer-clean-recursive
        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
        -rm -rf $(top_srcdir)/autom4te.cache
-       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
+       -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/classpath/jdwp/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/jvmti/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/lang/management/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) gnu/java/security/jce/prng/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/security/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/concurrent/atomic/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) sun/misc/$(DEPDIR)
        -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -10391,8 +10550,13 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND
        $(lib_gnu_awt_xlib_la_LINK) -objectlist lib_gnu_awt_xlib.objectlist \
        -rpath $(toolexeclibdir) $(lib_gnu_awt_xlib_la_LDFLAGS) $(LIBS)
 
+# Concurrent things use reflection internally.
+java/util/concurrent.lo \
+java/util/concurrent/atomic.lo \
+java/util/concurrent/locks.lo: LIBGCJ_REDUCED_REFLECTION_FLAGS =
+
 %.lo: %.list
-       $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$<
+       $(LTGCJCOMPILE) $(LIBGCJ_REDUCED_REFLECTION_FLAGS) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$<
 
 java/lang/Object.lo: classpath/lib/java/lang/Object.class
        $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(srcdir)/$(basename $@).java $<
@@ -10674,11 +10838,10 @@ gnu/java/locale.list: $(gnu_java_locale_source_files)
 
 -include gnu/java/locale.deps
 
-gnu/java/math.list: $(gnu_java_math_source_files)
-       @$(mkinstalldirs) $(dir $@)
-       echo $(srcdir)/classpath/lib/gnu/java/math/*.class > gnu/java/math.list
-
--include gnu/java/math.deps
+gnu-java-math.lo: $(gnu_java_math_source_files)
+       @find $(srcdir)/classpath/lib/gnu/java/math -name '*.class' > gnu-java-math.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-math.lo @gnu-java-math.list
+       @rm -f gnu-java-math.list
 
 gnu/java/net.list: $(gnu_java_net_source_files)
        @$(mkinstalldirs) $(dir $@)
@@ -10943,6 +11106,12 @@ gnu/java/util/regex.list: $(gnu_java_util_regex_source_files)
 
 -include gnu/java/util/regex.deps
 
+gnu/javax/activation/viewers.list: $(gnu_javax_activation_viewers_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/gnu/javax/activation/viewers/*.class > gnu/javax/activation/viewers.list
+
+-include gnu/javax/activation/viewers.deps
+
 gnu/javax/crypto.list: $(gnu_javax_crypto_source_files)
        @$(mkinstalldirs) $(dir $@)
        echo $(srcdir)/classpath/lib/gnu/javax/crypto/*.class > gnu/javax/crypto.list
@@ -11716,6 +11885,12 @@ javax/accessibility.list: $(javax_accessibility_source_files)
 
 -include javax/accessibility.deps
 
+javax/activation.list: $(javax_activation_source_files)
+       @$(mkinstalldirs) $(dir $@)
+       echo $(srcdir)/classpath/lib/javax/activation/*.class > javax/activation.list
+
+-include javax/activation.deps
+
 javax/activity.list: $(javax_activity_source_files)
        @$(mkinstalldirs) $(dir $@)
        echo $(srcdir)/classpath/lib/javax/activity/*.class > javax/activity.list
@@ -12258,7 +12433,6 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/javah; \
-@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -12294,11 +12468,15 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@        version=$(JAVA_VERSION).$(BUILD_VERSION); \
 @CREATE_JAVA_HOME_TRUE@        working_dir=`pwd`; \
 @CREATE_JAVA_HOME_TRUE@        cd $(DESTDIR)$(JVM_JAR_DIR); \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(JVM_JAR_DIR)); \
 @CREATE_JAVA_HOME_TRUE@          for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
 @CREATE_JAVA_HOME_TRUE@            jndi-ldap jndi-rmi jsse sasl; \
 @CREATE_JAVA_HOME_TRUE@          do \
-@CREATE_JAVA_HOME_TRUE@            ln -s $$RELATIVE/$$jarname.jar $$jarname-$$version.jar; \
+@CREATE_JAVA_HOME_TRUE@            ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \
 @CREATE_JAVA_HOME_TRUE@          done; \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $(DESTDIR)$(jardir) \
+@CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(JVM_JAR_DIR)); \
 @CREATE_JAVA_HOME_TRUE@          for jar in *-$$version.jar; \
 @CREATE_JAVA_HOME_TRUE@          do \
 @CREATE_JAVA_HOME_TRUE@            ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \
@@ -12306,7 +12484,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@          done; \
 @CREATE_JAVA_HOME_TRUE@        cd $$working_dir; \
 @CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
-@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/security); \
 @CREATE_JAVA_HOME_TRUE@        cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 @CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/classpath.security java.security; \
@@ -12315,14 +12493,7 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \
 @CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \
 @CREATE_JAVA_HOME_TRUE@        $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \
-@CREATE_JAVA_HOME_TRUE@        cd $(DESTDIR)$(JRE_LIB_DIR); \
-@CREATE_JAVA_HOME_TRUE@          for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
-@CREATE_JAVA_HOME_TRUE@            jndi-ldap jndi-rmi jsse sasl; \
-@CREATE_JAVA_HOME_TRUE@          do \
-@CREATE_JAVA_HOME_TRUE@            ln -s rt.jar $$jarname.jar; \
-@CREATE_JAVA_HOME_TRUE@          done; \
-@CREATE_JAVA_HOME_TRUE@        cd $$working_dir; \
-@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)); \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \
@@ -12338,14 +12509,14 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libjvm.so \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so;     \
-@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_LIB_DIR)); \
 @CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
 @CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
 @CREATE_JAVA_HOME_TRUE@        for headername in jawt jni; do \
 @CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
 @CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
-@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)); \
 @CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/$$headername.h \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
@@ -12353,15 +12524,13 @@ install-data-local:
 @CREATE_JAVA_HOME_TRUE@        for headername in jawt_md jni_md; do \
 @CREATE_JAVA_HOME_TRUE@          DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
 @CREATE_JAVA_HOME_TRUE@            -print-file-name=include/$$headername.h)); \
-@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $(DESTDIR)$$DIRECTORY \
+@CREATE_JAVA_HOME_TRUE@          RELATIVE=$$(relative $$DIRECTORY \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \
 @CREATE_JAVA_HOME_TRUE@          ln -sf $$RELATIVE/$$headername.h \
 @CREATE_JAVA_HOME_TRUE@            $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 @CREATE_JAVA_HOME_TRUE@        done; \
-@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datarootdir)/java \
-@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
-@CREATE_JAVA_HOME_TRUE@        ln -sf $$RELATIVE/src-$(gcc_version).zip \
-@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+@CREATE_JAVA_HOME_TRUE@        RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
+@CREATE_JAVA_HOME_TRUE@          $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
 
 maintainer-check: libgcj.la
        $(NM) .libs/libgcj.a | grep ' T ' \
About OSDN
Find Software
Develop Software
Help