vms_data.ads: Fix typo in constant.
[gcc.git] / libjava / Makefile.in
index cb8b02476ea7ce758525125a6726ef7baaeda511..b2fe1290a0b6cd27fa2a2a1d1a86eed73f49b761 100644 (file)
@@ -94,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/libltdl/acinclude.m4 \
        $(top_srcdir)/../config/lib-prefix.m4 \
        $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
+       $(top_srcdir)/../config/proginstall.m4 \
        $(top_srcdir)/../config/tls.m4 \
        $(top_srcdir)/../config/unwind_ipinfo.m4 \
        $(top_srcdir)/../libtool.m4 $(top_srcdir)/../ltgcc.m4 \
@@ -289,8 +290,12 @@ am__DEPENDENCIES_3 = gnu-CORBA.lo gnu-java-awt-dnd-peer-gtk.lo \
        gnu-xml-dom.lo gnu-xml-libxmlj.lo gnu-xml-pipeline.lo \
        gnu-xml-stream.lo gnu-xml-transform.lo gnu-xml-util.lo \
        gnu-xml-validation.lo gnu-xml-xpath.lo java-lang-management.lo \
-       javax-imageio.lo javax-rmi.lo javax-xml.lo org-omg.lo \
-       org-relaxng.lo org-w3c.lo org-xml.lo
+       javax-imageio.lo javax-rmi.lo javax-xml.lo org-omg-CORBA.lo \
+       org-omg-CORBA_2_3.lo org-omg-CosNaming.lo org-omg-Dynamic.lo \
+       org-omg-DynamicAny.lo org-omg-IOP.lo org-omg-Messaging.lo \
+       org-omg-PortableInterceptor.lo org-omg-PortableServer.lo \
+       org-omg-SendingContext.lo org-omg-stub.lo org-relaxng.lo \
+       org-w3c.lo org-xml.lo
 am__DEPENDENCIES_4 = $(patsubst classpath/resource/%,%,$(addsuffix \
        .lo,$(property_files)))
 am__DEPENDENCIES_5 =
@@ -659,6 +664,7 @@ LIBICONV = @LIBICONV@
 LIBLTDL = @LIBLTDL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSTDCXXSPEC = @LIBSTDCXXSPEC@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
@@ -688,6 +694,8 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUPPRESS_LIBGCJ_BC_FALSE = @SUPPRESS_LIBGCJ_BC_FALSE@
+SUPPRESS_LIBGCJ_BC_TRUE = @SUPPRESS_LIBGCJ_BC_TRUE@
 SYSDEP_SOURCES = @SYSDEP_SOURCES@
 SYSTEMSPEC = @SYSTEMSPEC@
 SYS_ZLIBS = @SYS_ZLIBS@
@@ -766,6 +774,8 @@ build_vendor = @build_vendor@
 datadir = @datadir@
 dbexecdir = @dbexecdir@
 exec_prefix = @exec_prefix@
+extra_gij_ldflags = @extra_gij_ldflags@
+extra_ldflags = @extra_ldflags@
 extra_ldflags_libjava = @extra_ldflags_libjava@ $(am__append_5)
 gxx_include_dir = @gxx_include_dir@
 here = @here@
@@ -815,13 +825,21 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1)
 
 # write_entries_to_file - writes each entry in a list
-# to the specified file. Each entry is written individually
-# to accomodate systems with severe command-line-length
-# limitations.
+# to the specified file.  Entries are written in chunks of
+# $(write_entries_to_file_split) to accomodate systems with
+# severe command-line-length limitations.
 # Parameters:
 # $(1): variable containing entries to iterate over
 # $(2): output file
-write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2)))
+write_entries_to_file_split = 50
+write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \
+       $(foreach range, \
+         $(shell i=1; while test $$i -le $(words $(1)); do \
+            echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \
+         $(shell echo $(wordlist $(range), \
+                         $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \
+            | tr ' ' '\n' >> $(2)))
+
 
 # This is required by TL_AC_GXX_INCLUDE_DIR.
 libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
@@ -848,7 +866,7 @@ GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
 
 GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@
 LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
-          $(LDFLAGS) $(extra_ldflags_libjava) -o $@
+          $(LDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@
 
 WARNINGS = -Wextra -Wall
 AM_CXXFLAGS = \
@@ -880,6 +898,8 @@ AM_GCJFLAGS = \
        -Wno-deprecated -fbootstrap-classes
 
 AM_CFLAGS = @LIBGCJ_CFLAGS@ $(am__append_6)
+@SUPPRESS_LIBGCJ_BC_FALSE@LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes
+@SUPPRESS_LIBGCJ_BC_TRUE@LIBGCJ_BC_FLAGS = 
 PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long
 JCFLAGS = -g
 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
@@ -910,7 +930,7 @@ xlib_nat_files = $(xlib_nat_source_files:.cc=.lo)
 
 # Include THREADLIBS here to ensure that the correct version of
 # certain linuxthread functions get linked:
-libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \
+libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
        $(LIBLTDL) $(SYS_ZLIBS) \
        -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
        $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)
@@ -1828,147 +1848,8 @@ classpath/gnu/java/lang/reflect/TypeSignature.java
 
 gnu_java_lang_reflect_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(gnu_java_lang_reflect_source_files)))
 gnu_java_locale_source_files = \
-gnu/java/locale/Calendar.java \
-gnu/java/locale/Calendar_de.java \
-gnu/java/locale/Calendar_en.java \
-gnu/java/locale/Calendar_nl.java \
 classpath/gnu/java/locale/LocaleData.java \
