The following patches include a couple of fixes for cross toolchains,

and endian bits for the picojava port.  I am committing this (and the
rebuilt Makefile.in/configure files).

From-SVN: r29765

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index dc5a034059bb0d26d7b3e438deee9a614bf64787..dc5ff59280fc5f3313c8bd7cd6484e4732667ed1 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -80,6 +80,7 @@ JCFLAGS = -g
 JC1FLAGS = -g @LIBGCJ_JAVAFLAGS@
 
 LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
+ZINCS = -I$(top_srcdir)/../zlib
 
 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
        $(GCINCS) $(THREADINCS) \

diff --git a/libjava/configure.in b/libjava/configure.in
index 375242bdd7e14284ef63f3e71c1dee367fbb2b2f..a6557d14b3d921a274d62d090b150cff18083a5a 100644 (file)
--- a/libjava/configure.in
+++ b/libjava/configure.in
@@ -302,7 +302,7 @@ if test -n "${with_cross_host}"; then
    dnl We also assume we are using gcc, which provides alloca.
    AC_DEFINE(HAVE_ALLOCA)
 
-   ZLIBSPEC=-lgcj
+   ZLIBSPEC=-lzgcj
 
    # If Canadian cross, then don't pick up tools from the build
    # directory.

diff --git a/libjava/java/lang/ieeefp.h b/libjava/java/lang/ieeefp.h
index 1f0951ff43097a6bebdc7a2e9e779ca690f0fb47..bf0cafc6bd2361796b2bc54fcfd0f96014c44ed8 100644 (file)
--- a/libjava/java/lang/ieeefp.h
+++ b/libjava/java/lang/ieeefp.h
@@ -66,6 +66,14 @@
 #define __IEEE_BIG_ENDIAN
 #endif
 
+#ifdef __pj__
+#ifdef __pjl__
+#define __IEEE_LITTLE_ENDIAN
+#else
+#define __IEEE_BIG_ENDIAN
+#endif
+#endif
+
 /* necv70 was __IEEE_LITTLE_ENDIAN. */
 
 #ifdef __W65__