[kaffe] CVS kaffe (robilad): small fixes for cross-compilation and alpha

Fri, 08 Sep 2006 18:12:52 -0700 

PatchSet 7411 
Date: 2006/09/09 01:06:12
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small fixes for cross-compilation and alpha

2006-09-09  Dalibor Topic  <[EMAIL PROTECTED]>

        * include/Makefile.am (stamp-h0all, stamp-h1all): Set bootclasspath
        instead of classpath for kaffeh invocations to make sure the VM
        interface jars are picked up and the right headers are generated.
        This fixes cross-compilation.

        * libraries/clib/native/Object.c (java_lang_VMObject_wait): Use
        PRIi64 modifier to print out the timeout jlong. Include the
        necessary headers. This fixes a warning on alpha-linux.

        * test/regression/wc.java: run wc on ../../config/stamp-h1
        which fixes it on Ubuntu Edgy Eft. Adapted expected result
        accordingly.

Members: 
        ChangeLog:1.4913->1.4914 
        include/Makefile.am:1.134->1.135 
        include/Makefile.in:1.293->1.294 
        libraries/clib/native/Object.c:1.19->1.20 
        po/de.po:1.11->1.12 
        po/fr.po:1.26->1.27 
        po/kaffe.pot:1.23->1.24 
        po/zh_CN.po:1.14->1.15 
        po/zh_TW.po:1.31->1.32 
        test/regression/wc.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4913 kaffe/ChangeLog:1.4914
--- kaffe/ChangeLog:1.4913      Mon Sep  4 19:12:49 2006
+++ kaffe/ChangeLog     Sat Sep  9 01:06:12 2006
@@ -1,3 +1,18 @@
+2006-09-09  Dalibor Topic  <[EMAIL PROTECTED]>
+
+       * include/Makefile.am (stamp-h0all, stamp-h1all): Set bootclasspath
+       instead of classpath for kaffeh invocations to make sure the VM 
+       interface jars are picked up and the right headers are generated.
+       This fixes cross-compilation.
+
+       * libraries/clib/native/Object.c (java_lang_VMObject_wait): Use 
+       PRIi64 modifier to print out the timeout jlong. Include the 
+       necessary headers. This fixes a warning on alpha-linux.
+
+       * test/regression/wc.java: run wc on ../../config/stamp-h1
+       which fixes it on Ubuntu Edgy Eft. Adapted expected result
+       accordingly.
+
 2006-09-04  Dalibor Topic  <[EMAIL PROTECTED]>
 
        * kaffe/kaffevm/intrp/icode.h (UNINITIALIZED_STACK_SLOT):
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.134 kaffe/include/Makefile.am:1.135
--- kaffe/include/Makefile.am:1.134     Sun Aug 20 22:27:43 2006
+++ kaffe/include/Makefile.am   Sat Sep  9 01:06:16 2006
@@ -220,8 +220,8 @@
 ## but if it does not change, do not touch it
        @set -e; for f in $(DERIVED_HDRS); do \
          class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
-         echo "$(KAFFEH) -classpath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
-         $(KAFFEH) -classpath $(KAFFEH_CLASSPATH) -o stamp-h0$$f $$class; \
+         echo "$(KAFFEH) -bootclasspath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
+         $(KAFFEH) -bootclasspath $(KAFFEH_CLASSPATH) -o stamp-h0$$f $$class; \
          if test -f $$f && cmp $$f stamp-h0$$f >/dev/null; then \
            echo "$$f is already up-to-date"; \
            rm -f stamp-h0$$f; \
@@ -237,8 +237,8 @@
 ## but if it does not change, do not touch it
        @set -e; for f in $(JNI_DERIVED_HDRS); do \
          class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
