Mercurial > hg > graal-compiler
comparison src/share/vm/utilities/top.hpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 1baf7f1e3f23 db9981fd3124 |
children | b8f261ba79c6 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
31 #include "utilities/exceptions.hpp" | 31 #include "utilities/exceptions.hpp" |
32 #include "utilities/globalDefinitions.hpp" | 32 #include "utilities/globalDefinitions.hpp" |
33 #include "utilities/macros.hpp" | 33 #include "utilities/macros.hpp" |
34 #include "utilities/ostream.hpp" | 34 #include "utilities/ostream.hpp" |
35 #include "utilities/sizes.hpp" | 35 #include "utilities/sizes.hpp" |
36 #ifndef SERIALGC | 36 #if INCLUDE_ALL_GCS |
37 #include "gc_implementation/g1/g1_globals.hpp" | 37 #include "gc_implementation/g1/g1_globals.hpp" |
38 #endif | 38 #endif // INCLUDE_ALL_GCS |
39 #ifdef COMPILER1 | 39 #ifdef COMPILER1 |
40 #include "c1/c1_globals.hpp" | 40 #include "c1/c1_globals.hpp" |
41 #endif | 41 #endif |
42 #ifdef GRAAL | 42 #ifdef GRAAL |
43 #include "graal/graalGlobals.hpp" | 43 #include "graal/graalGlobals.hpp" |