comparison src/share/vm/runtime/vm_operations.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 422c979ff392 f34d701e952e
children 89e4d67fdd2a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
32 #include "oops/symbol.hpp" 32 #include "oops/symbol.hpp"
33 #include "runtime/arguments.hpp" 33 #include "runtime/arguments.hpp"
34 #include "runtime/deoptimization.hpp" 34 #include "runtime/deoptimization.hpp"
35 #include "runtime/interfaceSupport.hpp" 35 #include "runtime/interfaceSupport.hpp"
36 #include "runtime/sweeper.hpp" 36 #include "runtime/sweeper.hpp"
37 #include "runtime/thread.inline.hpp"
37 #include "runtime/vm_operations.hpp" 38 #include "runtime/vm_operations.hpp"
38 #include "services/threadService.hpp" 39 #include "services/threadService.hpp"
39 #ifdef TARGET_OS_FAMILY_linux
40 # include "thread_linux.inline.hpp"
41 #endif
42 #ifdef TARGET_OS_FAMILY_solaris
43 # include "thread_solaris.inline.hpp"
44 #endif
45 #ifdef TARGET_OS_FAMILY_windows
46 # include "thread_windows.inline.hpp"
47 #endif
48 #ifdef TARGET_OS_FAMILY_bsd
49 # include "thread_bsd.inline.hpp"
50 #endif
51 40
52 #define VM_OP_NAME_INITIALIZE(name) #name, 41 #define VM_OP_NAME_INITIALIZE(name) #name,
53 42
54 const char* VM_Operation::_names[VM_Operation::VMOp_Terminating] = \ 43 const char* VM_Operation::_names[VM_Operation::VMOp_Terminating] = \
55 { VM_OPS_DO(VM_OP_NAME_INITIALIZE) }; 44 { VM_OPS_DO(VM_OP_NAME_INITIALIZE) };