Mercurial > hg > truffle

comparison src/share/vm/runtime/java.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 320d6fd3dbf3 db9981fd3124
children 5977a55503e9
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
65 #include "trace/tracing.hpp" 65 #include "trace/tracing.hpp"
66 #include "trace/traceEventTypes.hpp" 66 #include "trace/traceEventTypes.hpp"
67 #include "utilities/dtrace.hpp" 67 #include "utilities/dtrace.hpp"
68 #include "utilities/globalDefinitions.hpp" 68 #include "utilities/globalDefinitions.hpp"
69 #include "utilities/histogram.hpp" 69 #include "utilities/histogram.hpp"
70 #include "utilities/macros.hpp"
70 #include "utilities/vmError.hpp" 71 #include "utilities/vmError.hpp"
71 #ifdef TARGET_ARCH_x86 72 #ifdef TARGET_ARCH_x86
72 # include "vm_version_x86.hpp" 73 # include "vm_version_x86.hpp"
73 #endif 74 #endif
74 #ifdef TARGET_ARCH_sparc 75 #ifdef TARGET_ARCH_sparc
81 # include "vm_version_arm.hpp" 82 # include "vm_version_arm.hpp"
82 #endif 83 #endif
83 #ifdef TARGET_ARCH_ppc 84 #ifdef TARGET_ARCH_ppc
84 # include "vm_version_ppc.hpp" 85 # include "vm_version_ppc.hpp"
85 #endif 86 #endif
86 #ifndef SERIALGC 87 #if INCLUDE_ALL_GCS
87 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" 88 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
88 #include "gc_implementation/parallelScavenge/psScavenge.hpp" 89 #include "gc_implementation/parallelScavenge/psScavenge.hpp"
89 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp" 90 #include "gc_implementation/parallelScavenge/psScavenge.inline.hpp"
90 #endif 91 #endif // INCLUDE_ALL_GCS
91 #ifdef COMPILER1 92 #ifdef COMPILER1
92 #include "c1/c1_Compiler.hpp" 93 #include "c1/c1_Compiler.hpp"
93 #include "c1/c1_Runtime1.hpp" 94 #include "c1/c1_Runtime1.hpp"
94 #endif 95 #endif
95 #ifdef COMPILER2 96 #ifdef COMPILER2