diff options
author | dholmes <none@none> | 2012-11-21 21:26:12 -0500 |
---|---|---|
committer | dholmes <none@none> | 2012-11-21 21:26:12 -0500 |
commit | c8800755dc72e2e3e4e1aa35a1af8035cae7764a (patch) | |
tree | 95d638eb85572342522da20e5882a856677a459a /src/share | |
parent | 55ec579782d6b05071bbeeba7fec7eebac36ad91 (diff) | |
parent | 6b43b9a6c79f2ef7aeff5593e9ff1540d6a4e8e0 (diff) |
Merge
Diffstat (limited to 'src/share')
-rw-r--r-- | src/share/vm/runtime/vm_version.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/share/vm/runtime/vm_version.cpp b/src/share/vm/runtime/vm_version.cpp index bb110ee15..2d105a97b 100644 --- a/src/share/vm/runtime/vm_version.cpp +++ b/src/share/vm/runtime/vm_version.cpp @@ -243,19 +243,21 @@ const char* Abstract_VM_Version::internal_vm_info_string() { #ifndef FLOAT_ARCH #if defined(__SOFTFP__) - #define FLOAT_ARCH "-sflt" + #define FLOAT_ARCH_STR "-sflt" #elif defined(E500V2) - #define FLOAT_ARCH "-e500v2" + #define FLOAT_ARCH_STR "-e500v2" #elif defined(ARM) - #define FLOAT_ARCH "-vfp" + #define FLOAT_ARCH_STR "-vfp" #elif defined(PPC) - #define FLOAT_ARCH "-hflt" + #define FLOAT_ARCH_STR "-hflt" #else - #define FLOAT_ARCH "" + #define FLOAT_ARCH_STR "" #endif + #else + #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH) #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__ " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; } |