src/hotspot/share/runtime/abstract_vm_version.cpp

rev 59383 : [mq]: final

*** 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;
*** 238,261 ****
        #elif _MSC_VER == 1923
          #define HOTSPOT_BUILD_COMPILER "MS VC++ 16.3 (VS2019)"
        #else
          #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
        #endif
-     #elif defined(__SUNPRO_CC)
-       #if __SUNPRO_CC == 0x580
-         #define HOTSPOT_BUILD_COMPILER "Workshop 5.8"
-       #elif __SUNPRO_CC == 0x590
-         #define HOTSPOT_BUILD_COMPILER "Workshop 5.9"
-       #elif __SUNPRO_CC == 0x5100
-         #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1"
-       #elif __SUNPRO_CC == 0x5120
-         #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3"
-       #elif __SUNPRO_CC == 0x5130
-         #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u4"
-       #else
-         #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
-       #endif
      #elif defined(__clang_version__)
          #define HOTSPOT_BUILD_COMPILER "clang " __VERSION__
      #elif defined(__GNUC__)
          #define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__
      #else
--- 236,245 ----