comparison src/share/vm/runtime/safepoint.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 1baf7f1e3f23 f34d701e952e
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
46 #include "runtime/signature.hpp" 46 #include "runtime/signature.hpp"
47 #include "runtime/stubCodeGenerator.hpp" 47 #include "runtime/stubCodeGenerator.hpp"
48 #include "runtime/stubRoutines.hpp" 48 #include "runtime/stubRoutines.hpp"
49 #include "runtime/sweeper.hpp" 49 #include "runtime/sweeper.hpp"
50 #include "runtime/synchronizer.hpp" 50 #include "runtime/synchronizer.hpp"
51 #include "runtime/thread.inline.hpp"
51 #include "services/memTracker.hpp" 52 #include "services/memTracker.hpp"
52 #include "services/runtimeService.hpp" 53 #include "services/runtimeService.hpp"
53 #include "utilities/events.hpp" 54 #include "utilities/events.hpp"
54 #ifdef TARGET_ARCH_x86 55 #ifdef TARGET_ARCH_x86
55 # include "nativeInst_x86.hpp" 56 # include "nativeInst_x86.hpp"
68 # include "vmreg_arm.inline.hpp" 69 # include "vmreg_arm.inline.hpp"
69 #endif 70 #endif
70 #ifdef TARGET_ARCH_ppc 71 #ifdef TARGET_ARCH_ppc
71 # include "nativeInst_ppc.hpp" 72 # include "nativeInst_ppc.hpp"
72 # include "vmreg_ppc.inline.hpp" 73 # include "vmreg_ppc.inline.hpp"
73 #endif
74 #ifdef TARGET_OS_FAMILY_linux
75 # include "thread_linux.inline.hpp"
76 #endif
77 #ifdef TARGET_OS_FAMILY_solaris
78 # include "thread_solaris.inline.hpp"
79 #endif
80 #ifdef TARGET_OS_FAMILY_windows
81 # include "thread_windows.inline.hpp"
82 #endif
83 #ifdef TARGET_OS_FAMILY_bsd
84 # include "thread_bsd.inline.hpp"
85 #endif 74 #endif
86 #ifndef SERIALGC 75 #ifndef SERIALGC
87 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp" 76 #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
88 #include "gc_implementation/shared/concurrentGCThread.hpp" 77 #include "gc_implementation/shared/concurrentGCThread.hpp"
89 #endif 78 #endif