summaryrefslogtreecommitdiff
path: root/java/sablevm/files
diff options
context:
space:
mode:
authorArchie Cobbs <archie@FreeBSD.org>2004-06-17 15:25:29 +0000
committerArchie Cobbs <archie@FreeBSD.org>2004-06-17 15:25:29 +0000
commit04b14f7d461286188aa8ac27567b8b3fbc55c2e2 (patch)
tree8b5f8e221b8bb4b3cee2d925b68f1fc76792cba3 /java/sablevm/files
parentIntroduce the new maintainer Bjorn Lindstrom (diff)
Upgrade to version 1.1.5.
Submitted by: Roman Kennke <roman@ontographics.com>
Notes
Notes: svn path=/head/; revision=111670
Diffstat (limited to 'java/sablevm/files')
-rw-r--r--java/sablevm/files/extra-patch-aa11
-rw-r--r--java/sablevm/files/extra-patch-ab10
-rw-r--r--java/sablevm/files/patch-aa70
-rw-r--r--java/sablevm/files/patch-ab11
-rw-r--r--java/sablevm/files/patch-ac12
-rw-r--r--java/sablevm/files/patch-ad12
-rw-r--r--java/sablevm/files/patch-ae20
-rw-r--r--java/sablevm/files/patch-af12
-rw-r--r--java/sablevm/files/patch-ag16
-rw-r--r--java/sablevm/files/patch-ah11
-rw-r--r--java/sablevm/files/patch-ai16
-rw-r--r--java/sablevm/files/patch-aj11
-rw-r--r--java/sablevm/files/patch-ak10
-rw-r--r--java/sablevm/files/patch-al140
-rw-r--r--java/sablevm/files/patch-am18
-rw-r--r--java/sablevm/files/patch-an12
-rw-r--r--java/sablevm/files/patch-ao20
-rw-r--r--java/sablevm/files/patch-ap12
-rw-r--r--java/sablevm/files/patch-aq12
-rw-r--r--java/sablevm/files/patch-ar15
20 files changed, 0 insertions, 451 deletions
diff --git a/java/sablevm/files/extra-patch-aa b/java/sablevm/files/extra-patch-aa
deleted file mode 100644
index a6a5e5172e55..000000000000
--- a/java/sablevm/files/extra-patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/sablevm-native-library-1.0.6/src/Makefile.in.orig Wed Feb 19 22:40:03 2003
-+++ work/sablevm-native-library-1.0.6/src/Makefile.in Sat Feb 22 20:01:14 2003
-@@ -77,7 +77,7 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
-
--SUBDIRS = include jni-include classpath fdlibm java-io java-lang java-net java-util gnu-java-awt-peer-gtk
-+SUBDIRS = include jni-include classpath fdlibm java-io java-lang java-net java-util
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../src/include/config.h
diff --git a/java/sablevm/files/extra-patch-ab b/java/sablevm/files/extra-patch-ab
deleted file mode 100644
index e5df24f34cb1..000000000000
--- a/java/sablevm/files/extra-patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur work.orig/sablevm-native-library-1.0.6/src/Makefile.am work/sablevm-native-library-1.0.6/src/Makefile.am
---- work.orig/sablevm-native-library-1.0.6/src/Makefile.am Sun Jul 28 17:14:15 2002
-+++ work/sablevm-native-library-1.0.6/src/Makefile.am Sun Aug 18 17:26:09 2002
-@@ -44,5 +44,4 @@
- java-io \
- java-lang \
- java-net \
-- java-util \
-- gnu-java-awt-peer-gtk
-+ java-util
diff --git a/java/sablevm/files/patch-aa b/java/sablevm/files/patch-aa
deleted file mode 100644
index 68c95dff84ab..000000000000
--- a/java/sablevm/files/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
---- work/sablevm-1.0.6/configure.orig Wed Feb 19 22:28:32 2003
-+++ work/sablevm-1.0.6/configure Thu Feb 20 13:35:35 2003
-@@ -8088,67 +8088,6 @@
- echo ***ERROR: libpopt is missing; exit 1
- fi
-
--echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
--echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6
--if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char pthread_self ();
--int
--main ()
--{
--pthread_self ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_pthread_pthread_self=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_pthread_pthread_self=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5
--echo "${ECHO_T}$ac_cv_lib_pthread_pthread_self" >&6
--if test $ac_cv_lib_pthread_pthread_self = yes; then
-- echo -n
--else
-- echo ***ERROR: libpthread is missing; exit 1
--fi
--
--
- echo "$as_me:$LINENO: checking for ANSI C header files" >&5
- echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
- if test "${ac_cv_header_stdc+set}" = set; then
diff --git a/java/sablevm/files/patch-ab b/java/sablevm/files/patch-ab
deleted file mode 100644
index 87511ee245f3..000000000000
--- a/java/sablevm/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur work.orig/sablevm-1.0.6/configure.ac work/sablevm-1.0.6/configure.ac
---- work.orig/sablevm-1.0.6/configure.ac Wed Aug 14 22:29:54 2002
-+++ work/sablevm-1.0.6/configure.ac Sat Aug 17 21:14:51 2002
-@@ -119,7 +119,6 @@
- AC_CHECK_LIB(ltdl,lt_dlinit,echo -n,echo ***ERROR: libltdl is missing; exit 1)
- AC_CHECK_LIB(m,fmod,echo -n,echo ***ERROR: libm is missing; exit 1)
- AC_CHECK_LIB(popt,poptGetContext,echo -n,echo ***ERROR: libpopt is missing; exit 1)
--AC_CHECK_LIB(pthread,pthread_self,echo -n,echo ***ERROR: libpthread is missing; exit 1)
-
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/java/sablevm/files/patch-ac b/java/sablevm/files/patch-ac
deleted file mode 100644
index f3a5fb701815..000000000000
--- a/java/sablevm/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur work.orig/sablevm-1.0.6/src/libsablevm/Makefile.am work/sablevm-1.0.6/src/libsablevm/Makefile.am
---- work.orig/sablevm-1.0.6/src/libsablevm/Makefile.am Sun Aug 11 14:33:05 2002
-+++ work/sablevm-1.0.6/src/libsablevm/Makefile.am Sat Aug 17 21:14:51 2002
-@@ -306,7 +306,7 @@
- rm -f util.c
- rm -f vm_args.c
-
--libsablevm_la_LIBADD = -lpthread -lm -lffi -lltdl
-+libsablevm_la_LIBADD = -lm -L@libdir@ -lffi -lltdl
-
- libsablevm_la_LDFLAGS = -version-info @LIBRARY_VERSION@
-
diff --git a/java/sablevm/files/patch-ad b/java/sablevm/files/patch-ad
deleted file mode 100644
index 4b3383f1b369..000000000000
--- a/java/sablevm/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur work.orig/sablevm-1.0.6/src/libsablevm/Makefile.in work/sablevm-1.0.6/src/libsablevm/Makefile.in
---- work.orig/sablevm-1.0.6/src/libsablevm/Makefile.in Wed Aug 14 22:34:07 2002
-+++ work/sablevm-1.0.6/src/libsablevm/Makefile.in Sat Aug 17 21:14:51 2002
-@@ -245,7 +245,7 @@
- vm_args.m4.c
-
-
--libsablevm_la_LIBADD = -lpthread -lm -lffi -lltdl
-+libsablevm_la_LIBADD = -lm -L@libdir@ -lffi -lltdl
-
- libsablevm_la_LDFLAGS = -version-info @LIBRARY_VERSION@
-
diff --git a/java/sablevm/files/patch-ae b/java/sablevm/files/patch-ae
deleted file mode 100644
index 74b26da9d4b0..000000000000
--- a/java/sablevm/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- work/sablevm-class-library-1.0.6/src/java/io/LineNumberReader.java.orig Mon Dec 9 19:12:35 2002
-+++ work/sablevm-class-library-1.0.6/src/java/io/LineNumberReader.java Mon Dec 9 19:12:02 2002
-@@ -115,7 +115,7 @@
- public
- LineNumberReader(Reader in, int size)
- {
-- super(new PushbackReader(in), size);
-+ super(in, size);
- }
-
- /*************************************************************************/
-@@ -243,7 +243,7 @@
- int extra_char_read = super.read();
-
- if ((extra_char_read != '\n') && (extra_char_read != -1))
-- ((PushbackReader)in).unread(extra_char_read);
-+ pos--;
-
- char_read = '\n';
- ++line_number;
diff --git a/java/sablevm/files/patch-af b/java/sablevm/files/patch-af
deleted file mode 100644
index 8d76863351c6..000000000000
--- a/java/sablevm/files/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
---- work/sablevm-1.0.6/src/libsablevm/thread.c.orig Fri Dec 13 11:29:17 2002
-+++ work/sablevm-1.0.6/src/libsablevm/thread.c Fri Dec 13 11:29:19 2002
-@@ -229,7 +229,8 @@
- void *new_stack;
-
- /* detect overflows */
-- if (new_size <= current_size)
-+ if ((vm->stack_max_size != 0 && new_size > vm->stack_max_size) ||
-+ new_size <= current_size)
- {
- _svmf_error_OutOfMemoryError (env);
- return JNI_ERR;
diff --git a/java/sablevm/files/patch-ag b/java/sablevm/files/patch-ag
deleted file mode 100644
index 81afb5dbc71a..000000000000
--- a/java/sablevm/files/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur work.orig/sablevm-native-library-1.0.6/src/gnu-java-awt-peer-gtk/Makefile.am work/sablevm-native-library-1.0.6/src/gnu-java-awt-peer-gtk/Makefile.am
---- work.orig/sablevm-native-library-1.0.6/src/gnu-java-awt-peer-gtk/Makefile.am Sun Jul 28 17:14:15 2002
-+++ work/sablevm-native-library-1.0.6/src/gnu-java-awt-peer-gtk/Makefile.am Mon Aug 19 09:02:01 2002
-@@ -75,9 +75,9 @@
- INCLUDES = \
- -I@top_srcdir@/src/include \
- -I@top_srcdir@/src/jni-include \
-- -I/usr/include/gtk-1.2 \
-- -I/usr/include/glib-1.2 \
-+ -I/usr/X11R6/include/gtk12 \
-+ -I/usr/local/include/glib12 \
- -I/usr/lib/glib/include \
- -I/usr/X11R6/include \
-- -I/usr/include/gnome-1.0 \
-+ -I/usr/X11R6/include/gnome-1.0 \
- -I@top_srcdir@/src/classpath
diff --git a/java/sablevm/files/patch-ah b/java/sablevm/files/patch-ah
deleted file mode 100644
index 31a36c64cd84..000000000000
--- a/java/sablevm/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- work/sablevm-native-library-1.0.6/src/gnu-java-awt-peer-gtk/Makefile.in.orig Wed Feb 19 22:40:07 2003
-+++ work/sablevm-native-library-1.0.6/src/gnu-java-awt-peer-gtk/Makefile.in Thu Feb 20 13:39:55 2003
-@@ -84,7 +84,7 @@
-
- # gnu_java_awt_image_GdkPixbufDecoder.c
-
--INCLUDES = -I@top_srcdir@/src/include -I@top_srcdir@/src/jni-include -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gnome-1.0 -I@top_srcdir@/src/classpath
-+INCLUDES = -I@top_srcdir@/src/include -I@top_srcdir@/src/jni-include -I/usr/X11R6/include/gtk12 -I/usr/local/include/glib12 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/X11R6/include/gnome-1.0 -I@top_srcdir@/src/classpath
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../src/include/config.h
diff --git a/java/sablevm/files/patch-ai b/java/sablevm/files/patch-ai
deleted file mode 100644
index f7be9ebd6bab..000000000000
--- a/java/sablevm/files/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
---- work.orig/sablevm-native-library-1.0.6/src/fdlibm/mprec.h.orig Thu Aug 22 21:32:46 2002
-+++ work/sablevm-native-library-1.0.6/src/fdlibm/mprec.h Thu Aug 22 21:35:34 2002
-@@ -57,11 +57,11 @@
-
- /* ISO C99 int type declarations */
-
--#if !defined HAVE_INT32_DEFINED && defined HAVE_BSD_INT32_DEFINED
-+#if 0
- typedef u_int32_t uint32_t;
- #endif
-
--#if !defined HAVE_BSD_INT32_DEFINED && !defined HAVE_INT32_DEFINED
-+#if 0
- // FIXME -- this could have problems with systems that don't define SI to be 4
- typedef int int32_t __attribute__ ((mode (SI)));
-
diff --git a/java/sablevm/files/patch-aj b/java/sablevm/files/patch-aj
deleted file mode 100644
index de37e06d1fd6..000000000000
--- a/java/sablevm/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- work.orig/sablevm-native-library-1.0.6/src/classpath/jcl.c Tue Jan 22 16:16:06 2002
-+++ work/sablevm-native-library-1.0.6/src/classpath/jcl.c Fri Aug 30 10:21:41 2002
-@@ -37,7 +37,7 @@
-
- #include <stdio.h>
- #include <jcl.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- static char errstr[4098]; // this way the memory is pre-allocated, so that we do not have to worry if we are out of memory.
-
diff --git a/java/sablevm/files/patch-ak b/java/sablevm/files/patch-ak
deleted file mode 100644
index 2db2490f8be5..000000000000
--- a/java/sablevm/files/patch-ak
+++ /dev/null
@@ -1,10 +0,0 @@
---- work.orig/sablevm-native-library-1.0.6/src/java-io/javaio.c Tue Jan 22 16:16:06 2002
-+++ work/sablevm-native-library-1.0.6/src/java-io/javaio.c Fri Aug 30 10:21:47 2002
-@@ -43,7 +43,6 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/stat.h>
--#include <malloc.h>
-
- #include <jni.h>
- #include <jcl.h>
diff --git a/java/sablevm/files/patch-al b/java/sablevm/files/patch-al
deleted file mode 100644
index e462ba8e1898..000000000000
--- a/java/sablevm/files/patch-al
+++ /dev/null
@@ -1,140 +0,0 @@
-#--- work/sablevm-1.0.6/src/libsablevm/instructions.m4.c.orig Tue Sep 10 10:35:39 2002
-#+++ work/sablevm-1.0.6/src/libsablevm/instructions.m4.c Mon Dec 16 17:28:28 2002
-#@@ -4838,10 +4838,28 @@
-# }
-#
-# addr[0].jint = methodref_info->method->java_args_count;
-#- addr[1].offset =
-#- sizeof (_svmt_vtable) +
-#- (methodref_info->method->method_id *
-#- sizeof (_svmt_method_info *));
-#+
-#+ /*
-#+ * _svmf_resolve_CONSTANT_Methodref() may return an interface
-#+ * method in certain situations (e.g., invoking an interface
-#+ * method that's implemented in a subclass of an abstract class
-#+ * not implementing the method but implementing the interface).
-#+ */
-#+ if (_svmf_is_set_flag
-#+ (methodref_info->method->class_info->access_flags,
-#+ SVM_ACC_INTERFACE))
-#+ {
-#+ addr[1].offset =
-#+ -((1 + methodref_info->method->method_id) *
-#+ sizeof (_svmt_method_info *));
-#+ }
-#+ else
-#+ {
-#+ addr[1].offset =
-#+ sizeof (_svmt_vtable) +
-#+ (methodref_info->method->method_id *
-#+ sizeof (_svmt_method_info *));
-#+ }
-#
-# /* execute bytecode */
-# {
---- work/sablevm-1.0.6/src/libsablevm/instructions_preparation_direct_threaded.c.orig Wed Oct 16 14:54:30 2002
-+++ work/sablevm-1.0.6/src/libsablevm/instructions_preparation_direct_threaded.c Mon Dec 16 17:28:29 2002
-@@ -17905,10 +17905,28 @@
- }
-
- addr[0].jint = methodref_info->method->java_args_count;
-- addr[1].offset =
-- sizeof (_svmt_vtable) +
-- (methodref_info->method->method_id *
-- sizeof (_svmt_method_info *));
-+
-+ /*
-+ * _svmf_resolve_CONSTANT_Methodref() may return an interface
-+ * method in certain situations (e.g., invoking an interface
-+ * method that's implemented in a subclass of an abstract class
-+ * not implementing the method but implementing the interface).
-+ */
-+ if (_svmf_is_set_flag
-+ (methodref_info->method->class_info->access_flags,
-+ SVM_ACC_INTERFACE))
-+ {
-+ addr[1].offset =
-+ -((1 + methodref_info->method->method_id) *
-+ sizeof (_svmt_method_info *));
-+ }
-+ else
-+ {
-+ addr[1].offset =
-+ sizeof (_svmt_vtable) +
-+ (methodref_info->method->method_id *
-+ sizeof (_svmt_method_info *));
-+ }
-
- /* execute bytecode */
- {
---- work/sablevm-1.0.6/src/libsablevm/instructions_preparation_inlined_threaded.c.orig Wed Oct 16 14:54:31 2002
-+++ work/sablevm-1.0.6/src/libsablevm/instructions_preparation_inlined_threaded.c Mon Dec 16 17:28:29 2002
-@@ -21512,10 +21512,28 @@
- }
-
- addr[0].jint = methodref_info->method->java_args_count;
-- addr[1].offset =
-- sizeof (_svmt_vtable) +
-- (methodref_info->method->method_id *
-- sizeof (_svmt_method_info *));
-+
-+ /*
-+ * _svmf_resolve_CONSTANT_Methodref() may return an interface
-+ * method in certain situations (e.g., invoking an interface
-+ * method that's implemented in a subclass of an abstract class
-+ * not implementing the method but implementing the interface).
-+ */
-+ if (_svmf_is_set_flag
-+ (methodref_info->method->class_info->access_flags,
-+ SVM_ACC_INTERFACE))
-+ {
-+ addr[1].offset =
-+ -((1 + methodref_info->method->method_id) *
-+ sizeof (_svmt_method_info *));
-+ }
-+ else
-+ {
-+ addr[1].offset =
-+ sizeof (_svmt_vtable) +
-+ (methodref_info->method->method_id *
-+ sizeof (_svmt_method_info *));
-+ }
-
- /* execute bytecode */
- {
---- work/sablevm-1.0.6/src/libsablevm/instructions_switch.c.orig Wed Oct 16 14:54:31 2002
-+++ work/sablevm-1.0.6/src/libsablevm/instructions_switch.c Mon Dec 16 17:28:29 2002
-@@ -15936,10 +15936,28 @@
- }
-
- addr[0].jint = methodref_info->method->java_args_count;
-- addr[1].offset =
-- sizeof (_svmt_vtable) +
-- (methodref_info->method->method_id *
-- sizeof (_svmt_method_info *));
-+
-+ /*
-+ * _svmf_resolve_CONSTANT_Methodref() may return an interface
-+ * method in certain situations (e.g., invoking an interface
-+ * method that's implemented in a subclass of an abstract class
-+ * not implementing the method but implementing the interface).
-+ */
-+ if (_svmf_is_set_flag
-+ (methodref_info->method->class_info->access_flags,
-+ SVM_ACC_INTERFACE))
-+ {
-+ addr[1].offset =
-+ -((1 + methodref_info->method->method_id) *
-+ sizeof (_svmt_method_info *));
-+ }
-+ else
-+ {
-+ addr[1].offset =
-+ sizeof (_svmt_vtable) +
-+ (methodref_info->method->method_id *
-+ sizeof (_svmt_method_info *));
-+ }
-
- /* execute bytecode */
- {
diff --git a/java/sablevm/files/patch-am b/java/sablevm/files/patch-am
deleted file mode 100644
index faca76947389..000000000000
--- a/java/sablevm/files/patch-am
+++ /dev/null
@@ -1,18 +0,0 @@
---- work/sablevm-1.0.6/src/libsablevm/gc_copying.c.orig Tue Dec 10 11:51:13 2002
-+++ work/sablevm-1.0.6/src/libsablevm/gc_copying.c Tue Dec 10 11:51:34 2002
-@@ -1054,14 +1054,7 @@
- return JNI_ERR;
- }
-
-- {
-- size_t i;
--
-- for (i = 0; i < instance_size; i++)
-- {
-- ((char *) result)[i] = 0;
-- }
-- }
-+ memset(result, 0, instance_size);
-
- *pinstance = result;
-
diff --git a/java/sablevm/files/patch-an b/java/sablevm/files/patch-an
deleted file mode 100644
index 5457c2fb42d2..000000000000
--- a/java/sablevm/files/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
---- work/sablevm-1.0.6/src/sablevm/sablevm.c.orig Thu Oct 24 07:52:16 2002
-+++ work/sablevm-1.0.6/src/sablevm/sablevm.c Thu Feb 20 13:32:59 2003
-@@ -1431,6 +1431,9 @@
- exit_status = EXIT_FAILURE;
- goto cleanup;
- }
-+
-+ /* free up local native reference */
-+ (*env)->DeleteLocalRef (env, s);
- }
- }
-
diff --git a/java/sablevm/files/patch-ao b/java/sablevm/files/patch-ao
deleted file mode 100644
index c29fb8669e2c..000000000000
--- a/java/sablevm/files/patch-ao
+++ /dev/null
@@ -1,20 +0,0 @@
---- work/sablevm-class-library-1.0.6/src/gnu/java/io/encode/EncoderUTF8.java.orig Thu Feb 20 14:00:06 2003
-+++ work/sablevm-class-library-1.0.6/src/gnu/java/io/encode/EncoderUTF8.java Thu Feb 20 14:00:36 2003
-@@ -85,7 +85,7 @@
- {
- int num_bytes = 0;
-
-- for (int i = offset; i < len; i++)
-+ for (int i = offset; i < offset + len; i++)
- {
- if (buf[i] <= 0x007F)
- ++num_bytes;
-@@ -107,7 +107,7 @@
- convertToBytes(char[] buf, int buf_offset, int len, byte[] bbuf,
- int bbuf_offset)
- {
-- for (int i = buf_offset; i < len; i++)
-+ for (int i = buf_offset; i < buf_offset + len; i++)
- {
- if (buf[i] >= 0x0000 && buf[i] <= 0x007F)
- {
diff --git a/java/sablevm/files/patch-ap b/java/sablevm/files/patch-ap
deleted file mode 100644
index 51c94bd1f401..000000000000
--- a/java/sablevm/files/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
---- work/sablevm-1.0.6/src/libsablevm/class_loader.c.orig Thu Feb 20 13:58:04 2003
-+++ work/sablevm-1.0.6/src/libsablevm/class_loader.c Thu Feb 20 14:02:19 2003
-@@ -299,8 +299,7 @@
- }
-
- /* check version and name */
-- if (!(class->major_version == 45 ||
-- (class->major_version == 46 && class->minor_version == 0)))
-+ if (!(class->major_version >= 45 && class->major_version <= 48))
- {
- _svmf_error_UnsupportedClassVersionError (env);
- return JNI_ERR;
diff --git a/java/sablevm/files/patch-aq b/java/sablevm/files/patch-aq
deleted file mode 100644
index 752b87cfe70b..000000000000
--- a/java/sablevm/files/patch-aq
+++ /dev/null
@@ -1,12 +0,0 @@
---- work/sablevm-1.0.6/src/libsablevm/java_lang_VMClassLoader.c.orig Wed Mar 19 16:21:51 2003
-+++ work/sablevm-1.0.6/src/libsablevm/java_lang_VMClassLoader.c Wed Mar 19 16:22:20 2003
-@@ -460,8 +460,7 @@
- }
-
- /* check version and name */
-- if (!(class->major_version == 45 ||
-- (class->major_version == 46 && class->minor_version == 0)))
-+ if (!(class->major_version >= 45 && class->major_version <= 48))
- {
- _svmf_error_UnsupportedClassVersionError (env);
- goto end;
diff --git a/java/sablevm/files/patch-ar b/java/sablevm/files/patch-ar
deleted file mode 100644
index 2f95eab3e596..000000000000
--- a/java/sablevm/files/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
---- work/sablevm-class-library-1.0.6/src/java/lang/ClassLoader.java.orig Wed Mar 19 16:28:55 2003
-+++ work/sablevm-class-library-1.0.6/src/java/lang/ClassLoader.java Wed Mar 19 16:13:56 2003
-@@ -913,9 +913,12 @@
- try
- {
- // Give the new system class loader a null parent.
-+ /***********
- Constructor c = Class.forName(loader).getConstructor
- ( new Class[] { ClassLoader.class } );
- return (ClassLoader) c.newInstance(new Object[1]);
-+ ***********/
-+ return new gnu.java.lang.SystemClassLoader(null);
- }
- catch (Exception e)
- {