--- a/hotspot/src/share/vm/runtime/vm_version.cpp Wed Oct 07 15:38:37 2009 -0700
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp Tue Oct 13 12:04:21 2009 -0700
@@ -93,9 +93,13 @@
#else // KERNEL
#ifdef TIERED
#define VMTYPE "Server"
-#else
- #define VMTYPE COMPILER1_PRESENT("Client") \
- COMPILER2_PRESENT("Server")
+#else // TIERED
+#ifdef ZERO
+ #define VMTYPE "Zero"
+#else // ZERO
+ #define VMTYPE COMPILER1_PRESENT("Client") \
+ COMPILER2_PRESENT("Server")
+#endif // ZERO
#endif // TIERED
#endif // KERNEL
@@ -142,10 +146,14 @@
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;