src/share/vm/runtime/vm_version.cpp

Print this page
rev 4738 : Clean up PPC defines.

Reorganize PPC defines.  Distinguish PPC, PPC64 and PPC32.
PPC should guard code needed on PPC regardless of word size.
PPC32 and PPC64 should guard code needed in the 64-bit or
the 32-bit port.

*** 184,194 **** #else #define CPU IA32_ONLY("x86") \ IA64_ONLY("ia64") \ AMD64_ONLY("amd64") \ ARM_ONLY("arm") \ ! PPC_ONLY("ppc") \ SPARC_ONLY("sparc") #endif // ZERO const char *Abstract_VM_Version::vm_platform_string() { return OS "-" CPU; --- 184,194 ---- #else #define CPU IA32_ONLY("x86") \ IA64_ONLY("ia64") \ AMD64_ONLY("amd64") \ ARM_ONLY("arm") \ ! PPC32_ONLY("ppc") \ SPARC_ONLY("sparc") #endif // ZERO const char *Abstract_VM_Version::vm_platform_string() { return OS "-" CPU;
*** 246,256 **** #define FLOAT_ARCH_STR "-sflt" #elif defined(E500V2) #define FLOAT_ARCH_STR "-e500v2" #elif defined(ARM) #define FLOAT_ARCH_STR "-vfp" ! #elif defined(PPC) #define FLOAT_ARCH_STR "-hflt" #else #define FLOAT_ARCH_STR "" #endif #else --- 246,256 ---- #define FLOAT_ARCH_STR "-sflt" #elif defined(E500V2) #define FLOAT_ARCH_STR "-e500v2" #elif defined(ARM) #define FLOAT_ARCH_STR "-vfp" ! #elif defined(PPC32) #define FLOAT_ARCH_STR "-hflt" #else #define FLOAT_ARCH_STR "" #endif #else