-         echo "$(KAFFEH) -jni -classpath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
-         $(KAFFEH) -jni -classpath $(KAFFEH_CLASSPATH) -o stamp-h1$$f $$class; 
\
+         echo "$(KAFFEH) -jni -bootclasspath $(KAFFEH_CLASSPATH) -o $$f 
$$class"; \
+         $(KAFFEH) -jni -bootclasspath $(KAFFEH_CLASSPATH) -o stamp-h1$$f 
$$class; \
          if test -f $$f && cmp $$f stamp-h1$$f >/dev/null; then \
            echo "$$f is already up-to-date"; \
            rm -f stamp-h1$$f; \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.293 kaffe/include/Makefile.in:1.294
--- kaffe/include/Makefile.in:1.293     Tue Aug 29 23:43:57 2006
+++ kaffe/include/Makefile.in   Sat Sep  9 01:06:17 2006
@@ -841,8 +841,8 @@
 stamp-h0all: stamp-kaffeh $(GLIBJ_ZIP)
        @set -e; for f in $(DERIVED_HDRS); do \
          class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
-         echo "$(KAFFEH) -classpath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
-         $(KAFFEH) -classpath $(KAFFEH_CLASSPATH) -o stamp-h0$$f $$class; \
+         echo "$(KAFFEH) -bootclasspath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
+         $(KAFFEH) -bootclasspath $(KAFFEH_CLASSPATH) -o stamp-h0$$f $$class; \
          if test -f $$f && cmp $$f stamp-h0$$f >/dev/null; then \
            echo "$$f is already up-to-date"; \
            rm -f stamp-h0$$f; \
