Re: Canadian Cross Compiling Issues

[Ranjit Mathew <rmathew at hotmail dot com>]

Ranjit Mathew wrote:
> I will post my diffs to the GCC 3.2 libjava configure and
> Makefile.in that finally allowed me to build libgcj and
> related tools properly.
Here are the diffs with the GCC 3.2 libjava/configure and
libjava/Makefile.in that I had to use to get it working
with my set up:
---------------------------- 8< -------------------------------
--- libjava/configure	2002-09-25 22:36:25.000000000 +0530
+++ libjava/configure	2002-09-26 08:47:20.000000000 +0530
@@ -1638,5 +1638,5 @@
 # automake happy, but we don't execute it, since we don't care about
 # the result.
-if false; then
+if true; then
   # autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
   # to nothing, so nothing would remain between `then' and `fi' if it
@@ -3374,8 +3374,9 @@
    # If Canadian cross, then don't pick up tools from the build
    # directory.
-   if test x"$build" != x"$with_cross_host" && x"$build" != x"$target"; 
then
+   if test x"$build" != x"$with_cross_host" -a x"$build" != x"$target"; 
then
       CANADIAN=yes
-      GCC_UNWIND_INCLUDE=
+      GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
       GCJ="${target_alias}-gcj"
+      GCJH="${target_alias}-gcjh"
    fi
    NATIVE=no
@@ -7625,4 +7626,5 @@
 s%@LIBICONV@%$LIBICONV%g
 s%@GCJ@%$GCJ%g
+s%@GCJH@%$GCJH%g
 s%@GCJFLAGS@%$GCJFLAGS%g
 s%@ZLIBS@%$ZLIBS%g
--- libjava/Makefile.in	2002-09-19 07:20:55.000000000 +0530
+++ libjava/Makefile.in	2002-09-25 23:34:40.000000000 +0530
@@ -151,9 +151,9 @@
 @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = 
@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = 
@CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
-@CANADIAN_FALSE@ZIP = 
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
-@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
-@CANADIAN_FALSE@GCJH = 
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
+@CANADIAN_FALSE@ZIP = 
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
+@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@@GCJH@
+@CANADIAN_FALSE@GCJH = 
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh

-GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
+GCJ_WITH_FLAGS = $(GCJ) -g0 --encoding=UTF-8

 GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS) 
-fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF 
$(@:.lo=.d) -c
@@ -176,5 +176,5 @@
 @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@

-JCFLAGS = -g
+JCFLAGS = -g0
 JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)

@@ -231,5 +231,4 @@
     $(java_source_files) \
     $(built_java_source_files) \
-    $(x_java_source_files)


@@ -1666,5 +1665,5 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
+LIBS = @LIBS@ -lregex -lmingwex
 X_CFLAGS = @X_CFLAGS@
 X_LIBS = @X_LIBS@
@@ -1709,4 +1708,6 @@
 @NATIVE_TRUE@bin_PROGRAMS =  jv-convert$(EXEEXT) gij$(EXEEXT) \
 @NATIVE_TRUE@rmic$(EXEEXT) rmiregistry$(EXEEXT)
+@CANADIAN_TRUE@bin_PROGRAMS =  jv-convert$(EXEEXT) gij$(EXEEXT) \
+@CANADIAN_TRUE@rmic$(EXEEXT) rmiregistry$(EXEEXT)
 @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS =  \
 @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS$(EXEEXT)
---------------------------- 8< -------------------------------