2002-09-14 Joel Sherrill <joel@OARcorp.com>

* gcc3newlib/base-gcj.add, gcc3newlib/gccnewlib.add,
	gcc3newlib/target-gcj.add: First attempt at enabling Java support.

scripts/ChangeLog

@@ -1,3 +1,8 @@
+2002-09-14	Joel Sherrill <joel@OARcorp.com>
+
+	* gcc3newlib/base-gcj.add, gcc3newlib/gccnewlib.add,
+	gcc3newlib/target-gcj.add: First attempt at enabling Java support.
+
 2002-08-21	Joel Sherrill <joel@OARcorp.com>
 
 	* setup.def, gcc3newlib/gccnewlib.add: Updated the tools for 

scripts/gcc3newlib/base-gcj.add

@@ -15,8 +15,16 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 
 %files -n rtems-base-gcj
 %dir %{_prefix}/bin
-%{_prefix}/bin/jcf-dump@exe_ext@
-%{_prefix}/bin/jv-scan@exe_ext@
-%{_prefix}/bin/gcjh@exe_ext@
+%{_prefix}/bin/jar@exe_ext@
+%{_prefix}/bin/grepjar@exe_ext@
+
+%dir %{_prefix}/man/man1
+%{_prefix}/man/man1/gcjh.1
+%{_prefix}/man/man1/jv-scan.1
+%{_prefix}/man/man1/jcf-dump.1
+%{_prefix}/man/man1/gij.1
+%{_prefix}/man/man1/jv-convert.1
+%{_prefix}/man/man1/rmic.1
+%{_prefix}/man/man1/rmiregistry.1
 
 %endif

scripts/gcc3newlib/gccnewlib.add

@@ -61,24 +61,40 @@ NoSource:	1
 %define build_gcj	0
 %define build_gnat	0
 
-%if "@target_alias@"     == "c4x-rtems"
+%if "@target_alias@" == "arm-rtems"
+%define build_gcj 	1
+%endif
+
+%if "@target_alias@" == "c4x-rtems"
 %define build_cxx	0
 %endif
 
 %if "@target_alias@" == "i386-rtems"
 %define build_gnat 	%_gnat
+%define build_gcj 	1
 %endif
 
 %if "@target_alias@" == "i960-rtems"
 %define build_cxx	0
 %endif
 
+%if "@target_alias@" == "m68k-rtems"
+%define build_gcj 	1
+%endif
+
+%if "@target_alias@" == "mips-rtems"
+%define build_gnat      %_gnat
+%define build_gcj 	1
+%endif
+
 %if "@target_alias@" == "powerpc-rtems"
 %define build_gnat      %_gnat
+%define build_gcj 	1
 %endif
 
 %if "@target_alias@" == "sparc-rtems"
 %define build_gnat      %_gnat
+%define build_gcj 	1
 %endif
 
 %description
@@ -119,6 +135,9 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
 # %if "%{_target_os}" != "%{_build_os}"
 #    CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
 # %endif
+#  ALERT: GCJ would be better if we could add this flag and build
+#  it's libraries but this code isn't ready to be embedded.
+#  libgcj_flag="--enable-libgcj"
 
   languages="c"
 %if %build_cxx
@@ -128,7 +147,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   languages="$languages,g77"
 %endif
 %if %build_gcj
-  languages="$languages,gcj"
+  languages="$languages,java"
 %endif
 %if %build_objc
   languages="$languages,objc"
@@ -141,7 +160,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
     --with-system-zlib --disable-nls \
     --enable-version-specific-runtime-libs \
     --enable-threads=rtems --prefix=%{_prefix} \
-    --enable-languages=$languages
+    --enable-languages=$languages ${libgcj_flag}
 %if %build_gnat
   cd ../gcc-@gcc_version@/gcc/ada
   touch treeprs.ads [es]info.h nmake.ad[bs]

scripts/gcc3newlib/target-gcj.add

@@ -16,6 +16,10 @@ This is the gcc/java compiler for @target_alias@
 %files -n @target_alias@-gcj -f build/files.gcj
 %dir %{_prefix}/bin
 %{_prefix}/bin/@target_alias@-gcj@exe_ext@
+%{_prefix}/bin/@target_alias@-jcf-dump@exe_ext@
+%{_prefix}/bin/@target_alias@-jv-scan@exe_ext@
+%{_prefix}/bin/@target_alias@-gcjh@exe_ext@
+%{_prefix}/man/man1/@target_alias@-gcj.1
 
 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@
 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@