-classpath/gnu/java/locale/LocaleHelper.java \
-gnu/java/locale/LocaleInformation.java \
-gnu/java/locale/LocaleInformation_af_ZA.java \
-gnu/java/locale/LocaleInformation_ar_AE.java \
-gnu/java/locale/LocaleInformation_ar_BH.java \
-gnu/java/locale/LocaleInformation_ar_DZ.java \
-gnu/java/locale/LocaleInformation_ar_EG.java \
-gnu/java/locale/LocaleInformation_ar_IN.java \
-gnu/java/locale/LocaleInformation_ar_IQ.java \
-gnu/java/locale/LocaleInformation_ar_JO.java \
-gnu/java/locale/LocaleInformation_ar_KW.java \
-gnu/java/locale/LocaleInformation_ar_LB.java \
-gnu/java/locale/LocaleInformation_ar_LY.java \
-gnu/java/locale/LocaleInformation_ar_MA.java \
-gnu/java/locale/LocaleInformation_ar_OM.java \
-gnu/java/locale/LocaleInformation_ar_QA.java \
-gnu/java/locale/LocaleInformation_ar_SD.java \
-gnu/java/locale/LocaleInformation_ar_SY.java \
-gnu/java/locale/LocaleInformation_ar_TN.java \
-gnu/java/locale/LocaleInformation_ar_YE.java \
-gnu/java/locale/LocaleInformation_be_BY.java \
-gnu/java/locale/LocaleInformation_bn_IN.java \
-gnu/java/locale/LocaleInformation_br_FR.java \
-gnu/java/locale/LocaleInformation_bs_BA.java \
-gnu/java/locale/LocaleInformation_ca_ES.java \
-gnu/java/locale/LocaleInformation_cs_CZ.java \
-gnu/java/locale/LocaleInformation_cy_GB.java \
-gnu/java/locale/LocaleInformation_da_DK.java \
-gnu/java/locale/LocaleInformation_de.java \
-gnu/java/locale/LocaleInformation_de_AT.java \
-gnu/java/locale/LocaleInformation_de_BE.java \
-gnu/java/locale/LocaleInformation_de_CH.java \
-gnu/java/locale/LocaleInformation_de_DE.java \
-gnu/java/locale/LocaleInformation_de_LU.java \
-gnu/java/locale/LocaleInformation_el_GR.java \
-gnu/java/locale/LocaleInformation_en.java \
-gnu/java/locale/LocaleInformation_en_AU.java \
-gnu/java/locale/LocaleInformation_en_BW.java \
-gnu/java/locale/LocaleInformation_en_CA.java \
-gnu/java/locale/LocaleInformation_en_DK.java \
-gnu/java/locale/LocaleInformation_en_GB.java \
-gnu/java/locale/LocaleInformation_en_HK.java \
-gnu/java/locale/LocaleInformation_en_IE.java \
-gnu/java/locale/LocaleInformation_en_IN.java \
-gnu/java/locale/LocaleInformation_en_NZ.java \
-gnu/java/locale/LocaleInformation_en_PH.java \
-gnu/java/locale/LocaleInformation_en_SG.java \
-gnu/java/locale/LocaleInformation_en_US.java \
-gnu/java/locale/LocaleInformation_en_ZA.java \
-gnu/java/locale/LocaleInformation_en_ZW.java \
-gnu/java/locale/LocaleInformation_es_AR.java \
-gnu/java/locale/LocaleInformation_es_BO.java \
-gnu/java/locale/LocaleInformation_es_CL.java \
-gnu/java/locale/LocaleInformation_es_CO.java \
-gnu/java/locale/LocaleInformation_es_CR.java \
-gnu/java/locale/LocaleInformation_es_DO.java \
-gnu/java/locale/LocaleInformation_es_EC.java \
-gnu/java/locale/LocaleInformation_es_ES.java \
-gnu/java/locale/LocaleInformation_es_GT.java \
-gnu/java/locale/LocaleInformation_es_HN.java \
-gnu/java/locale/LocaleInformation_es_MX.java \
-gnu/java/locale/LocaleInformation_es_NI.java \
-gnu/java/locale/LocaleInformation_es_PA.java \
-gnu/java/locale/LocaleInformation_es_PE.java \
-gnu/java/locale/LocaleInformation_es_PR.java \
-gnu/java/locale/LocaleInformation_es_PY.java \
-gnu/java/locale/LocaleInformation_es_SV.java \
-gnu/java/locale/LocaleInformation_es_US.java \
-gnu/java/locale/LocaleInformation_es_UY.java \
-gnu/java/locale/LocaleInformation_es_VE.java \
-gnu/java/locale/LocaleInformation_et_EE.java \
-gnu/java/locale/LocaleInformation_eu_ES.java \
-gnu/java/locale/LocaleInformation_fa_IR.java \
-gnu/java/locale/LocaleInformation_fi_FI.java \
-gnu/java/locale/LocaleInformation_fo_FO.java \
-gnu/java/locale/LocaleInformation_fr_BE.java \
-gnu/java/locale/LocaleInformation_fr_CA.java \
-gnu/java/locale/LocaleInformation_fr_CH.java \
-gnu/java/locale/LocaleInformation_fr_FR.java \
-gnu/java/locale/LocaleInformation_fr_LU.java \
-gnu/java/locale/LocaleInformation_ga_IE.java \
-gnu/java/locale/LocaleInformation_gd_GB.java \
-gnu/java/locale/LocaleInformation_gl_ES.java \
-gnu/java/locale/LocaleInformation_gv_GB.java \
-gnu/java/locale/LocaleInformation_he_IL.java \
-gnu/java/locale/LocaleInformation_hi_IN.java \
-gnu/java/locale/LocaleInformation_hr_HR.java \
-gnu/java/locale/LocaleInformation_hu_HU.java \
-gnu/java/locale/LocaleInformation_id_ID.java \
-gnu/java/locale/LocaleInformation_it_CH.java \
-gnu/java/locale/LocaleInformation_it_IT.java \
-gnu/java/locale/LocaleInformation_iw_IL.java \
-gnu/java/locale/LocaleInformation_ja_JP.java \
-gnu/java/locale/LocaleInformation_ka_GE.java \
-gnu/java/locale/LocaleInformation_kl_GL.java \
-gnu/java/locale/LocaleInformation_ko_KR.java \
-gnu/java/locale/LocaleInformation_kw_GB.java \
-gnu/java/locale/LocaleInformation_lt_LT.java \
-gnu/java/locale/LocaleInformation_lv_LV.java \
-gnu/java/locale/LocaleInformation_mi_NZ.java \
-gnu/java/locale/LocaleInformation_mk_MK.java \
-gnu/java/locale/LocaleInformation_mr_IN.java \
-gnu/java/locale/LocaleInformation_mt_MT.java \
-gnu/java/locale/LocaleInformation_nl.java \
-gnu/java/locale/LocaleInformation_nl_BE.java \
-gnu/java/locale/LocaleInformation_nl_NL.java \
-gnu/java/locale/LocaleInformation_nn_NO.java \
-gnu/java/locale/LocaleInformation_no_NO.java \
-gnu/java/locale/LocaleInformation_oc_FR.java \
-gnu/java/locale/LocaleInformation_pl_PL.java \
-gnu/java/locale/LocaleInformation_pt_BR.java \
-gnu/java/locale/LocaleInformation_pt_PT.java \
-gnu/java/locale/LocaleInformation_ro_RO.java \
-gnu/java/locale/LocaleInformation_ru_RU.java \
-gnu/java/locale/LocaleInformation_ru_UA.java \
-gnu/java/locale/LocaleInformation_se_NO.java \
-gnu/java/locale/LocaleInformation_sk_SK.java \
-gnu/java/locale/LocaleInformation_sl_SI.java \
-gnu/java/locale/LocaleInformation_sq_AL.java \
-gnu/java/locale/LocaleInformation_sr_YU.java \
-gnu/java/locale/LocaleInformation_sv_FI.java \
-gnu/java/locale/LocaleInformation_sv_SE.java \
-gnu/java/locale/LocaleInformation_ta_IN.java \
-gnu/java/locale/LocaleInformation_te_IN.java \
-gnu/java/locale/LocaleInformation_tg_TJ.java \
-gnu/java/locale/LocaleInformation_tl_PH.java \
-gnu/java/locale/LocaleInformation_tr_TR.java \
-gnu/java/locale/LocaleInformation_uk_UA.java \
-gnu/java/locale/LocaleInformation_ur_PK.java \
-gnu/java/locale/LocaleInformation_uz_UZ.java \
-gnu/java/locale/LocaleInformation_vi_VN.java \
-gnu/java/locale/LocaleInformation_yi_US.java \
-gnu/java/locale/LocaleInformation_zh_CN.java \
-gnu/java/locale/LocaleInformation_zh_HK.java \
-gnu/java/locale/LocaleInformation_zh_SG.java \
-gnu/java/locale/LocaleInformation_zh_TW.java
+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 = \
@@ -4909,9 +4790,9 @@ classpath/java/text/CollationElementIterator.java \
 classpath/java/text/CollationKey.java \
 java/text/Collator.java \
 classpath/java/text/DateFormat.java \
