Mercurial > hg > release > icedtea-1.9
changeset 1655:813c7cc4be0d
2009-02-20 Gary Benson <gbenson@redhat.com>
* patches/icedtea-zero-build.patch: Make Zero builds say "Zero"
in the VM version string as opposed to "Core".
* patches/hotspot/default/icedtea-shark.patch: Fixup for the above.
(transplanted from c6aff898c0b7a8da4a7e8abf8384a3129841ba01)
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Fri, 20 Feb 2009 11:39:27 -0500 |
| parents | ba3c45770b14 |
| children | 257e48559563 |
| files | ChangeLog patches/icedtea-zero-build.patch |
| diffstat | 2 files changed, 36 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Feb 20 11:36:04 2009 -0500 +++ b/ChangeLog Fri Feb 20 11:39:27 2009 -0500 @@ -18,6 +18,13 @@ * patches/hotspot/original/icedtea-includedb.patch, * patches/icedtea-libraries.patch: Recreated. +2009-02-20 Gary Benson <gbenson@redhat.com> + + * patches/icedtea-zero-build.patch: Make Zero builds say "Zero" + in the VM version string as opposed to "Core". + + * patches/hotspot/default/icedtea-shark.patch: Fixup for the above. + 2009-02-20 Lillian Angel <langel@redhat.com> * Makefile.am: Updated md5sum for NETBEANS_PROFILER_MD5SUM, and
--- a/patches/icedtea-zero-build.patch Fri Feb 20 11:36:04 2009 -0500 +++ b/patches/icedtea-zero-build.patch Fri Feb 20 11:39:27 2009 -0500 @@ -173,3 +173,32 @@ // ********************************** // Make sure you set X_PLATFORM and X_ARCH defines correctly. +--- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Thu Jun 19 17:05:23 2008 +0100 ++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp Fri Jun 20 10:29:14 2008 +0100 +@@ -98,7 +98,11 @@ + #define VMTYPE COMPILER1_PRESENT("Client") \ + COMPILER2_PRESENT("Server") + #else ++#ifdef ZERO ++ #define VMTYPE "Zero" ++#else + #define VMTYPE "Core" ++#endif // ZERO + #endif // COMPILER1 || COMPILER2 + #endif // TIERED + #endif // KERNEL +@@ -143,10 +143,14 @@ const char* Abstract_VM_Version::vm_rele + WINDOWS_ONLY("windows") \ + SOLARIS_ONLY("solaris") + ++#ifdef ZERO ++#define CPU ZERO_LIBARCH ++#else + #define CPU IA32_ONLY("x86") \ + IA64_ONLY("ia64") \ + AMD64_ONLY("amd64") \ + SPARC_ONLY("sparc") ++#endif // ZERO + + const char *Abstract_VM_Version::vm_platform_string() { + return OS "-" CPU;