@@ -855,8 +855,8 @@
 stamp-h1all: stamp-kaffeh $(GLIBJ_ZIP)
        @set -e; for f in $(JNI_DERIVED_HDRS); do \
          class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e 's%_%/%g'`; \
-         echo "$(KAFFEH) -jni -classpath $(KAFFEH_CLASSPATH) -o $$f $$class"; \
-         $(KAFFEH) -jni -classpath $(KAFFEH_CLASSPATH) -o stamp-h1$$f $$class; 
\
+         echo "$(KAFFEH) -jni -bootclasspath $(KAFFEH_CLASSPATH) -o $$f 
$$class"; \
+         $(KAFFEH) -jni -bootclasspath $(KAFFEH_CLASSPATH) -o stamp-h1$$f 
$$class; \
          if test -f $$f && cmp $$f stamp-h1$$f >/dev/null; then \
            echo "$$f is already up-to-date"; \
            rm -f stamp-h1$$f; \
Index: kaffe/libraries/clib/native/Object.c
diff -u kaffe/libraries/clib/native/Object.c:1.19 
kaffe/libraries/clib/native/Object.c:1.20
--- kaffe/libraries/clib/native/Object.c:1.19   Sun Jun 11 23:12:13 2006
+++ kaffe/libraries/clib/native/Object.c        Sat Sep  9 01:06:17 2006
@@ -12,6 +12,7 @@
  */
 
 #include "config.h"
+#include "config-int.h"
 #include "config-std.h"
 #include "config-mem.h"
 #include "classMethod.h"
@@ -29,6 +30,10 @@
 #include "jvmpi_kaffe.h"
 #include "debug.h"
 
+#if defined(HAVE_INTTYPES_H)
+#include <inttypes.h>
+#endif
+
 /*
  * Return class object for this object.
  */
@@ -102,7 +107,7 @@
       throwException(InterruptedException);
     }
 
-DBG(VMTHREAD, dprintf ("%p (%p) waiting for %p, %lli\n",
+DBG(VMTHREAD, dprintf ("%p (%p) waiting for %p, %" PRIi64 "\n",
                        cur, KTHREAD(get_data)(cur)->jlThread,
                        o, timeout); );
 
Index: kaffe/po/de.po
diff -u kaffe/po/de.po:1.11 kaffe/po/de.po:1.12
--- kaffe/po/de.po:1.11 Tue Aug 29 23:44:35 2006
+++ kaffe/po/de.po      Sat Sep  9 01:06:17 2006
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-08-28 00:28+0200\n"
+"POT-Creation-Date: 2006-09-08 02:10+0200\n"
 "PO-Revision-Date: 2005-07-18 23:27+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <[EMAIL PROTECTED]>\n"
@@ -289,17 +289,16 @@
 msgid "Engine: %s   Version: %s   Java Version: %s\n"
 msgstr "Engine: %s   Version: %s   Java Version: %s\n"
 
-#: kaffe/kaffe/version.c:58
+#: kaffe/kaffe/version.c:57
 #, fuzzy, c-format
 msgid "Heap defaults: minimum size: %d MB, maximum size: unlimited\n"
 msgstr "Heap-Standards: minimale Größe: %d MB, maximale Größe: %d MB\n"
 
-#: kaffe/kaffe/version.c:61
-#, fuzzy, c-format
-msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
-msgstr "Heap-Standards: minimale Größe: %d MB, maximale Größe: %d MB\n"
-
-#: kaffe/kaffe/version.c:64
+#: kaffe/kaffe/version.c:59
 #, c-format
 msgid "Stack default size: %d KB\n"
 msgstr "Stack Standardgröße: %d KB\n"
+
+#, fuzzy
+#~ msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
+#~ msgstr "Heap-Standards: minimale Größe: %d MB, maximale Größe: %d MB\n"
Index: kaffe/po/fr.po
diff -u kaffe/po/fr.po:1.26 kaffe/po/fr.po:1.27
--- kaffe/po/fr.po:1.26 Tue Aug 29 23:44:35 2006
+++ kaffe/po/fr.po      Sat Sep  9 01:06:17 2006
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-08-28 00:28+0200\n"
+"POT-Creation-Date: 2006-09-08 02:10+0200\n"
 "PO-Revision-Date: 2004-06-03 22:00+0200\n"
 "Last-Translator: Guilhem Lavaux <[EMAIL PROTECTED]>\n"
 "Language-Team: French <kaffe@kaffe.org>\n"
@@ -300,21 +300,20 @@
 msgid "Engine: %s   Version: %s   Java Version: %s\n"
 msgstr "Moteur: %s   Version: %s    Version Java: %s\n"
 
-#: kaffe/kaffe/version.c:58
+#: kaffe/kaffe/version.c:57
 #, fuzzy, c-format
 msgid "Heap defaults: minimum size: %d MB, maximum size: unlimited\n"
 msgstr ""
 "Paramètres par défaut du tas: taille minimale: %d MB, taille maximale: %d "
 "MB\n"
 
-#: kaffe/kaffe/version.c:61
-#, fuzzy, c-format
-msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
-msgstr ""
-"Paramètres par défaut du tas: taille minimale: %d MB, taille maximale: %d "
-"MB\n"
-
-#: kaffe/kaffe/version.c:64
+#: kaffe/kaffe/version.c:59
 #, c-format
 msgid "Stack default size: %d KB\n"
 msgstr "Taille par défault de la pile: %d KB\n"
+
+#, fuzzy
+#~ msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
+#~ msgstr ""
+#~ "Paramètres par défaut du tas: taille minimale: %d MB, taille maximale: %d "
+#~ "MB\n"
Index: kaffe/po/kaffe.pot
diff -u kaffe/po/kaffe.pot:1.23 kaffe/po/kaffe.pot:1.24
--- kaffe/po/kaffe.pot:1.23     Tue Aug 29 23:44:35 2006
+++ kaffe/po/kaffe.pot  Sat Sep  9 01:06:17 2006
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-08-28 00:28+0200\n"
+"POT-Creation-Date: 2006-09-08 02:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
 "Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -225,17 +225,12 @@
 msgid "Engine: %s   Version: %s   Java Version: %s\n"
 msgstr ""
 
-#: kaffe/kaffe/version.c:58
+#: kaffe/kaffe/version.c:57
 #, c-format
 msgid "Heap defaults: minimum size: %d MB, maximum size: unlimited\n"
 msgstr ""
 
-#: kaffe/kaffe/version.c:61
-#, c-format
-msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
-msgstr ""
-
-#: kaffe/kaffe/version.c:64
+#: kaffe/kaffe/version.c:59
 #, c-format
 msgid "Stack default size: %d KB\n"
 msgstr ""
Index: kaffe/po/zh_CN.po
diff -u kaffe/po/zh_CN.po:1.14 kaffe/po/zh_CN.po:1.15
--- kaffe/po/zh_CN.po:1.14      Tue Aug 29 23:44:35 2006
+++ kaffe/po/zh_CN.po   Sat Sep  9 01:06:17 2006
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-08-28 00:28+0200\n"
+"POT-Creation-Date: 2006-09-08 02:10+0200\n"
 "PO-Revision-Date: 2005-04-13 07:39+0800\n"
 "Last-Translator: DexterK Kidd <[EMAIL PROTECTED]>\n"
 "Language-Team: Simplified Chinese <kaffe@kaffe.org>\n"
@@ -266,17 +266,12 @@
 msgid "Engine: %s   Version: %s   Java Version: %s\n"
 msgstr ""
 
-#: kaffe/kaffe/version.c:58
+#: kaffe/kaffe/version.c:57
 #, c-format
 msgid "Heap defaults: minimum size: %d MB, maximum size: unlimited\n"
 msgstr ""
 
-#: kaffe/kaffe/version.c:61
-#, c-format
-msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
-msgstr ""
-
-#: kaffe/kaffe/version.c:64
+#: kaffe/kaffe/version.c:59
 #, c-format
 msgid "Stack default size: %d KB\n"
 msgstr ""
Index: kaffe/po/zh_TW.po
diff -u kaffe/po/zh_TW.po:1.31 kaffe/po/zh_TW.po:1.32
--- kaffe/po/zh_TW.po:1.31      Tue Aug 29 23:44:35 2006
+++ kaffe/po/zh_TW.po   Sat Sep  9 01:06:17 2006
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Kaffe Virtual Machine 1.1.x-cvs\n"
 "Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-08-28 00:28+0200\n"
+"POT-Creation-Date: 2006-09-08 02:10+0200\n"
 "PO-Revision-Date: 2005-03-06 07:39+0800\n"
 "Last-Translator: Jim Huang <[EMAIL PROTECTED]>\n"
 "Language-Team: Traditional Chinese <kaffe@kaffe.org>\n"
@@ -276,17 +276,16 @@
 msgid "Engine: %s   Version: %s   Java Version: %s\n"
 msgstr "執行引擎： %s   版本： %s   Java版本： %s\n"
 
-#: kaffe/kaffe/version.c:58
+#: kaffe/kaffe/version.c:57
 #, fuzzy, c-format
 msgid "Heap defaults: minimum size: %d MB, maximum size: unlimited\n"
 msgstr "預設 Heap 空間： (最小) %d Mb   (最大) 無限制\n"
 
-#: kaffe/kaffe/version.c:61
-#, fuzzy, c-format
-msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
-msgstr "預設 Heap 空間： (最小) %d Mb   (最大) %d Mb\n"
-
-#: kaffe/kaffe/version.c:64
+#: kaffe/kaffe/version.c:59
 #, c-format
 msgid "Stack default size: %d KB\n"
 msgstr "預設堆疊空間： %d Kb\n"
+
+#, fuzzy
+#~ msgid "Heap defaults: minimum size: %d MB, maximum size: %lu MB\n"
+#~ msgstr "預設 Heap 空間： (最小) %d Mb   (最大) %d Mb\n"
Index: kaffe/test/regression/wc.java
diff -u kaffe/test/regression/wc.java:1.3 kaffe/test/regression/wc.java:1.4
--- kaffe/test/regression/wc.java:1.3   Fri Feb 12 14:29:57 1999
+++ kaffe/test/regression/wc.java       Sat Sep  9 01:06:18 2006
@@ -112,7 +112,7 @@
 
 
 
-// java args: wc < $1
+// java args: wc ../../config/stamp-h1
 /* Expected Output:
-118    321     2379    
+1      3       30      ../../config/stamp-h1
 */

_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

Reply via email to