-java/text/DateFormatSymbols.java \
+classpath/java/text/DateFormatSymbols.java \
 classpath/java/text/DecimalFormat.java \
-java/text/DecimalFormatSymbols.java \
+classpath/java/text/DecimalFormatSymbols.java \
 classpath/java/text/FieldPosition.java \
 classpath/java/text/Format.java \
 classpath/java/text/MessageFormat.java \
@@ -4943,12 +4824,12 @@ classpath/external/jsr166/java/util/ArrayDeque.java \
 classpath/java/util/ArrayList.java \
 classpath/java/util/Arrays.java \
 classpath/java/util/BitSet.java \
-java/util/Calendar.java \
+classpath/java/util/Calendar.java \
 classpath/java/util/Collection.java \
 classpath/java/util/Collections.java \
 classpath/java/util/Comparator.java \
 classpath/java/util/ConcurrentModificationException.java \
-java/util/Currency.java \
+classpath/java/util/Currency.java \
 classpath/java/util/Date.java \
 classpath/external/jsr166/java/util/Deque.java \
 classpath/java/util/Dictionary.java \
@@ -6569,7 +6450,7 @@ classpath/org/ietf/jgss/MessageProp.java \
 classpath/org/ietf/jgss/Oid.java
 
 org_ietf_jgss_header_files = $(patsubst classpath/%,%,$(patsubst %.java,%.h,$(org_ietf_jgss_source_files)))
-org_omg_source_files = \
+org_omg_CORBA_source_files = \
 classpath/org/omg/CORBA/ACTIVITY_COMPLETED.java \
 classpath/org/omg/CORBA/ACTIVITY_REQUIRED.java \
 classpath/org/omg/CORBA/ARG_IN.java \
@@ -6787,12 +6668,16 @@ classpath/org/omg/CORBA/portable/Streamable.java \
 classpath/org/omg/CORBA/portable/StreamableValue.java \
 classpath/org/omg/CORBA/portable/UnknownException.java \
 classpath/org/omg/CORBA/portable/ValueBase.java \
-classpath/org/omg/CORBA/portable/ValueFactory.java \
+classpath/org/omg/CORBA/portable/ValueFactory.java
+
+org_omg_CORBA_2_3_source_files = \
 classpath/org/omg/CORBA_2_3/ORB.java \
 classpath/org/omg/CORBA_2_3/portable/Delegate.java \
 classpath/org/omg/CORBA_2_3/portable/InputStream.java \
 classpath/org/omg/CORBA_2_3/portable/ObjectImpl.java \
-classpath/org/omg/CORBA_2_3/portable/OutputStream.java \
+classpath/org/omg/CORBA_2_3/portable/OutputStream.java
+
+org_omg_CosNaming_source_files = \
 classpath/org/omg/CosNaming/Binding.java \
 classpath/org/omg/CosNaming/BindingHelper.java \
 classpath/org/omg/CosNaming/BindingHolder.java \
