Mercurial > hg > truffle
comparison src/share/vm/runtime/vm_version.cpp @ 8037:9425ba04792d
Merge
author | brutisso |
---|---|
date | Thu, 07 Feb 2013 18:40:45 -0800 |
parents | 8b46b0196eb0 |
children | 5fc51c1ecdeb 9960dce2024f |
comparison
equal
deleted
inserted
replaced
8035:f64ffbf81af5 | 8037:9425ba04792d |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1998, 2013, 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. |
109 #else | 109 #else |
110 #define VMLP "" | 110 #define VMLP "" |
111 #endif | 111 #endif |
112 | 112 |
113 #ifndef VMTYPE | 113 #ifndef VMTYPE |
114 #ifdef KERNEL | |
115 #define VMTYPE "Kernel" | |
116 #else // KERNEL | |
117 #ifdef TIERED | 114 #ifdef TIERED |
118 #define VMTYPE "Server" | 115 #define VMTYPE "Server" |
119 #else // TIERED | 116 #else // TIERED |
120 #ifdef ZERO | 117 #ifdef ZERO |
121 #ifdef SHARK | 118 #ifdef SHARK |
126 #else // ZERO | 123 #else // ZERO |
127 #define VMTYPE COMPILER1_PRESENT("Client") \ | 124 #define VMTYPE COMPILER1_PRESENT("Client") \ |
128 COMPILER2_PRESENT("Server") | 125 COMPILER2_PRESENT("Server") |
129 #endif // ZERO | 126 #endif // ZERO |
130 #endif // TIERED | 127 #endif // TIERED |
131 #endif // KERNEL | |
132 #endif | 128 #endif |
133 | 129 |
134 #ifndef HOTSPOT_VM_DISTRO | 130 #ifndef HOTSPOT_VM_DISTRO |
135 #error HOTSPOT_VM_DISTRO must be defined | 131 #error HOTSPOT_VM_DISTRO must be defined |
136 #endif | 132 #endif |