PatchSet 4778
Date: 2004/05/24 17:55:49
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed build with -with-staticvm
2004-05-24 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/sha-1.c,
kaffe/kaffevm/sha-1.h:
Removed. Moved over to libraries/clib/security.
* libraries/clib/security/sha-1.c,
libraries/clib/security/sha-1.h:
New files, moved over from kaffe/kaffevm.
* kaffe/kaffevm/Makefile.am:
(libkaffevm_la_SOURCES) Removed sha-1.c.
(noinst_HEADERS) Removed sha-1.h.
* libraries/clib/security/Makefile.am:
(EXTRA_DIST) Removed kaffe-md5.h.
(SECURITY_SRCS) Added kaffe-md5.h, sha-1.c and sha-1.h.
* kaffe/kaffevm/Makefile.in,
libraries/clib/security/Makefile.in:
Regenerated.
* libraries/clib/security/digest.c:
Include sha-1.h directly.
Members:
ChangeLog:1.2349->1.2350
kaffe/kaffevm/Makefile.am:1.57->1.58
kaffe/kaffevm/Makefile.in:1.148->1.149
libraries/clib/security/Makefile.am:1.11->1.12
libraries/clib/security/Makefile.in:1.71->1.72
libraries/clib/security/digest.c:1.7->1.8
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2349 kaffe/ChangeLog:1.2350
--- kaffe/ChangeLog:1.2349 Mon May 24 17:24:39 2004
+++ kaffe/ChangeLog Mon May 24 17:55:49 2004
@@ -1,5 +1,30 @@
2004-05-24 Dalibor Topic <[EMAIL PROTECTED]>
+ * kaffe/kaffevm/sha-1.c,
+ kaffe/kaffevm/sha-1.h:
+ Removed. Moved over to libraries/clib/security.
+
+ * libraries/clib/security/sha-1.c,
+ libraries/clib/security/sha-1.h:
+ New files, moved over from kaffe/kaffevm.
+
+ * kaffe/kaffevm/Makefile.am:
+ (libkaffevm_la_SOURCES) Removed sha-1.c.
+ (noinst_HEADERS) Removed sha-1.h.
+
+ * libraries/clib/security/Makefile.am:
+ (EXTRA_DIST) Removed kaffe-md5.h.
+ (SECURITY_SRCS) Added kaffe-md5.h, sha-1.c and sha-1.h.
+
+ * kaffe/kaffevm/Makefile.in,
+ libraries/clib/security/Makefile.in:
+ Regenerated.
+
+ * libraries/clib/security/digest.c:
+ Include "sha-1.h" directly.
+
+2004-05-24 Dalibor Topic <[EMAIL PROTECTED]>
+
* libraries/clib/native/Throwable.c:
(java_lang_VMThrowable_fillInStackTrace) Added assert for post-condition.
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.57 kaffe/kaffe/kaffevm/Makefile.am:1.58
--- kaffe/kaffe/kaffevm/Makefile.am:1.57 Tue Apr 27 16:14:23 2004
+++ kaffe/kaffe/kaffevm/Makefile.am Mon May 24 17:55:50 2004
@@ -83,7 +83,6 @@
lookup.c \
object.c \
readClass.c \
- sha-1.c \
soft.c \
stackTrace.c \
stats.c \
@@ -131,7 +130,6 @@
lookup.h \
object.h \
readClass.h \
- sha-1.h \
slib.h \
soft.h \
stackTrace.h \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.148 kaffe/kaffe/kaffevm/Makefile.in:1.149
--- kaffe/kaffe/kaffevm/Makefile.in:1.148 Tue Apr 27 16:14:23 2004
+++ kaffe/kaffe/kaffevm/Makefile.in Mon May 24 17:55:50 2004
@@ -81,7 +81,7 @@
constants.lo debug.lo exception.lo external.lo file.lo \
findInJar.lo fp.lo gc.lo hashtab.lo inflate.lo itypes.lo \
jar.lo jni.lo ksem.lo locks.lo lookup.lo object.lo \
- readClass.lo sha-1.lo soft.lo stackTrace.lo stats.lo string.lo \
+ readClass.lo soft.lo stackTrace.lo stats.lo string.lo \
stringParsing.lo support.lo thread.lo utf8const.lo gcFuncs.lo \
gcRefs.lo verify.lo verify2.lo verify-block.lo verify-debug.lo \
verify-sigstack.lo verify-type.lo verify-uninit.lo
@@ -108,9 +108,9 @@
@AMDEP_TRUE@ ./$(DEPDIR)/ksem.Plo ./$(DEPDIR)/locks.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/lookup.Plo ./$(DEPDIR)/md.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/methodCache.Plo ./$(DEPDIR)/object.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/readClass.Plo ./$(DEPDIR)/sha-1.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/soft.Plo ./$(DEPDIR)/stackTrace.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/stats.Plo ./$(DEPDIR)/string.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/readClass.Plo ./$(DEPDIR)/soft.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/stackTrace.Plo ./$(DEPDIR)/stats.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/string.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/stringParsing.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/support.Plo ./$(DEPDIR)/thread.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/utf8const.Plo \
@@ -443,7 +443,6 @@
lookup.c \
object.c \
readClass.c \
- sha-1.c \
soft.c \
stackTrace.c \
stats.c \
@@ -491,7 +490,6 @@
lookup.h \
object.h \
readClass.h \
- sha-1.h \
slib.h \
soft.h \
stackTrace.h \
@@ -610,7 +608,6 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
Index: kaffe/libraries/clib/security/Makefile.am
diff -u kaffe/libraries/clib/security/Makefile.am:1.11
kaffe/libraries/clib/security/Makefile.am:1.12
--- kaffe/libraries/clib/security/Makefile.am:1.11 Thu Jan 15 02:29:45 2004
+++ kaffe/libraries/clib/security/Makefile.am Mon May 24 17:55:51 2004
@@ -10,13 +10,12 @@
native_LTLIBRARIES = libsecurity.la
-EXTRA_DIST = \
- kaffe_md5.h \
- java.security
-
SECURITY_SRCS = \
- digest.c \
- kaffe_md5.c
+ digest.c \
+ kaffe_md5.c \
+ kaffe_md5.h \
+ sha-1.c \
+ sha-1.h
security_DATA = java.security
Index: kaffe/libraries/clib/security/Makefile.in
diff -u kaffe/libraries/clib/security/Makefile.in:1.71
kaffe/libraries/clib/security/Makefile.in:1.72
--- kaffe/libraries/clib/security/Makefile.in:1.71 Mon Apr 26 16:48:24 2004
+++ kaffe/libraries/clib/security/Makefile.in Mon May 24 17:55:51 2004
@@ -73,14 +73,14 @@
LTLIBRARIES = $(native_LTLIBRARIES)
am__DEPENDENCIES_1 =
libsecurity_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__objects_1 = digest.lo kaffe_md5.lo
+am__objects_1 = digest.lo kaffe_md5.lo sha-1.lo
am_libsecurity_la_OBJECTS = $(am__objects_1)
libsecurity_la_OBJECTS = $(am_libsecurity_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
-I$(top_builddir)/include/kaffe
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
am__depfiles_maybe = depfiles
@[EMAIL PROTECTED] = ./$(DEPDIR)/digest.Plo \
[EMAIL PROTECTED]@ ./$(DEPDIR)/kaffe_md5.Plo
[EMAIL PROTECTED]@ ./$(DEPDIR)/kaffe_md5.Plo ./$(DEPDIR)/sha-1.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
@@ -336,13 +336,12 @@
with_engine = @with_engine@
AM_CPPFLAGS = -I$(top_builddir)/include
native_LTLIBRARIES = libsecurity.la
-EXTRA_DIST = \
- kaffe_md5.h \
- java.security
-
SECURITY_SRCS = \
- digest.c \
- kaffe_md5.c
+ digest.c \
+ kaffe_md5.c \
+ kaffe_md5.h \
+ sha-1.c \
+ sha-1.h
security_DATA = java.security
libsecurity_la_LDFLAGS = \
@@ -425,6 +424,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@
$<; \
Index: kaffe/libraries/clib/security/digest.c
diff -u kaffe/libraries/clib/security/digest.c:1.7
kaffe/libraries/clib/security/digest.c:1.8
--- kaffe/libraries/clib/security/digest.c:1.7 Sun Apr 18 13:57:30 2004
+++ kaffe/libraries/clib/security/digest.c Mon May 24 17:55:51 2004
@@ -24,7 +24,7 @@
#include "../../../kaffe/kaffevm/exception.h"
#include "../../../kaffe/kaffevm/stringSupport.h"
#include "../../../kaffe/kaffevm/fp.h"
-#include "../../../kaffe/kaffevm/sha-1.h"
+#include "sha-1.h"
#include <native.h>
#include "kaffe_security_provider_MD2.h"
#include "kaffe_security_provider_MD4.h"
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
