[ecj] Patch: FYI: enable tools

[Tom Tromey <tromey at redhat dot com>]

I'm checking this in on the gcj-eclipse-merge-branch.

This fixes up the tools:

* Re-enables the tools that were disabled in a previous merge
* Adds tools that were in Classpath but not libgcj (e.g., javah)
* Removes libgcj's copy of rmic

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* gnu/java/rmi/rmic/CompilerProcess.java: Removed.
	* gnu/java/rmi/rmic/RMICException.java: Removed.
	* gnu/java/rmi/rmic/Compiler.java: Removed.
	* gnu/java/rmi/rmic/Compile_gcj.java: Removed.
	* gnu/java/rmi/rmic/Compile_jikes.java: Removed.
	* gnu/java/rmi/rmic/TabbedWriter.java: Removed.
	* gnu/java/rmi/rmic/Compile_kjc.java: Removed.
	* gnu/java/rmi/rmic/RMIC.java: Removed.
	* Makefile.am (toolexeclib_LTLIBRARIES): Uncomment
	libgcj-tools.la.
	(jar_DATA): Uncomment libgcj-tools jar.
	(libgcj_tools_la_SOURCES): Uncomment.
	(libgcj_tools_la_GCJFLAGS): Likewise.
	(libgcj_tools_la_LDFLAGS): Likewise.
	(libgcj_tools_la_DEPENDENCIES): Likewise.
	(libgcj_tools_la_LINK): Likewise.
	(libgcj-tools-$(gcc_version).jar): Uncomment.
	(bin_PROGRAMS): Add gappletviewer, gjarsigner, gkeytool, gjar,
	gjavah, gnative2ascii, gorbd, grmid, gserialver, gtnameserv.
	(gjar_SOURCES): New variable.
	(gjar_LDFLAGS): Likewise.
	(gjar_LINK): Likewise.
	(gjar_LDADD): Likewise.
	(gjar_DEPENDENCIES): Likewise.
	(gjavah_SOURCES): Likewise.
	(gjavah_LDFLAGS): Likewise.
	(gjavah_LINK): Likewise.
	(gjavah_LDADD): Likewise.
	(gjavah_DEPENDENCIES): Likewise.
	(gnative2ascii_SOURCES): Likewise.
	(gnative2ascii_LDFLAGS): Likewise.
	(gnative2ascii_LINK): Likewise.
	(gnative2ascii_LDADD): Likewise.
	(gnative2ascii_DEPENDENCIES): Likewise.
	(gorbd_SOURCES): Likewise.
	(gorbd_LDFLAGS): Likewise.
	(gorbd_LINK): Likewise.
	(gorbd_LDADD): Likewise.
	(gorbd_DEPENDENCIES): Likewise.
	(grmid_SOURCES): Likewise.
	(grmid_LDFLAGS): Likewise.
	(grmid_LINK): Likewise.
	(grmid_LDADD): Likewise.
	(grmid_DEPENDENCIES): Likewise.
	(gserialver_SOURCES): Likewise.
	(gserialver_LDFLAGS): Likewise.
	(gserialver_LINK): Likewise.
	(gserialver_LDADD): Likewise.
	(gserialver_DEPENDENCIES): Likewise.
	(gtnameserv_SOURCES): Likewise.
	(gtnameserv_LDFLAGS): Likewise.
	(gtnameserv_LINK): Likewise.
	(gtnameserv_LDADD): Likewise.
	(gtnameserv_DEPENDENCIES): Likewise.
	(grmic_LDADD): Link against tools library.
	(grmic_LDFLAGS): Changed --main.
	(grmiregistry_LDADD): Link against tools library.
	(grmiregistry_LDFLAGS): Changed --main.
	(grmic_DEPENDENCIES): Updated.
	(grmiregistry_DEPENDENCIES): Likewise.