@@ -6851,8 +6736,12 @@ classpath/org/omg/CosNaming/_BindingIteratorStub.java \
 classpath/org/omg/CosNaming/_NamingContextExtImplBase.java \
 classpath/org/omg/CosNaming/_NamingContextExtStub.java \
 classpath/org/omg/CosNaming/_NamingContextImplBase.java \
-classpath/org/omg/CosNaming/_NamingContextStub.java \
-classpath/org/omg/Dynamic/Parameter.java \
+classpath/org/omg/CosNaming/_NamingContextStub.java
+
+org_omg_Dynamic_source_files = \
+classpath/org/omg/Dynamic/Parameter.java
+
+org_omg_DynamicAny_source_files = \
 classpath/org/omg/DynamicAny/AnySeqHelper.java \
 classpath/org/omg/DynamicAny/DynAny.java \
 classpath/org/omg/DynamicAny/DynAnyFactory.java \
@@ -6907,7 +6796,9 @@ classpath/org/omg/DynamicAny/_DynFixedStub.java \
 classpath/org/omg/DynamicAny/_DynSequenceStub.java \
 classpath/org/omg/DynamicAny/_DynStructStub.java \
 classpath/org/omg/DynamicAny/_DynUnionStub.java \
-classpath/org/omg/DynamicAny/_DynValueStub.java \
+classpath/org/omg/DynamicAny/_DynValueStub.java
+
+org_omg_IOP_source_files = \
 classpath/org/omg/IOP/CodeSets.java \
 classpath/org/omg/IOP/Codec.java \
 classpath/org/omg/IOP/CodecFactory.java \
@@ -6953,9 +6844,13 @@ classpath/org/omg/IOP/TaggedComponentHolder.java \
 classpath/org/omg/IOP/TaggedProfile.java \
 classpath/org/omg/IOP/TaggedProfileHelper.java \
 classpath/org/omg/IOP/TaggedProfileHolder.java \
-classpath/org/omg/IOP/TransactionService.java \
+classpath/org/omg/IOP/TransactionService.java
+
+org_omg_Messaging_source_files = \
 classpath/org/omg/Messaging/SYNC_WITH_TRANSPORT.java \
-classpath/org/omg/Messaging/SyncScopeHelper.java \
+classpath/org/omg/Messaging/SyncScopeHelper.java
+
+org_omg_PortableInterceptor_source_files = \
 classpath/org/omg/PortableInterceptor/ACTIVE.java \
 classpath/org/omg/PortableInterceptor/AdapterManagerIdHelper.java \
 classpath/org/omg/PortableInterceptor/AdapterNameHelper.java \
@@ -7018,7 +6913,9 @@ classpath/org/omg/PortableInterceptor/ServerRequestInterceptor.java \
 classpath/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \
 classpath/org/omg/PortableInterceptor/TRANSPORT_RETRY.java \
 classpath/org/omg/PortableInterceptor/USER_EXCEPTION.java \
-classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java \
+classpath/org/omg/PortableInterceptor/_IORInterceptor_3_0Stub.java
+
+org_omg_PortableServer_source_files = \
 classpath/org/omg/PortableServer/AdapterActivator.java \
 classpath/org/omg/PortableServer/AdapterActivatorOperations.java \
 classpath/org/omg/PortableServer/Current.java \
@@ -7099,9 +6996,13 @@ classpath/org/omg/PortableServer/ThreadPolicyOperations.java \
 classpath/org/omg/PortableServer/ThreadPolicyValue.java \
 classpath/org/omg/PortableServer/_ServantActivatorStub.java \
 classpath/org/omg/PortableServer/_ServantLocatorStub.java \
-classpath/org/omg/PortableServer/portable/Delegate.java \
+classpath/org/omg/PortableServer/portable/Delegate.java
+
+org_omg_SendingContext_source_files = \
 classpath/org/omg/SendingContext/RunTime.java \
-classpath/org/omg/SendingContext/RunTimeOperations.java \
+classpath/org/omg/SendingContext/RunTimeOperations.java
+
+org_omg_stub_source_files = \
 classpath/org/omg/stub/java/rmi/_Remote_Stub.java
 
 org_relaxng_source_files = \
@@ -7867,7 +7768,17 @@ bc_objects = \
   javax-imageio.lo \
   javax-rmi.lo \
   javax-xml.lo \
-  org-omg.lo \
+  org-omg-CORBA.lo \
+  org-omg-CORBA_2_3.lo \
+  org-omg-CosNaming.lo \
+  org-omg-Dynamic.lo \
+  org-omg-DynamicAny.lo \
+  org-omg-IOP.lo \
+  org-omg-Messaging.lo \
+  org-omg-PortableInterceptor.lo \
+  org-omg-PortableServer.lo \
+  org-omg-SendingContext.lo \
+  org-omg-stub.lo \
   org-relaxng.lo \
   org-w3c.lo \
   org-xml.lo
@@ -7890,6 +7801,276 @@ property_files = \
   classpath/resource/gnu/classpath/tools/tnameserv/messages.properties \
   classpath/resource/gnu/java/awt/peer/gtk/font.properties \
   classpath/resource/gnu/java/awt/peer/x/fonts.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa_DJ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_aa_ER.properties \
