Mercurial > hg > graal-compiler
comparison src/share/vm/utilities/macros.hpp @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | c76b43ed5089 f2110083203d |
children | 800057208a2c |
comparison
equal
deleted
inserted
replaced
10086:e0fb8a213650 | 10408:836a62f43af9 |
---|---|
157 #define NOT_NMT_RETURN_(code) /* next token must be ; */ | 157 #define NOT_NMT_RETURN_(code) /* next token must be ; */ |
158 #else | 158 #else |
159 #define NOT_NMT_RETURN {} | 159 #define NOT_NMT_RETURN {} |
160 #define NOT_NMT_RETURN_(code) { return code; } | 160 #define NOT_NMT_RETURN_(code) { return code; } |
161 #endif // INCLUDE_NMT | 161 #endif // INCLUDE_NMT |
162 | |
163 #ifndef INCLUDE_TRACE | |
164 #define INCLUDE_TRACE 1 | |
165 #endif // INCLUDE_TRACE | |
162 | 166 |
163 // COMPILER1 variant | 167 // COMPILER1 variant |
164 #ifdef COMPILER1 | 168 #ifdef COMPILER1 |
165 #ifdef COMPILER2 | 169 #ifdef COMPILER2 |
166 #define TIERED | 170 #define TIERED |