src/share/vm/runtime/vm_version.cpp

rev 9503 : 8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
Contributed-by: Andrew Hughes gnu.andrew@redhat.com

*** 191,208 ****
                   BSD_ONLY("bsd")
  
  #ifndef CPU
  #ifdef ZERO
  #define CPU      ZERO_LIBARCH
  #else
  #define CPU      IA32_ONLY("x86")                \
                   IA64_ONLY("ia64")               \
                   AMD64_ONLY("amd64")             \
-                  PPC64_ONLY("ppc64")             \
                   AARCH64_ONLY("aarch64")         \
                   SPARC_ONLY("sparc")
! #endif // ZERO
  #endif
  
  const char *Abstract_VM_Version::vm_platform_string() {
    return OS "-" CPU;
  }
--- 191,213 ----
                   BSD_ONLY("bsd")
  
  #ifndef CPU
  #ifdef ZERO
  #define CPU      ZERO_LIBARCH
+ #elif defined(PPC64)
+ #if defined(VM_LITTLE_ENDIAN)
+ #define CPU      "ppc64le"
+ #else
+ #define CPU      "ppc64"
+ #endif
  #else
  #define CPU      IA32_ONLY("x86")                \
                   IA64_ONLY("ia64")               \
                   AMD64_ONLY("amd64")             \
                   AARCH64_ONLY("aarch64")         \
                   SPARC_ONLY("sparc")
! #endif //
  #endif
  
  const char *Abstract_VM_Version::vm_platform_string() {
    return OS "-" CPU;
  }