comparison src/share/vm/runtime/vm_version.cpp @ 7169:6b881a6b0665

8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use Reviewed-by: coleenp, kvn
author dholmes
date Wed, 21 Nov 2012 20:07:52 -0500
parents 9855b7e559ae
children 291ffc492eb6 8b46b0196eb0
comparison
equal deleted inserted replaced
7167:3ed6de6e139b 7169:6b881a6b0665
241 #endif 241 #endif
242 #endif 242 #endif
243 243
244 #ifndef FLOAT_ARCH 244 #ifndef FLOAT_ARCH
245 #if defined(__SOFTFP__) 245 #if defined(__SOFTFP__)
246 #define FLOAT_ARCH "-sflt" 246 #define FLOAT_ARCH_STR "-sflt"
247 #elif defined(E500V2) 247 #elif defined(E500V2)
248 #define FLOAT_ARCH "-e500v2" 248 #define FLOAT_ARCH_STR "-e500v2"
249 #elif defined(ARM) 249 #elif defined(ARM)
250 #define FLOAT_ARCH "-vfp" 250 #define FLOAT_ARCH_STR "-vfp"
251 #elif defined(PPC) 251 #elif defined(PPC)
252 #define FLOAT_ARCH "-hflt" 252 #define FLOAT_ARCH_STR "-hflt"
253 #else 253 #else
254 #define FLOAT_ARCH "" 254 #define FLOAT_ARCH_STR ""
255 #endif 255 #endif
256 #else
257 #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
256 #endif 258 #endif
257 259
258 return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH 260 return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
259 " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__ 261 " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
260 " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; 262 " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
261 } 263 }
262 264
263 const char *Abstract_VM_Version::vm_build_user() { 265 const char *Abstract_VM_Version::vm_build_user() {