Index: classpath/ChangeLog.gcj
from  Tom Tromey  <tromey@redhat.com>

	* Makefile.in, tools/Makefile.in: Rebuilt.
	* Makefile.am (SUBDIRS): Removed gcj-local change.
	(DIST_SUBDIRS): Likewise.
	* tools/Makefile.am (JCOMPILER): Use gcj, not gcjx.
	(GLIBJ_BOOTCLASSPATH): Find core classes in srcdir.

Index: Makefile.am
===================================================================
--- Makefile.am	(revision 119792)
+++ Makefile.am	(working copy)
@@ -35,7 +35,7 @@
 ## What gets installed, and where.
 ##
 
-toolexeclib_LTLIBRARIES = libgcj.la libgij.la # libgcj-tools.la
+toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la
 toolexecmainlib_DATA = libgcj.spec
 
 if USE_LIBGCJ_BC
@@ -51,7 +51,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
 jardir = $(datadir)/java
-jar_DATA = libgcj-$(gcc_version).jar # libgcj-tools-$(gcc_version).jar
+jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
 if INSTALL_ECJ_JAR
 jar_DATA += $(ECJ_BUILD_JAR)
 endif
@@ -71,7 +71,9 @@
 
 ## For now, only on native systems.  FIXME.
 if NATIVE
-bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool
+bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \
+	gappletviewer gjarsigner gkeytool gjar gjavah gnative2ascii \
+	gorbd grmid gserialver gtnameserv
 
 ## It is convenient to actually build and install the default database
 ## when gcj-dbtool is available.
@@ -252,13 +254,12 @@
 ## compiled.
 EXTRA_libgcj_la_SOURCES = java/lang/Object.java
 