+  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_ZA.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 \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_DZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_JO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_LB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_MA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_QA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_SA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_SY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_TN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ar_YE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_as.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_as_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_az.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_az_Cyrl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_be.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_be_BY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_bg.properties \
+  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_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_cs.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cs_CZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cy.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_cy_GB.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_da.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_da_DK.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_AT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_BE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_CH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_DE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_LI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_de_LU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_dv.properties \
+  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_el.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_el_CY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_el_GR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_AS.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_AU.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_BE.properties \
+  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_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_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_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_UM.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_US.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_US_POSIX.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_VI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_ZA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_en_ZW.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_eo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_AR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_BO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_CL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_CO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_CR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_DO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_EC.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_GT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_HN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_MX.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_NI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_PY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_SV.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_US.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_UY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_es_VE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_et.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_et_EE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_eu.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_eu_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fa_AF.properties \
+  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_fo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fo_FO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_fr_BE.properties \
+  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_ga.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ga_IE.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 \
+  classpath/resource/gnu/java/locale/LocaleInformation_gl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gl_ES.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_gu.properties \
+  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_haw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_haw_US.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_he.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_he_IL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hi.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hi_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hu.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_hu_HU.properties \
+  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_id.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_id_ID.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 \
+  classpath/resource/gnu/java/locale/LocaleInformation_it_CH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_it_IT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_iu.properties \
+  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_kk.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kk_KZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kl_GL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_km.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_km_KH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_kn_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ko.properties \
+  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_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_lo.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lo_LA.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lt_LT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_lv_LV.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mk.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ml.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ml_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mn.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_mr_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ms.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ms_BN.properties \
+  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_nb.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_nb_NO.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_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_IN.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pl_PL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ps.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ps_AF.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pt_BR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_pt_PT.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ro.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ro_RO.properties \
+  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_sa.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sa_IN.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 \
+  classpath/resource/gnu/java/locale/LocaleInformation_sk_SK.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sl.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sl_SI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_DJ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_ET.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_KE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_so_SO.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sq.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sq_AL.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sr_BA_Cyrl.properties \
+  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_sv.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sv_FI.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sv_SE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sw.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sw_KE.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_sw_TZ.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_syr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_syr_SY.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ta.properties \
+  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_th.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_th_TH.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ti.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_ti_ER.properties \
+  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_tr.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tr_TR.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tt.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_tt_RU.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_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_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_zh.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_CN_Hans.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_HK_Hant.properties \
+  classpath/resource/gnu/java/locale/LocaleInformation_zh_Hant.properties \
+  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/util/regex/MessagesBundle.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties \
   classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties \
@@ -7935,6 +8116,7 @@ nat_headers = $(ordinary_header_files) $(inner_nat_headers)
 nat_headers_install = $(ordinary_header_files)
 xlib_nat_headers = $(gnu_awt_xlib_header_files) $(gnu_gcj_xlib_header_files)
 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
@@ -7946,7 +8128,7 @@ extra_headers = java/lang/Object.h java/lang/Class.h
 
 jv_convert_SOURCES = 
 jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 jv_convert_LINK = $(GCJLINK)
 jv_convert_LDADD = -L$(here)/.libs libgcj.la
@@ -7955,21 +8137,22 @@ gcj_dbtool_SOURCES = \
 gnu/gcj/tools/gcj_dbtool/natMain.cc
 
 gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gcj_dbtool_LINK = $(GCJLINK)
 gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la
 gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la libgcj.spec
 gc_analyze_SOURCES = 
 gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \
-        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+        -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gc_analyze_LINK = $(GCJLINK)
 gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la
 gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec
 gij_SOURCES = 
 gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
-       -shared-libgcc $(THREADLDFLAGS)
+       -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) \
+       $(extra_gij_ldflags) 
 
 gij_LINK = $(GCJLINK)
 gij_LDADD = -L$(here)/.libs libgij.la
@@ -7990,91 +8173,91 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
 @NATIVE_TRUE@  $(am__append_16)
 gappletviewer_SOURCES = 
 gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gappletviewer_LINK = $(GCJLINK)
 gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la
 gappletviewer_DEPENDENCIES = libgcj-tools.la
 gjarsigner_SOURCES = 
 gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gjarsigner_LINK = $(GCJLINK)
 gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
 gjarsigner_DEPENDENCIES = libgcj-tools.la
 gkeytool_SOURCES = 
 gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gkeytool_LINK = $(GCJLINK)
 gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la
 gkeytool_DEPENDENCIES = libgcj-tools.la
 gjar_SOURCES = 
 gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gjar_LINK = $(GCJLINK)
 gjar_LDADD = -L$(here)/.libs libgcj-tools.la
 gjar_DEPENDENCIES = libgcj-tools.la
 gjavah_SOURCES = 
 gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gjavah_LINK = $(GCJLINK)
 gjavah_LDADD = -L$(here)/.libs libgcj-tools.la
 gjavah_DEPENDENCIES = libgcj-tools.la
 gcjh_SOURCES = 
 gcjh_LDFLAGS = --main=gnu.classpath.tools.javah.GcjhMain \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gcjh_LINK = $(GCJLINK)
 gcjh_LDADD = -L$(here)/.libs libgcj-tools.la
 gcjh_DEPENDENCIES = libgcj-tools.la
 gnative2ascii_SOURCES = 
 gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gnative2ascii_LINK = $(GCJLINK)
 gnative2ascii_LDADD = -L$(here)/.libs libgcj-tools.la
 gnative2ascii_DEPENDENCIES = libgcj-tools.la
 gorbd_SOURCES = 
 gorbd_LDFLAGS = --main=gnu.classpath.tools.orbd.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gorbd_LINK = $(GCJLINK)
 gorbd_LDADD = -L$(here)/.libs libgcj-tools.la
 gorbd_DEPENDENCIES = libgcj-tools.la
 grmid_SOURCES = 
 grmid_LDFLAGS = --main=gnu.classpath.tools.rmid.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 grmid_LINK = $(GCJLINK)
 grmid_LDADD = -L$(here)/.libs libgcj-tools.la
 grmid_DEPENDENCIES = libgcj-tools.la
 gserialver_SOURCES = 
 gserialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gserialver_LINK = $(GCJLINK)
 gserialver_LDADD = -L$(here)/.libs libgcj-tools.la
 gserialver_DEPENDENCIES = libgcj-tools.la
 gtnameserv_SOURCES = 
 gtnameserv_LDFLAGS = --main=gnu.classpath.tools.tnameserv.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 gtnameserv_LINK = $(GCJLINK)
 gtnameserv_LDADD = -L$(here)/.libs libgcj-tools.la
 gtnameserv_DEPENDENCIES = libgcj-tools.la
 grmic_SOURCES = 
 grmic_LDFLAGS = --main=gnu.classpath.tools.rmic.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 grmic_LINK = $(GCJLINK)
 grmic_LDADD = -L$(here)/.libs libgcj-tools.la
 grmic_DEPENDENCIES = libgcj-tools.la
 grmiregistry_SOURCES = 
 grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
