src/hotspot/share/runtime/abstract_vm_version.cpp

rev 59103 : imported patch hotspot

*** 173,183 ****
    return VERSION_STRING;
  }
  
  #define OS       LINUX_ONLY("linux")             \
                   WINDOWS_ONLY("windows")         \
-                  SOLARIS_ONLY("solaris")         \
                   AIX_ONLY("aix")                 \
                   BSD_ONLY("bsd")
  
  #ifndef CPU
  #ifdef ZERO
--- 173,182 ----
*** 191,202 ****
  #else
  #define CPU      AARCH64_ONLY("aarch64")         \
                   AMD64_ONLY("amd64")             \
                   IA32_ONLY("x86")                \
                   IA64_ONLY("ia64")               \
!                  S390_ONLY("s390")               \
!                  SPARC_ONLY("sparc")
  #endif // !ZERO
  #endif // !CPU
  
  const char *Abstract_VM_Version::vm_platform_string() {
    return OS "-" CPU;
--- 190,200 ----
  #else
  #define CPU      AARCH64_ONLY("aarch64")         \
                   AMD64_ONLY("amd64")             \
                   IA32_ONLY("x86")                \
                   IA64_ONLY("ia64")               \
!                  S390_ONLY("s390")
  #endif // !ZERO
  #endif // !CPU
  
  const char *Abstract_VM_Version::vm_platform_string() {
    return OS "-" CPU;