Mercurial > hg > truffle

comparison src/share/vm/runtime/vm_version.cpp @ 7212:291ffc492eb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 5d0bb7d52783 6b881a6b0665
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
245 #endif 245 #endif
246 #endif 246 #endif
247 247
248 #ifndef FLOAT_ARCH 248 #ifndef FLOAT_ARCH
249 #if defined(__SOFTFP__) 249 #if defined(__SOFTFP__)
250 #define FLOAT_ARCH "-sflt" 250 #define FLOAT_ARCH_STR "-sflt"
251 #elif defined(E500V2) 251 #elif defined(E500V2)
252 #define FLOAT_ARCH "-e500v2" 252 #define FLOAT_ARCH_STR "-e500v2"
253 #elif defined(ARM) 253 #elif defined(ARM)
254 #define FLOAT_ARCH "-vfp" 254 #define FLOAT_ARCH_STR "-vfp"
255 #elif defined(PPC) 255 #elif defined(PPC)
256 #define FLOAT_ARCH "-hflt" 256 #define FLOAT_ARCH_STR "-hflt"
257 #else 257 #else
258 #define FLOAT_ARCH "" 258 #define FLOAT_ARCH_STR ""
259 #endif 259 #endif
260 #else
261 #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
260 #endif 262 #endif
261 263
262 return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH 264 return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR
263 " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__ 265 " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
264 " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; 266 " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
265 } 267 }
266 268
267 const char *Abstract_VM_Version::vm_build_user() { 269 const char *Abstract_VM_Version::vm_build_user() {