-## Removed during merge
-# libgcj_tools_la_SOURCES = classpath/tools/tools.jar
-# libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes
-# libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-#  -version-info `grep -v '^\#' $(srcdir)/libtool-version`
-# libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
-# libgcj_tools_la_LINK = $(LIBLINK)
+libgcj_tools_la_SOURCES = classpath/tools/tools.zip
+libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes
+libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version`
+libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec
+libgcj_tools_la_LINK = $(LIBLINK)
 
 ## libjvm.so
 libjvm_la_SOURCES = jni-libjvm.cc
@@ -333,8 +334,8 @@
 	here=`pwd`; cd $(srcdir)/classpath/lib; $(JAR) -cfM \
 	    $$here/libgcj-$(gcc_version).jar gnu java javax org sun
 
-# libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
-# 	cp $< $@
+libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip
+	cp $< $@
 
 CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
 DISTCLEANFILES = native.dirs
@@ -652,28 +653,6 @@
 ## linking this program.
 gij_DEPENDENCIES = libgij.la
 
-## This is a dummy definition.
-grmic_SOURCES =
-grmic_LDFLAGS = --main=gnu.java.rmi.rmic.RMIC \
-	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-grmic_LINK = $(GCJLINK)
-## See jv_convert_LDADD.
-grmic_LDADD = -L$(here)/.libs libgcj.la
-## Depend on the spec file to make sure it is up to date before
-## linking this program.
-grmic_DEPENDENCIES = libgcj.la libgcj.spec
-
-## This is a dummy definition.
-grmiregistry_SOURCES =
-grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \
-	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-grmiregistry_LINK = $(GCJLINK)
-## See jv_convert_LDADD.
-grmiregistry_LDADD = -L$(here)/.libs libgcj.la
-## Depend on the spec file to make sure it is up to date before
-## linking this program.
-grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
-
 ## Build an ecjx from a .jar.
 ecjx_SOURCES =
 ## We use the BC ABI here so that we don't need to compile ecj.jar.
@@ -714,8 +693,6 @@
 gappletviewer_LINK = $(GCJLINK)
 ## See jv_convert_LDADD.
 gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la
-## Depend on the spec file to make sure it is up to date before
-## linking this program.
 gappletviewer_DEPENDENCIES = libgcj-tools.la
 
 ## This is a dummy definition.
@@ -725,8 +702,6 @@
 gjarsigner_LINK = $(GCJLINK)
 ## See jv_convert_LDADD.
 gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
-## Depend on the spec file to make sure it is up to date before
-## linking this program.
 gjarsigner_DEPENDENCIES = libgcj-tools.la
 
 ## This is a dummy definition.
@@ -736,10 +711,89 @@
 gkeytool_LINK = $(GCJLINK)
 ## See jv_convert_LDADD.
 gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la
-## Depend on the spec file to make sure it is up to date before
-## linking this program.
 gkeytool_DEPENDENCIES = libgcj-tools.la
 
+## This is a dummy definition.
+gjar_SOURCES =
+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gjar_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
+gjar_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+gjavah_SOURCES =
+gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gjavah_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gjavah_LDADD = -L$(here)/.libs libgcj-tools.la
+gjavah_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+gnative2ascii_SOURCES =
+gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gnative2ascii_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gnative2ascii_LDADD = -L$(here)/.libs libgcj-tools.la
+gnative2ascii_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+gorbd_SOURCES =
+gorbd_LDFLAGS = --main=gnu.classpath.tools.orbd.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gorbd_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gorbd_LDADD = -L$(here)/.libs libgcj-tools.la
+gorbd_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+grmid_SOURCES =
+grmid_LDFLAGS = --main=gnu.classpath.tools.rmid.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+grmid_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+grmid_LDADD = -L$(here)/.libs libgcj-tools.la
+grmid_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+gserialver_SOURCES =
+gserialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gserialver_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gserialver_LDADD = -L$(here)/.libs libgcj-tools.la
+gserialver_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+gtnameserv_SOURCES =
+gtnameserv_LDFLAGS = --main=gnu.classpath.tools.tnameserv.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+gtnameserv_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+gtnameserv_LDADD = -L$(here)/.libs libgcj-tools.la
+gtnameserv_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+grmic_SOURCES =
+grmic_LDFLAGS = --main=gnu.classpath.tools.rmic.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+grmic_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+grmic_LDADD = -L$(here)/.libs libgcj-tools.la
+grmic_DEPENDENCIES = libgcj-tools.la
+
+## This is a dummy definition.
+grmiregistry_SOURCES =
+grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \
+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
+grmiregistry_LINK = $(GCJLINK)
+## See jv_convert_LDADD.
+grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la
+grmiregistry_DEPENDENCIES = libgcj-tools.la
+
 ## ################################################################
 
 ## This lists all the C++ source files in subdirectories.
Index: classpath/Makefile.am
===================================================================
--- classpath/Makefile.am	(revision 119792)
+++ classpath/Makefile.am	(working copy)
@@ -1,10 +1,8 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 # lib first, to compile .class files before native code, last examples
-## GCJ LOCAL: we remove 'tools' for the time being.
-## We don't build any of them into actual tools yet.
-SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR)
-DIST_SUBDIRS = lib doc external include native resource scripts examples
+SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
+DIST_SUBDIRS = lib doc external include native resource scripts tools examples
 
 ## GCJ LOCAL: we need an extra -I here.
 ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
Index: classpath/tools/Makefile.am
===================================================================
--- classpath/tools/Makefile.am	(revision 119793)
+++ classpath/tools/Makefile.am	(working copy)
@@ -1,11 +1,12 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip'
+## GCJ LOCAL: use srcdir to find core classes.
+GLIBJ_BOOTCLASSPATH='$(top_srcdir)/lib'
 GLIBJ_CLASSPATH=asm
 
 # Setup the compiler to use the GNU Classpath library we just build
-if FOUND_GCJX
-JCOMPILER = $(GCJX) -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -sourcepath '' -classpath $(GLIBJ_CLASSPATH):.
+if FOUND_GCJ
+JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):.
 else
 if FOUND_ECJ
 JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)