PatchSet 5521
Date: 2005/02/13 16:20:37
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Sparc, jitBasic, build fix.
* config/sparc/sysdepCallMethod.h
(sysdepCallMethod): Removed special cases 'C', 'B', 'Z' and 'S'
because all integers must be stored in the 32 bits format internally.
This reverts an old patch.
* configure.ac: Check for strtouq and strtoull.
* Makefile.am
(BUILD_ENVIRONMENT): Append the new directory to the old
LD_LIBRARY_PATH and DYLD_LIBRARY_PATH.
* test/internal/jitBasic.c
(field2values): Use either strtouq or strtoull.
* config/config.h.in, Makefile.in, configure: Regenerated.
Members:
ChangeLog:1.3565->1.3566
Makefile.am:1.88->1.89
Makefile.in:1.202->1.203
configure:1.425->1.426
configure.ac:1.115->1.116
config/config.h.in:1.133->1.134
config/sparc/sysdepCallMethod.h:1.4->1.5
test/internal/jitBasic.c:1.6->1.7
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3565 kaffe/ChangeLog:1.3566
--- kaffe/ChangeLog:1.3565 Fri Feb 11 04:56:10 2005
+++ kaffe/ChangeLog Sun Feb 13 16:20:37 2005
@@ -1,3 +1,21 @@
+2005-02-12 Guilhem Lavaux <[EMAIL PROTECTED]>
+
+ * config/sparc/sysdepCallMethod.h
+ (sysdepCallMethod): Removed special cases 'C', 'B', 'Z' and 'S'
+ because all integers must be stored in the 32 bits format internally.
+ This reverts an old patch.
+
+ * configure.ac: Check for strtouq and strtoull.
+
+ * Makefile.am
+ (BUILD_ENVIRONMENT): Append the new directory to the old
+ LD_LIBRARY_PATH and DYLD_LIBRARY_PATH.
+
+ * test/internal/jitBasic.c
+ (field2values): Use either strtouq or strtoull.
+
+ * config/config.h.in, Makefile.in, configure: Regenerated.
+
2005-02-10 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/gnu/classpath/Configuration.java.in: New file.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.88 kaffe/Makefile.am:1.89
--- kaffe/Makefile.am:1.88 Tue Feb 8 00:15:01 2005
+++ kaffe/Makefile.am Sun Feb 13 16:20:41 2005
@@ -160,8 +160,8 @@
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for
f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' ';
echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH
>> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
- echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
- echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
+ echo
LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs:\$${LD_LIBRARY_PATH}\;
export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
+ echo
DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs:\$${DYLD_LIBRARY_PATH}\;
export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.202 kaffe/Makefile.in:1.203
--- kaffe/Makefile.in:1.202 Fri Feb 11 04:56:12 2005
+++ kaffe/Makefile.in Sun Feb 13 16:20:41 2005
@@ -988,8 +988,8 @@
echo
CLASSPATH=.\''$(PATHSEP)'\'\$${GNU_CRYPTO_JAR}\''$(PATHSEP)'\'\$${JAVAX_SECURITY_JAR}\''$(PATHSEP)'\'$(BCEL_JAR)\''$(PATHSEP)'\'$(GNU_CRYPTO_JAR)\''$(PATHSEP)'\'$(JAVAX_SECURITY_JAR)\;
export CLASSPATH | sed 's,/,$(DIRSEP),g;s,\\,\\\\,g' >> BUILD_ENVIRONMENT.new;
\
echo
KAFFELIBRARYPATH=\$${KAFFELIBRARYPATH+\"\$$KAFFELIBRARYPATH\"\''$(PATHSEP)'\'}`for
f in $(JAVA_LIBS); do echo "$$f" | sed 's%/[^/]*$$%%'; done | (tr '\012' ' ';
echo) | sed -e 's/ $$//' -e "s/ /\'$(PATHSEP)\'/g"`\; export KAFFELIBRARYPATH
>> BUILD_ENVIRONMENT.new; \
echo JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)\; export JAVA
>> BUILD_ENVIRONMENT.new; \
- echo LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
- echo DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs\;
export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
+ echo
LD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs:\$${LD_LIBRARY_PATH}\;
export LD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new;\
+ echo
DYLD_LIBRARY_PATH=$(top_builddir)/libraries/clib/classpath/.libs:\$${DYLD_LIBRARY_PATH}\;
export DYLD_LIBRARY_PATH >> BUILD_ENVIRONMENT.new
rm -f BUILD_ENVIRONMENT
mv BUILD_ENVIRONMENT.new BUILD_ENVIRONMENT
Index: kaffe/configure
diff -u kaffe/configure:1.425 kaffe/configure:1.426
--- kaffe/configure:1.425 Fri Feb 11 04:56:12 2005
+++ kaffe/configure Sun Feb 13 16:20:30 2005
@@ -42893,7 +42893,9 @@
-for ac_func in strdup strstr strtod strtol strtoul
+
+
+for ac_func in strdup strstr strtod strtol strtoul strtouq strtoull
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.115 kaffe/configure.ac:1.116
--- kaffe/configure.ac:1.115 Fri Feb 11 04:56:18 2005
+++ kaffe/configure.ac Sun Feb 13 16:20:30 2005
@@ -1381,7 +1381,7 @@
LIBS="$M_LIBS $LIBS"
AC_CHECK_FUNCS([remainder remainderf fmod fmodf drem])
AC_CHECK_FUNCS([rint floor ceil strtod mergesort])
-AC_CHECK_FUNCS([strdup strstr strtod strtol strtoul])
+AC_CHECK_FUNCS([strdup strstr strtod strtol strtoul strtouq strtoull])
dnl isinf, isnan, finite checking code taken from Sablotron 1.0,
dnl dually licensed licensed under MPL 1.1 and GPL
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.133 kaffe/config/config.h.in:1.134
--- kaffe/config/config.h.in:1.133 Fri Feb 11 04:56:19 2005
+++ kaffe/config/config.h.in Sun Feb 13 16:20:42 2005
@@ -534,6 +534,12 @@
/* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
+/* Define to 1 if you have the `strtoull' function. */
+#undef HAVE_STRTOULL
+
+/* Define to 1 if you have the `strtouq' function. */
+#undef HAVE_STRTOUQ
+
/* Define to 1 if <netinet/in.h> defines `struct in6_addr' */
#undef HAVE_STRUCT_IN6_ADDR
Index: kaffe/config/sparc/sysdepCallMethod.h
diff -u kaffe/config/sparc/sysdepCallMethod.h:1.4
kaffe/config/sparc/sysdepCallMethod.h:1.5
--- kaffe/config/sparc/sysdepCallMethod.h:1.4 Thu Aug 26 10:10:46 2004
+++ kaffe/config/sparc/sysdepCallMethod.h Sun Feb 13 16:20:42 2005
@@ -129,23 +129,10 @@
break;
case 1:
- switch(call->rettype) {
- case 'F':
+ if (call->rettype == 'F')
call->ret->f = ((jfloat (*)(ARG_TYPES))(func))(ARG_LIST);
- break;
- case 'Z':
- case 'B':
- call->ret->b = ((jint (*)(ARG_TYPES))(func))(ARG_LIST);
- break;
- case 'C':
- case 'S':
- call->ret->s = ((jint (*)(ARG_TYPES))(func))(ARG_LIST);
- break;
- default:
+ else
call->ret->i = ((jint (*)(ARG_TYPES))(func))(ARG_LIST);
- break;
- }
-
break;
default:
Index: kaffe/test/internal/jitBasic.c
diff -u kaffe/test/internal/jitBasic.c:1.6 kaffe/test/internal/jitBasic.c:1.7
--- kaffe/test/internal/jitBasic.c:1.6 Sun Jan 30 12:42:46 2005
+++ kaffe/test/internal/jitBasic.c Sun Feb 13 16:20:43 2005
@@ -117,7 +117,13 @@
dst[lpc - 1].i = strtoul(arg->data, 0, 0);
break;
case 'J':
+#if defined(HAVE_STRTOULL)
+ dst[lpc - 1].j = (long long)strtoull(arg->data, 0, 0);
+#elif defined(HAVE_STRTOUQ)
dst[lpc - 1].j = (long long)strtouq(arg->data, 0, 0);
+#else
+#error "jitBasic needs either strtoull or strtouq."
+#endif
break;
case 'D':
case 'F':
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
