6890308: integrate zero assembler hotspot changes

Reviewed-by: never

hotspot/src/share/vm/runtime/vm_version.cpp

@@ -93,9 +93,13 @@ void Abstract_VM_Version::initialize() {
 #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 @@ const char* Abstract_VM_Version::vm_release() {
                  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;