changeset in /hg/icedtea6: 2009-02-20 Gary Benson <gbenson at red...

[Gary Benson]

changeset c6aff898c0b7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c6aff898c0b7
description:
	2009-02-20  Gary Benson  <gbenson at 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.

diffstat:

3 files changed, 26 insertions(+), 8 deletions(-)
ChangeLog                                   |    7 +++++++
patches/hotspot/default/icedtea-shark.patch |   11 +++++------
patches/icedtea-zero-build.patch            |   16 ++++++++++++++--

diffs (79 lines):

diff -r 2a6a1bd55bb8 -r c6aff898c0b7 ChangeLog
--- a/ChangeLog	Fri Feb 20 11:36:04 2009 -0500
+++ b/ChangeLog	Fri Feb 20 11:39:27 2009 -0500
@@ -1,3 +1,10 @@ 2009-02-20  Lillian Angel  <langel at redha
+2009-02-20  Gary Benson  <gbenson at 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 at redhat.com>
 
 	* Makefile.am: Updated md5sum for NETBEANS_PROFILER_MD5SUM, and
diff -r 2a6a1bd55bb8 -r c6aff898c0b7 patches/hotspot/default/icedtea-shark.patch
--- a/patches/hotspot/default/icedtea-shark.patch	Fri Feb 20 11:36:04 2009 -0500
+++ b/patches/hotspot/default/icedtea-shark.patch	Fri Feb 20 11:39:27 2009 -0500
@@ -84,7 +84,7 @@
    if (ProfileInterpreter) {
 --- openjdk/hotspot/src/share/vm/runtime/vm_version.cpp.orig	2008-12-03 14:23:37.000000000 +0000
 +++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-12-03 14:33:48.000000000 +0000
-@@ -94,12 +94,16 @@
+@@ -94,6 +94,9 @@
  #ifdef TIERED
    #define VMTYPE "Server"
  #else
@@ -92,12 +92,11 @@
 +  #define VMTYPE "Shark"
 +#else
  #if defined(COMPILER1) || defined(COMPILER2)
--   #define VMTYPE COMPILER1_PRESENT("Client")   \
--                  COMPILER2_PRESENT("Server")
-+  #define VMTYPE COMPILER1_PRESENT("Client")   \
-+                 COMPILER2_PRESENT("Server")
- #else
+    #define VMTYPE COMPILER1_PRESENT("Client")   \
+                   COMPILER2_PRESENT("Server")
+@@ -104,6 +107,7 @@
    #define VMTYPE "Core"
+ #endif // ZERO
  #endif // COMPILER1 || COMPILER2
 +#endif // SHARK
  #endif // TIERED
diff -r 2a6a1bd55bb8 -r c6aff898c0b7 patches/icedtea-zero-build.patch
--- 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,18 +173,30 @@ diff -r b5e5d2ef906a openjdk/hotspot/src
 diff -r b5e5d2ef906a openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
 --- 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_LIBARCH
++#ifdef ZERO
 +#define CPU      ZERO_LIBARCH
 +#else
  #define CPU      IA32_ONLY("x86")                \
                   IA64_ONLY("ia64")               \
                   AMD64_ONLY("amd64")             \
                   SPARC_ONLY("sparc")
-+#endif // ZERO_LIBARCH
++#endif // ZERO
  
  const char *Abstract_VM_Version::vm_platform_string() {
    return OS "-" CPU;