-       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+       -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags)
 
 grmiregistry_LINK = $(GCJLINK)
 grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
@@ -10154,7 +10337,7 @@ java/lang/Class.lo: classpath/lib/java/lang/Class.class
 
 gnu-CORBA.lo: $(gnu_CORBA_source_files)
        @find $(srcdir)/classpath/lib/gnu/CORBA -name '*.class' > gnu-CORBA.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-CORBA.lo @gnu-CORBA.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-CORBA.lo @gnu-CORBA.list
        @rm -f gnu-CORBA.list
 
 gnu/awt.list: $(gnu_awt_source_files)
@@ -10309,7 +10492,7 @@ gnu/java/awt/dnd.list: $(gnu_java_awt_dnd_source_files)
 
 gnu-java-awt-dnd-peer-gtk.lo: $(gnu_java_awt_dnd_peer_gtk_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/awt/dnd/peer/gtk -name '*.class' > gnu-java-awt-dnd-peer-gtk.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-dnd-peer-gtk.lo @gnu-java-awt-dnd-peer-gtk.list
        @rm -f gnu-java-awt-dnd-peer-gtk.list
 
 gnu/java/awt/font.list: $(gnu_java_awt_font_source_files)
@@ -10356,7 +10539,7 @@ gnu/java/awt/peer.list: $(gnu_java_awt_peer_source_files)
 
 gnu-java-awt-peer-gtk.lo: $(gnu_java_awt_peer_gtk_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/awt/peer/gtk -name '*.class' > gnu-java-awt-peer-gtk.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-gtk.lo @gnu-java-awt-peer-gtk.list
        @rm -f gnu-java-awt-peer-gtk.list
 
 gnu/java/awt/peer/headless.list: $(gnu_java_awt_peer_headless_source_files)
@@ -10367,17 +10550,17 @@ gnu/java/awt/peer/headless.list: $(gnu_java_awt_peer_headless_source_files)
 
 gnu-java-awt-peer-qt.lo: $(gnu_java_awt_peer_qt_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/awt/peer/qt -name '*.class' > gnu-java-awt-peer-qt.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-qt.lo @gnu-java-awt-peer-qt.list
        @rm -f gnu-java-awt-peer-qt.list
 
 gnu-java-awt-peer-swing.lo: $(gnu_java_awt_peer_swing_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/awt/peer/swing -name '*.class' > gnu-java-awt-peer-swing.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-swing.lo @gnu-java-awt-peer-swing.list
        @rm -f gnu-java-awt-peer-swing.list
 
 gnu-java-awt-peer-x.lo: $(gnu_java_awt_peer_x_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/awt/peer/x -name '*.class' > gnu-java-awt-peer-x.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-awt-peer-x.lo @gnu-java-awt-peer-x.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-awt-peer-x.lo @gnu-java-awt-peer-x.list
        @rm -f gnu-java-awt-peer-x.list
 
 gnu/java/awt/print.list: $(gnu_java_awt_print_source_files)
@@ -10388,7 +10571,7 @@ gnu/java/awt/print.list: $(gnu_java_awt_print_source_files)
 
 gnu-java-beans.lo: $(gnu_java_beans_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/beans -name '*.class' > gnu-java-beans.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-beans.lo @gnu-java-beans.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-beans.lo @gnu-java-beans.list
        @rm -f gnu-java-beans.list
 
 gnu/java/io.list: $(gnu_java_io_source_files)
@@ -10405,7 +10588,7 @@ gnu/java/lang.list: $(gnu_java_lang_source_files)
 
 gnu-java-lang-management.lo: $(gnu_java_lang_management_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/lang/management -name '*.class' > gnu-java-lang-management.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -findirect-dispatch -fno-indirect-classes -c -o gnu-java-lang-management.lo @gnu-java-lang-management.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes $(LIBGCJ_BC_FLAGS) -c -o gnu-java-lang-management.lo @gnu-java-lang-management.list
        @rm -f gnu-java-lang-management.list
 
 gnu/java/lang/reflect.list: $(gnu_java_lang_reflect_source_files)
@@ -10680,7 +10863,7 @@ gnu/java/util/prefs.list: $(gnu_java_util_prefs_source_files)
 
 gnu-java-util-prefs-gconf.lo: $(gnu_java_util_prefs_gconf_source_files)
        @find $(srcdir)/classpath/lib/gnu/java/util/prefs/gconf -name '*.class' > gnu-java-util-prefs-gconf.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-java-util-prefs-gconf.lo @gnu-java-util-prefs-gconf.list
        @rm -f gnu-java-util-prefs-gconf.list
 
 gnu/java/util/regex.list: $(gnu_java_util_regex_source_files)
@@ -10877,7 +11060,7 @@ gnu/javax/imageio/png.list: $(gnu_javax_imageio_png_source_files)
 
 gnu-javax-management.lo: $(gnu_javax_management_source_files)
        @find $(srcdir)/classpath/lib/gnu/javax/management -name '*.class' > gnu-javax-management.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-management.lo @gnu-javax-management.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-javax-management.lo @gnu-javax-management.list
        @rm -f gnu-javax-management.list
 
 gnu/javax/naming/giop.list: $(gnu_javax_naming_giop_source_files)
@@ -10960,7 +11143,7 @@ gnu/javax/print/ipp/attribute/supported.list: $(gnu_javax_print_ipp_attribute_su
 
 gnu-javax-rmi.lo: $(gnu_javax_rmi_source_files)
        @find $(srcdir)/classpath/lib/gnu/javax/rmi -name '*.class' > gnu-javax-rmi.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-javax-rmi.lo @gnu-javax-rmi.list
        @rm -f gnu-javax-rmi.list
 
 gnu/javax/security/auth.list: $(gnu_javax_security_auth_source_files)
@@ -10989,7 +11172,7 @@ gnu/javax/sound.list: $(gnu_javax_sound_source_files)
 
 gnu-javax-sound-midi.lo: $(gnu_javax_sound_midi_source_files)
        @find $(srcdir)/classpath/lib/gnu/javax/sound/midi -name '*.class' > gnu-javax-sound-midi.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-javax-sound-midi.lo @gnu-javax-sound-midi.list
        @rm -f gnu-javax-sound-midi.list
 
 gnu/javax/sound/sampled/AU.list: $(gnu_javax_sound_sampled_AU_source_files)
@@ -11090,47 +11273,47 @@ gnu/javax/swing/tree.list: $(gnu_javax_swing_tree_source_files)
 
 gnu-xml-aelfred2.lo: $(gnu_xml_aelfred2_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/aelfred2 -name '*.class' > gnu-xml-aelfred2.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-aelfred2.lo @gnu-xml-aelfred2.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-aelfred2.lo @gnu-xml-aelfred2.list
        @rm -f gnu-xml-aelfred2.list
 
 gnu-xml-dom.lo: $(gnu_xml_dom_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/dom -name '*.class' > gnu-xml-dom.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-dom.lo @gnu-xml-dom.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-dom.lo @gnu-xml-dom.list
        @rm -f gnu-xml-dom.list
 
 gnu-xml-libxmlj.lo: $(gnu_xml_libxmlj_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/libxmlj -name '*.class' > gnu-xml-libxmlj.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-libxmlj.lo @gnu-xml-libxmlj.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-libxmlj.lo @gnu-xml-libxmlj.list
        @rm -f gnu-xml-libxmlj.list
 
 gnu-xml-pipeline.lo: $(gnu_xml_pipeline_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/pipeline -name '*.class' > gnu-xml-pipeline.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-pipeline.lo @gnu-xml-pipeline.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-pipeline.lo @gnu-xml-pipeline.list
        @rm -f gnu-xml-pipeline.list
 
 gnu-xml-stream.lo: $(gnu_xml_stream_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/stream -name '*.class' > gnu-xml-stream.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-stream.lo @gnu-xml-stream.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-stream.lo @gnu-xml-stream.list
        @rm -f gnu-xml-stream.list
 
 gnu-xml-transform.lo: $(gnu_xml_transform_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/transform -name '*.class' > gnu-xml-transform.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-transform.lo @gnu-xml-transform.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-transform.lo @gnu-xml-transform.list
        @rm -f gnu-xml-transform.list
 
 gnu-xml-util.lo: $(gnu_xml_util_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/util -name '*.class' > gnu-xml-util.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-util.lo @gnu-xml-util.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-util.lo @gnu-xml-util.list
        @rm -f gnu-xml-util.list
 
 gnu-xml-validation.lo: $(gnu_xml_validation_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/validation -name '*.class' > gnu-xml-validation.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-validation.lo @gnu-xml-validation.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-validation.lo @gnu-xml-validation.list
        @rm -f gnu-xml-validation.list
 
 gnu-xml-xpath.lo: $(gnu_xml_xpath_source_files)
        @find $(srcdir)/classpath/lib/gnu/xml/xpath -name '*.class' > gnu-xml-xpath.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o gnu-xml-xpath.lo @gnu-xml-xpath.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o gnu-xml-xpath.lo @gnu-xml-xpath.list
        @rm -f gnu-xml-xpath.list
 
 java/applet.list: $(java_applet_source_files)
@@ -11261,7 +11444,7 @@ java/lang/instrument.list: $(java_lang_instrument_source_files)
 
 java-lang-management.lo: $(java_lang_management_source_files)
        @find $(srcdir)/classpath/lib/java/lang/management -name '*.class' > java-lang-management.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o java-lang-management.lo @java-lang-management.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o java-lang-management.lo @java-lang-management.list
        @rm -f java-lang-management.list
 
 java/lang/ref.list: $(java_lang_ref_source_files)
@@ -11488,7 +11671,7 @@ javax/crypto/spec.list: $(javax_crypto_spec_source_files)
 
 javax-imageio.lo: $(javax_imageio_source_files)
        @find $(srcdir)/classpath/lib/javax/imageio -name '*.class' > javax-imageio.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-imageio.lo @javax-imageio.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o javax-imageio.lo @javax-imageio.list
        @rm -f javax-imageio.list
 
 javax/management.list: $(javax_management_source_files)
@@ -11577,7 +11760,7 @@ javax/print/event.list: $(javax_print_event_source_files)
 
 javax-rmi.lo: $(javax_rmi_source_files)
        @find $(srcdir)/classpath/lib/javax/rmi -name '*.class' > javax-rmi.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-rmi.lo @javax-rmi.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o javax-rmi.lo @javax-rmi.list
        @rm -f javax-rmi.list
 
 javax/security/auth.list: $(javax_security_auth_source_files)
@@ -11774,7 +11957,7 @@ javax/transaction/xa.list: $(javax_transaction_xa_source_files)
 
 javax-xml.lo: $(javax_xml_source_files)
        @find $(srcdir)/classpath/lib/javax/xml -name '*.class' > javax-xml.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o javax-xml.lo @javax-xml.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o javax-xml.lo @javax-xml.list
        @rm -f javax-xml.list
 
 org/ietf/jgss.list: $(org_ietf_jgss_source_files)
@@ -11783,24 +11966,74 @@ org/ietf/jgss.list: $(org_ietf_jgss_source_files)
 
 -include org/ietf/jgss.deps
 
-org-omg.lo: $(org_omg_source_files)
-       @find $(srcdir)/classpath/lib/org/omg -name '*.class' > org-omg.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-omg.lo @org-omg.list
-       @rm -f org-omg.list
+org-omg-CORBA.lo: $(org_omg_CORBA_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/CORBA -name '*.class' > org-omg-CORBA.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-CORBA.lo @org-omg-CORBA.list
+       @rm -f org-omg-CORBA.list
+
+org-omg-CORBA_2_3.lo: $(org_omg_CORBA_2_3_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/CORBA_2_3 -name '*.class' > org-omg-CORBA_2_3.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-CORBA_2_3.lo @org-omg-CORBA_2_3.list
+       @rm -f org-omg-CORBA_2_3.list
+
+org-omg-CosNaming.lo: $(org_omg_CosNaming_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/CosNaming -name '*.class' > org-omg-CosNaming.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-CosNaming.lo @org-omg-CosNaming.list
+       @rm -f org-omg-CosNaming.list
+
+org-omg-Dynamic.lo: $(org_omg_Dynamic_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/Dynamic -name '*.class' > org-omg-Dynamic.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-Dynamic.lo @org-omg-Dynamic.list
+       @rm -f org-omg-Dynamic.list
+
+org-omg-DynamicAny.lo: $(org_omg_DynamicAny_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/DynamicAny -name '*.class' > org-omg-DynamicAny.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-DynamicAny.lo @org-omg-DynamicAny.list
+       @rm -f org-omg-DynamicAny.list
+
+org-omg-IOP.lo: $(org_omg_IOP_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/IOP -name '*.class' > org-omg-IOP.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-IOP.lo @org-omg-IOP.list
+       @rm -f org-omg-IOP.list
+
+org-omg-Messaging.lo: $(org_omg_Messaging_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/Messaging -name '*.class' > org-omg-Messaging.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-Messaging.lo @org-omg-Messaging.list
+       @rm -f org-omg-Messaging.list
+
+org-omg-PortableInterceptor.lo: $(org_omg_PortableInterceptor_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/PortableInterceptor -name '*.class' > org-omg-PortableInterceptor.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-PortableInterceptor.lo @org-omg-PortableInterceptor.list
+       @rm -f org-omg-PortableInterceptor.list
+
+org-omg-PortableServer.lo: $(org_omg_PortableServer_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/PortableServer -name '*.class' > org-omg-PortableServer.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-PortableServer.lo @org-omg-PortableServer.list
+       @rm -f org-omg-PortableServer.list
+
+org-omg-SendingContext.lo: $(org_omg_SendingContext_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/SendingContext -name '*.class' > org-omg-SendingContext.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-SendingContext.lo @org-omg-SendingContext.list
+       @rm -f org-omg-SendingContext.list
+
+org-omg-stub.lo: $(org_omg_stub_source_files)
+       @find $(srcdir)/classpath/lib/org/omg/stub -name '*.class' > org-omg-stub.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-omg-stub.lo @org-omg-stub.list
+       @rm -f org-omg-stub.list
 
 org-relaxng.lo: $(org_relaxng_source_files)
        @find $(srcdir)/classpath/lib/org/relaxng -name '*.class' > org-relaxng.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-relaxng.lo @org-relaxng.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-relaxng.lo @org-relaxng.list
        @rm -f org-relaxng.list
 
 org-w3c.lo: $(org_w3c_source_files)
        @find $(srcdir)/classpath/lib/org/w3c -name '*.class' > org-w3c.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-w3c.lo @org-w3c.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-w3c.lo @org-w3c.list
        @rm -f org-w3c.list
 
 org-xml.lo: $(org_xml_source_files)
        @find $(srcdir)/classpath/lib/org/xml -name '*.class' > org-xml.list
-       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni -findirect-dispatch -fno-indirect-classes -c -o org-xml.lo @org-xml.list
+       $(LTGCJCOMPILE) -fsource-filename=$(here)/classpath/lib/classes -fjni $(LIBGCJ_BC_FLAGS) -c -o org-xml.lo @org-xml.list
        @rm -f org-xml.list
 
 sun/awt.list: $(sun_awt_source_files)
@@ -11861,7 +12094,8 @@ gcjh.stamp: classpath/lib/compile-classes
 $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h:
        @:
 
-install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS
+install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \
+       install-libexecsubPROGRAMS
 @USE_LIBGCJ_BC_TRUE@   @echo Installing dummy lib libgcj_bc.so.1.0.0; \
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
 @USE_LIBGCJ_BC_TRUE@   mv $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so; \
@@ -11871,7 +12105,6 @@ install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS
 @USE_LIBGCJ_BC_TRUE@   $(LN_S) libgcj_bc.so.1.0.0 $(DESTDIR)$(toolexeclibdir)/libgcj_bc.so.1; \
 @USE_LIBGCJ_BC_TRUE@   rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
 @BUILD_ECJ1_TRUE@      mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
-
 install-data-local:
        $(PRE_INSTALL)
        @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \
@@ -11881,12 +12114,23 @@ install-data-local:
        $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file
        @echo Creating list of headers to install...
        @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist)
-       @cat tmp-ilist | while read f; do \
-         d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \
-         $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \
-         if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \
-         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       while read file; do echo "$$file $$file"; done < tmp-ilist | \
+       sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+       $(AWK) 'BEGIN { files["."] = "" } \
+         { files[$$2] = files[$$2] " " $$1; \
+           if (++n[$$2] == $(install_data_local_split)) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+            END { for (dir in files) print dir, files[dir] }' | \
+       while read dir files; do \
+         xfiles=; for file in $$files; do \
+           if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+           else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+         test -z "$$xfiles" || { \
+           test "x$$dir" = x. || { \
+             echo "$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$dir"; \
+             $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$dir; }; \
+           echo " $(INSTALL_DATA) $$xfiles $(DESTDIR)$(gxx_include_dir)/$$dir"; \
+           $(INSTALL_DATA) $$xfiles $(DESTDIR)$(gxx_include_dir)/$$dir; }; \
        done
        -@rm -f tmp-ilist
        $(INSTALL_DATA) $(srcdir)/'java/io/ObjectOutputStream$$PutField.h' $(DESTDIR)$(gxx_include_dir)/java/io/