comparison src/share/vm/runtime/vm_version.hpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents c77d473e71f7
children 7eca5de9e0b6
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
69 // Gets the jvm_version_info.jvm_version defined in jvm.h 69 // Gets the jvm_version_info.jvm_version defined in jvm.h
70 static unsigned int jvm_version(); 70 static unsigned int jvm_version();
71 71
72 // Internal version providing additional build information 72 // Internal version providing additional build information
73 static const char* internal_vm_info_string(); 73 static const char* internal_vm_info_string();
74 static const char* jre_release_version();
74 75
75 // does HW support an 8-byte compare-exchange operation? 76 // does HW support an 8-byte compare-exchange operation?
76 static bool supports_cx8() {return _supports_cx8;} 77 static bool supports_cx8() {return _supports_cx8;}
77 static unsigned int logical_processors_per_package() { 78 static unsigned int logical_processors_per_package() {
78 return _logical_processors_per_package; 79 return _logical_processors_per_package;