stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
David Holmes 2012-11-21 21:26:12 -05:00
commit 68137e4136
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hotspot/src/share/vm/runtime/vm_version.cpp
View File

@ -243,19 +243,21 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
#ifndef FLOAT_ARCH #ifndef FLOAT_ARCH
#if defined(__SOFTFP__) #if defined(__SOFTFP__)
#define FLOAT_ARCH "-sflt" #define FLOAT_ARCH_STR "-sflt"
#elif defined(E500V2) #elif defined(E500V2)
#define FLOAT_ARCH "-e500v2" #define FLOAT_ARCH_STR "-e500v2"
#elif defined(ARM) #elif defined(ARM)
#define FLOAT_ARCH "-vfp" #define FLOAT_ARCH_STR "-vfp"
#elif defined(PPC) #elif defined(PPC)
#define FLOAT_ARCH "-hflt" #define FLOAT_ARCH_STR "-hflt"
#else #else
#define FLOAT_ARCH "" #define FLOAT_ARCH_STR ""
#endif #endif
#else
#define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
#endif #endif
return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
" JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__ " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
} }