src/share/vm/runtime/vm_version.cpp

changeset 2508
b92c45f2bc75
parent 2314
f95d63e2154a
child 2515
d8a72fbc4be7
     1.1 --- a/src/share/vm/runtime/vm_version.cpp	Thu Jan 27 16:11:27 2011 -0800
     1.2 +++ b/src/share/vm/runtime/vm_version.cpp	Wed Feb 02 11:35:26 2011 -0500
     1.3 @@ -35,6 +35,12 @@
     1.4  #ifdef TARGET_ARCH_zero
     1.5  # include "vm_version_zero.hpp"
     1.6  #endif
     1.7 +#ifdef TARGET_ARCH_arm
     1.8 +# include "vm_version_arm.hpp"
     1.9 +#endif
    1.10 +#ifdef TARGET_ARCH_ppc
    1.11 +# include "vm_version_ppc.hpp"
    1.12 +#endif
    1.13  
    1.14  const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release();
    1.15  const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();
    1.16 @@ -220,8 +226,21 @@
    1.17      #endif
    1.18    #endif
    1.19  
    1.20 +  #ifndef FLOAT_ARCH
    1.21 +    #if defined(__SOFTFP__)
    1.22 +      #define FLOAT_ARCH "-sflt"
    1.23 +    #elif defined(E500V2)
    1.24 +      #define FLOAT_ARCH "-e500v2"
    1.25 +    #elif defined(ARM)
    1.26 +      #define FLOAT_ARCH "-vfp"
    1.27 +    #elif defined(PPC)
    1.28 +      #define FLOAT_ARCH "-hflt"
    1.29 +    #else
    1.30 +      #define FLOAT_ARCH ""
    1.31 +    #endif
    1.32 +  #endif
    1.33  
    1.34 -  return VMNAME " (" VM_RELEASE ") for " OS "-" CPU
    1.35 +  return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH
    1.36           " JRE (" JRE_RELEASE_VERSION "), built on " __DATE__ " " __TIME__
    1.37           " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER;
    1.38  }

mercurial