PatchSet 5006
Date: 2004/07/24 03:04:48
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed build problems on platforms without binreloc
2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffe/main.c (setKaffeAWT, options): Fix definiiton of
prefix to use binreloc's LIBDIR or DEFAULT_KAFFEHOME, depending
on whether binreloc is available and enabled.
(usage): Removed binreloc guard for -Xnative-big-math.
Reported by: Ito Kazumitsu <[EMAIL PROTECTED]>
Members:
ChangeLog:1.2566->1.2567
kaffe/kaffe/main.c:1.62->1.63
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2566 kaffe/ChangeLog:1.2567
--- kaffe/ChangeLog:1.2566 Sat Jul 24 01:43:27 2004
+++ kaffe/ChangeLog Sat Jul 24 03:04:48 2004
@@ -1,5 +1,14 @@
-2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
+2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
+ * kaffe/kaffe/main.c (setKaffeAWT, options): Fix definiiton of
+ prefix to use binreloc's LIBDIR or DEFAULT_KAFFEHOME, depending
+ on whether binreloc is available and enabled.
+ (usage): Removed binreloc guard for -Xnative-big-math.
+
+ Reported by: Ito Kazumitsu <[EMAIL PROTECTED]>
+
+2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
+
Fixed disabling of native AWT code.
* Makefile.am (DIRECTORIES_AFTER_RTJAR): Added explicit support
@@ -96,7 +105,9 @@
tools/gjdoc/Makefile.in,
tools/gjdoc/javalib/Makefile.in:
Regenerated.
-
+
+ Reported by: Mark Wielaard <[EMAIL PROTECTED]>
+
2004-07-23 Guilhem Lavaux <[EMAIL PROTECTED]>
* config/powerpc/darwin/md.h: Define a symbol called DARWIN
Index: kaffe/kaffe/kaffe/main.c
diff -u kaffe/kaffe/kaffe/main.c:1.62 kaffe/kaffe/kaffe/main.c:1.63
--- kaffe/kaffe/kaffe/main.c:1.62 Thu Jul 22 19:03:35 2004
+++ kaffe/kaffe/kaffe/main.c Sat Jul 24 03:04:51 2004
@@ -386,7 +386,14 @@
{
char *newbootcpath;
unsigned int bootcpathlength;
- const char *prefix = LIBDIR;
+ const char *prefix =
+#if defined(ENABLE_BINRELOC)
+ LIBDIR
+#else /* !defined(ENABLE_BINRELOC) */
+ DEFAULT_KAFFEHOME
+#endif /* defined(ENABLE_BINRELOC) */
+ ;
+
const char *suffix = file_separator "kaffeawt.jar";
char *backend_property = strdup(propStr);
userProperty* prop;
@@ -504,7 +511,7 @@
else if (strncmp(argv[i], "-Xkaffe-qte-awt", (j=15)) == 0) {
prop = setKaffeAWT("kaffe.awt.nativelib=qteawt");
}
-#if defined(ENABLE_BINRELOC) && defined(USE_GMP)
+#if defined(USE_GMP)
/* Extra option to use gmp for native, fast bignums.
* Only available with binreloc, since binreloc is used to
* find the gmpjavamath.jar file.
@@ -512,7 +519,14 @@
else if (strncmp(argv[i], "-Xnative-big-math", (j=17)) == 0) {
char *newbootcpath;
unsigned int bootcpathlength;
- const char *prefix = LIBDIR;
+ const char *prefix =
+#if defined(ENABLE_BINRELOC)
+ LIBDIR
+#else /* !defined(ENABLE_BINRELOC) */
+ DEFAULT_KAFFEHOME
+#endif /* defined(ENABLE_BINRELOC) */
+ ;
+
const char *suffix = file_separator "gmpjavamath.jar";
bootcpathlength = strlen(prefix)
@@ -538,7 +552,7 @@
/* set the new boot classpath */
vmargs.bootClasspath = newbootcpath;
}
-#endif /* defined(ENABLE_BINRELOC) && defined(USE_GMP) */
+#endif /* defined(USE_GMP) */
else if (strncmp(argv[i], "-Xbootclasspath/p:", (j=18)) == 0) {
char *newbootcpath;
unsigned int bootcpathlength;
@@ -891,9 +905,9 @@
#ifdef KAFFE_STATS
fprintf(stderr, _(" -vmstats <flag{,flag}> Print VM statistics. Set
flag=all for all\n"));
#endif
-#if defined(ENABLE_BINRELOC) && defined(USE_GMP)
+#if defined(USE_GMP)
fprintf(stderr, _(" -Xnative-big-math Use GMP for faster, native
bignum calculations\n"));
-#endif /* defined(ENABLE_BINRELOC) && defined(USE_GMP) */
+#endif /* defined(USE_GMP) */
fprintf(stderr, _(" -Xkaffe-xlib-awt Use Kaffe's Xlib AWT
backend\n"));
fprintf(stderr, _(" -Xkaffe-qte-awt Use Kaffe's Qt2/3/Embedded AWT
backend\n"));
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
