Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/vm_version.cpp @ 8124:5fc51c1ecdeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 291ffc492eb6 8b46b0196eb0
children b9a918201d47
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
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
130 #define VMTYPE COMPILER1_PRESENT("Client") \ 127 #define VMTYPE COMPILER1_PRESENT("Client") \
131 COMPILER2_PRESENT("Server") 128 COMPILER2_PRESENT("Server")
132 #endif // GRAAL 129 #endif // GRAAL
133 #endif // ZERO 130 #endif // ZERO
134 #endif // TIERED 131 #endif // TIERED
135 #endif // KERNEL
136 #endif 132 #endif
137 133
138 #ifndef HOTSPOT_VM_DISTRO 134 #ifndef HOTSPOT_VM_DISTRO
139 #error HOTSPOT_VM_DISTRO must be defined 135 #error HOTSPOT_VM_DISTRO must be defined
140 #endif 136 #endif