comparison src/os/solaris/vm/os_solaris.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 2cb439954abf d2f8c38e543d
children 989155e2d07a
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
27 #include "classfile/systemDictionary.hpp" 27 #include "classfile/systemDictionary.hpp"
28 #include "classfile/vmSymbols.hpp" 28 #include "classfile/vmSymbols.hpp"
29 #include "code/icBuffer.hpp" 29 #include "code/icBuffer.hpp"
30 #include "code/vtableStubs.hpp" 30 #include "code/vtableStubs.hpp"
31 #include "compiler/compileBroker.hpp" 31 #include "compiler/compileBroker.hpp"
32 #include "compiler/disassembler.hpp"
32 #include "interpreter/interpreter.hpp" 33 #include "interpreter/interpreter.hpp"
33 #include "jvm_solaris.h" 34 #include "jvm_solaris.h"
34 #include "memory/allocation.inline.hpp" 35 #include "memory/allocation.inline.hpp"
35 #include "memory/filemap.hpp" 36 #include "memory/filemap.hpp"
36 #include "mutex_solaris.inline.hpp" 37 #include "mutex_solaris.inline.hpp"
50 #include "runtime/osThread.hpp" 51 #include "runtime/osThread.hpp"
51 #include "runtime/perfMemory.hpp" 52 #include "runtime/perfMemory.hpp"
52 #include "runtime/sharedRuntime.hpp" 53 #include "runtime/sharedRuntime.hpp"
53 #include "runtime/statSampler.hpp" 54 #include "runtime/statSampler.hpp"
54 #include "runtime/stubRoutines.hpp" 55 #include "runtime/stubRoutines.hpp"
56 #include "runtime/thread.inline.hpp"
55 #include "runtime/threadCritical.hpp" 57 #include "runtime/threadCritical.hpp"
56 #include "runtime/timer.hpp" 58 #include "runtime/timer.hpp"
57 #include "services/attachListener.hpp" 59 #include "services/attachListener.hpp"
58 #include "services/memTracker.hpp" 60 #include "services/memTracker.hpp"
59 #include "services/runtimeService.hpp" 61 #include "services/runtimeService.hpp"
60 #include "thread_solaris.inline.hpp"
61 #include "utilities/decoder.hpp" 62 #include "utilities/decoder.hpp"
62 #include "utilities/defaultStream.hpp" 63 #include "utilities/defaultStream.hpp"
63 #include "utilities/events.hpp" 64 #include "utilities/events.hpp"
64 #include "utilities/growableArray.hpp" 65 #include "utilities/growableArray.hpp"
65 #include "utilities/vmError.hpp" 66 #include "utilities/vmError.hpp"
66 #ifdef TARGET_ARCH_x86
67 # include "assembler_x86.inline.hpp"
68 # include "nativeInst_x86.hpp"
69 #endif
70 #ifdef TARGET_ARCH_sparc
71 # include "assembler_sparc.inline.hpp"
72 # include "nativeInst_sparc.hpp"
73 #endif
74 67
75 // put OS-includes here 68 // put OS-includes here
76 # include <dlfcn.h> 69 # include <dlfcn.h>
77 # include <errno.h> 70 # include <errno.h>
78 # include <exception> 71 # include <exception>