Mercurial > hg > icedtea8
changeset 1959:777441157d99
Fix CACAO bootstrap issues with b66.
2009-08-04 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Add new CACAO patches.
* patches/cacao/version.patch:
Patch classfile version to 51 (Java 1.7).
* patches/cacao/versioninfo.patch:
Implement JVM_GetVersionInfo.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 05 Aug 2009 11:48:16 +0100 |
| parents | 8d06dc9cbd73 |
| children | 7a7436abd808 |
| files | ChangeLog Makefile.am patches/cacao/version.patch patches/cacao/versioninfo.patch |
| diffstat | 4 files changed, 57 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 04 18:48:17 2009 +0200 +++ b/ChangeLog Wed Aug 05 11:48:16 2009 +0100 @@ -1,3 +1,12 @@ +2009-08-04 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Add new CACAO patches. + * patches/cacao/version.patch: + Patch classfile version to 51 (Java 1.7). + * patches/cacao/versioninfo.patch: + Implement JVM_GetVersionInfo. + 2009-08-04 Matthias Klose <doko@ubuntu.com> * ports/hotspot/src/share/vm/shark/llvmValue.hpp: Adjust to rev 78061.
--- a/Makefile.am Tue Aug 04 18:48:17 2009 +0200 +++ b/Makefile.am Wed Aug 05 11:48:16 2009 +0100 @@ -2085,7 +2085,9 @@ patches/cacao/native-resolve.patch \ patches/cacao/xxoption-warning.patch \ patches/cacao/no-strict-aliasing.patch \ - patches/cacao/openjdk7.patch + patches/cacao/openjdk7.patch \ + patches/cacao/version.patch \ + patches/cacao/versioninfo.patch endif if WITH_CACAO
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/version.patch Wed Aug 05 11:48:16 2009 +0100 @@ -0,0 +1,21 @@ +diff -Nru cacao.orig2/cacao/src/vm/global.h cacao2/cacao/src/vm/global.h +--- cacao.orig/cacao/src/vm/global.h 2009-08-05 01:12:02.000000000 +0100 ++++ cacao/cacao/src/vm/global.h 2009-08-05 01:51:01.000000000 +0100 +@@ -132,14 +132,14 @@ + + /* some Java related defines **************************************************/ + +-#define JAVA_VERSION "1.5.0" /* this version is supported by CACAO */ +-#define CLASS_VERSION "50.0" ++#define JAVA_VERSION "1.7.0" /* this version is supported by CACAO */ ++#define CLASS_VERSION "51.0" + + + /* Java class file constants **************************************************/ + + #define MAGIC 0xCAFEBABE +-#define MAJOR_VERSION 50 ++#define MAJOR_VERSION 51 + #define MINOR_VERSION 0 + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/cacao/versioninfo.patch Wed Aug 05 11:48:16 2009 +0100 @@ -0,0 +1,24 @@ +diff -Nru cacao.orig/cacao/src/native/vm/openjdk/jvm.c cacao/cacao/src/native/vm/openjdk/jvm.c +--- cacao.orig/cacao/src/native/vm/openjdk/jvm.c 2009-08-05 01:22:03.000000000 +0100 ++++ cacao/cacao/src/native/vm/openjdk/jvm.c 2009-08-05 01:48:46.000000000 +0100 +@@ -3645,7 +3645,19 @@ + + void JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size) + { +- log_println("JVM_GetVersionInfo: IMPLEMENT ME!"); ++ TRACEJVMCALLS(("JVM_GetVersionInfo(env=%p, info=%p, info_size=%ld)", env, info, info_size)); ++ ++ memset(info, 0, sizeof(info_size)); ++ ++ int major = atoi(VERSION); ++ const char* minor_string = strchr(VERSION, '.'); ++ int minor = atoi(++minor_string); ++ int micro = atoi(strchr(minor_string, '.') + 1); ++ ++ info->jvm_version = (major << 24) | (minor << 16) | (micro << 8); ++ info->update_version = 0; ++ info->special_update_version = 0; ++ info->is_attachable = 0; + } + +