Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/vm_version.cpp @ 4137:04b9a2566eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hsx23/hotspot.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 21:40:27 +0100
parents 0654ee04b214 2ef3386478e6
children 723df37192d6
comparison
equal deleted inserted replaced
3737:9dc19b7d89a3 4137:04b9a2566eec
44 44
45 const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release(); 45 const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release();
46 const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string(); 46 const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();
47 bool Abstract_VM_Version::_supports_cx8 = false; 47 bool Abstract_VM_Version::_supports_cx8 = false;
48 unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U; 48 unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U;
49 int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0;
49 50
50 #ifndef HOTSPOT_RELEASE_VERSION 51 #ifndef HOTSPOT_RELEASE_VERSION
51 #error HOTSPOT_RELEASE_VERSION must be defined 52 #error HOTSPOT_RELEASE_VERSION must be defined
52 #endif 53 #endif
53 #ifndef JRE_RELEASE_VERSION 54 #ifndef JRE_RELEASE_VERSION
125 #endif // KERNEL 126 #endif // KERNEL
126 127
127 #ifndef HOTSPOT_VM_DISTRO 128 #ifndef HOTSPOT_VM_DISTRO
128 #error HOTSPOT_VM_DISTRO must be defined 129 #error HOTSPOT_VM_DISTRO must be defined
129 #endif 130 #endif
130 #define VMNAME HOTSPOT_VM_DISTRO " " VMLP VMTYPE " VM" 131 #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM"
131 132
132 const char* Abstract_VM_Version::vm_name() { 133 const char* Abstract_VM_Version::vm_name() {
133 return VMNAME; 134 return VMNAME;
134 } 135 }
135 136
164 return VM_RELEASE; 165 return VM_RELEASE;
165 } 166 }
166 167
167 #define OS LINUX_ONLY("linux") \ 168 #define OS LINUX_ONLY("linux") \
168 WINDOWS_ONLY("windows") \ 169 WINDOWS_ONLY("windows") \
169 SOLARIS_ONLY("solaris") 170 SOLARIS_ONLY("solaris") \
171 BSD_ONLY("bsd")
170 172
171 #ifdef ZERO 173 #ifdef ZERO
172 #define CPU ZERO_LIBARCH 174 #define CPU ZERO_LIBARCH
173 #else 175 #else
174 #define CPU IA32_ONLY("x86") \ 176 #define CPU IA32_ONLY("x86") \