Mercurial > hg > truffle
comparison src/share/vm/runtime/vm_version.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 33df1aeaebbf 9855b7e559ae |
children | 5d0bb7d52783 |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
43 #endif | 43 #endif |
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 bool Abstract_VM_Version::_supports_atomic_getset4 = false; | |
49 bool Abstract_VM_Version::_supports_atomic_getset8 = false; | |
50 bool Abstract_VM_Version::_supports_atomic_getadd4 = false; | |
51 bool Abstract_VM_Version::_supports_atomic_getadd8 = false; | |
48 unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U; | 52 unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U; |
49 int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0; | 53 int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0; |
50 | 54 |
51 #ifndef HOTSPOT_RELEASE_VERSION | 55 #ifndef HOTSPOT_RELEASE_VERSION |
52 #error HOTSPOT_RELEASE_VERSION must be defined | 56 #error HOTSPOT_RELEASE_VERSION must be defined |
104 #define VMLP "64-Bit " | 108 #define VMLP "64-Bit " |
105 #else | 109 #else |
106 #define VMLP "" | 110 #define VMLP "" |
107 #endif | 111 #endif |
108 | 112 |
109 #ifdef KERNEL | 113 #ifndef VMTYPE |
110 #define VMTYPE "Kernel" | 114 #ifdef KERNEL |
111 #else // KERNEL | 115 #define VMTYPE "Kernel" |
112 #ifdef TIERED | 116 #else // KERNEL |
113 #define VMTYPE "Server" | 117 #ifdef TIERED |
114 #else // TIERED | 118 #define VMTYPE "Server" |
115 #ifdef ZERO | 119 #else // TIERED |
116 #ifdef SHARK | 120 #ifdef ZERO |
117 #define VMTYPE "Shark" | 121 #ifdef SHARK |
118 #else // SHARK | 122 #define VMTYPE "Shark" |
119 #define VMTYPE "Zero" | 123 #else // SHARK |
120 #endif // SHARK | 124 #define VMTYPE "Zero" |
121 #else // ZERO | 125 #endif // SHARK |
122 #ifdef GRAAL | 126 #else // ZERO |
123 #define VMTYPE "Graal" | 127 #ifdef GRAAL |
124 #else // GRAAL | 128 #define VMTYPE "Graal" |
125 #define VMTYPE COMPILER1_PRESENT("Client") \ | 129 #else // GRAAL |
126 COMPILER2_PRESENT("Server") | 130 #define VMTYPE COMPILER1_PRESENT("Client") \ |
127 #endif // GRAAL | 131 COMPILER2_PRESENT("Server") |
128 #endif // ZERO | 132 #endif // GRAAL |
129 #endif // TIERED | 133 #endif // ZERO |
130 #endif // KERNEL | 134 #endif // TIERED |
135 #endif // KERNEL | |
136 #endif | |
131 | 137 |
132 #ifndef HOTSPOT_VM_DISTRO | 138 #ifndef HOTSPOT_VM_DISTRO |
133 #error HOTSPOT_VM_DISTRO must be defined | 139 #error HOTSPOT_VM_DISTRO must be defined |
134 #endif | 140 #endif |
135 #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM" | 141 #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM" |