comparison src/share/vm/utilities/macros.hpp @ 7226:8a3efb8c831d

Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 14 Dec 2012 13:02:49 +0100
parents 5d0bb7d52783
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7225:31c4d9f9e922 7226:8a3efb8c831d
180 #endif // COMPILER2 180 #endif // COMPILER2
181 181
182 #ifdef GRAAL 182 #ifdef GRAAL
183 #define GRAAL_ONLY(code) code 183 #define GRAAL_ONLY(code) code
184 #define NOT_GRAAL(code) 184 #define NOT_GRAAL(code)
185 #else 185 #if !defined(COMPILER1) && !defined(COMPILER2)
186 // Graal is the only compiler in the system and so will be used for compilation
187 // requests issued by the compile broker.
188 #define GRAALVM
189 #define GRAALVM_ONLY(code) code
190 #define NOT_GRAALVM(code)
191 #else
192 // Graal is not the only compiler in the system and so will only be used for
193 // compilation requests issued via the Graal API
194 #define GRAALVM_ONLY(code)
195 #define NOT_GRAALVM(code) code
196 #endif
197 #else // !GRAAL
186 #define GRAAL_ONLY(code) 198 #define GRAAL_ONLY(code)
187 #define NOT_GRAAL(code) code 199 #define NOT_GRAAL(code) code
200 #define GRAALVM_ONLY(code)
201 #define NOT_GRAALVM(code) code
188 #endif // GRAAL 202 #endif // GRAAL
189 203
190 #ifdef HIGH_LEVEL_INTERPRETER 204 #ifdef HIGH_LEVEL_INTERPRETER
191 #define HIGH_LEVEL_INTERPRETER_ONLY(code) code 205 #define HIGH_LEVEL_INTERPRETER_ONLY(code) code
192 #define NOT_HIGH_LEVEL_INTERPRETER(code) 206 #define NOT_HIGH_LEVEL_INTERPRETER(code)