comparison src/os/linux/vm/os_linux.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_linux.h" 34 #include "jvm_linux.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_linux.inline.hpp" 37 #include "mutex_linux.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/runtimeService.hpp" 60 #include "services/runtimeService.hpp"
59 #include "thread_linux.inline.hpp"
60 #include "utilities/decoder.hpp" 61 #include "utilities/decoder.hpp"
61 #include "utilities/defaultStream.hpp" 62 #include "utilities/defaultStream.hpp"
62 #include "utilities/events.hpp" 63 #include "utilities/events.hpp"
63 #include "utilities/growableArray.hpp" 64 #include "utilities/growableArray.hpp"
64 #include "utilities/vmError.hpp" 65 #include "utilities/vmError.hpp"
65 #ifdef TARGET_ARCH_x86
66 # include "assembler_x86.inline.hpp"
67 # include "nativeInst_x86.hpp"
68 #endif
69 #ifdef TARGET_ARCH_sparc
70 # include "assembler_sparc.inline.hpp"
71 # include "nativeInst_sparc.hpp"
72 #endif
73 #ifdef TARGET_ARCH_zero
74 # include "assembler_zero.inline.hpp"
75 # include "nativeInst_zero.hpp"
76 #endif
77 #ifdef TARGET_ARCH_arm
78 # include "assembler_arm.inline.hpp"
79 # include "nativeInst_arm.hpp"
80 #endif
81 #ifdef TARGET_ARCH_ppc
82 # include "assembler_ppc.inline.hpp"
83 # include "nativeInst_ppc.hpp"
84 #endif
85 66
86 // put OS-includes here 67 // put OS-includes here
87 # include <sys/types.h> 68 # include <sys/types.h>
88 # include <sys/mman.h> 69 # include <sys/mman.h>
89 # include <sys/stat.h> 70 # include <sys/stat.h>