Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/vm_version.cpp @ 6856:9855b7e559ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author collins
date Fri, 12 Oct 2012 10:49:39 -0700
parents b9a9ed0f8eeb fb19af007ffc
children e522a00b91aa 6b881a6b0665
comparison
equal deleted inserted replaced
6842:b9a9ed0f8eeb 6856:9855b7e559ae
108 #define VMLP "64-Bit " 108 #define VMLP "64-Bit "
109 #else 109 #else
110 #define VMLP "" 110 #define VMLP ""
111 #endif 111 #endif
112 112
113 #ifdef KERNEL 113 #ifndef VMTYPE
114 #define VMTYPE "Kernel" 114 #ifdef KERNEL
115 #else // KERNEL 115 #define VMTYPE "Kernel"
116 #ifdef TIERED 116 #else // KERNEL
117 #define VMTYPE "Server" 117 #ifdef TIERED
118 #else // TIERED 118 #define VMTYPE "Server"
119 #ifdef ZERO 119 #else // TIERED
120 #ifdef SHARK 120 #ifdef ZERO
121 #define VMTYPE "Shark" 121 #ifdef SHARK
122 #else // SHARK 122 #define VMTYPE "Shark"
123 #define VMTYPE "Zero" 123 #else // SHARK
124 #endif // SHARK 124 #define VMTYPE "Zero"
125 #else // ZERO 125 #endif // SHARK
126 #define VMTYPE COMPILER1_PRESENT("Client") \ 126 #else // ZERO
127 COMPILER2_PRESENT("Server") 127 #define VMTYPE COMPILER1_PRESENT("Client") \
128 #endif // ZERO 128 COMPILER2_PRESENT("Server")
129 #endif // TIERED 129 #endif // ZERO
130 #endif // KERNEL 130 #endif // TIERED
131 #endif // KERNEL
132 #endif
131 133
132 #ifndef HOTSPOT_VM_DISTRO 134 #ifndef HOTSPOT_VM_DISTRO
133 #error HOTSPOT_VM_DISTRO must be defined 135 #error HOTSPOT_VM_DISTRO must be defined
134 #endif 136 #endif
135 #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM" 137 #define VMNAME HOTSPOT_VM_DISTRO " " VMLP EMBEDDED_ONLY("Embedded ") VMTYPE " VM"