Mercurial > hg > truffle
comparison src/os/linux/vm/os_linux.inline.hpp @ 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 | cd3d6a6b95d9 |
children | 203f64878aab |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
24 | 24 |
25 #ifndef OS_LINUX_VM_OS_LINUX_INLINE_HPP | 25 #ifndef OS_LINUX_VM_OS_LINUX_INLINE_HPP |
26 #define OS_LINUX_VM_OS_LINUX_INLINE_HPP | 26 #define OS_LINUX_VM_OS_LINUX_INLINE_HPP |
27 | 27 |
28 #include "runtime/atomic.hpp" | 28 #include "runtime/atomic.hpp" |
29 #include "runtime/atomic.inline.hpp" | |
29 #include "runtime/os.hpp" | 30 #include "runtime/os.hpp" |
31 | |
30 #ifdef TARGET_OS_ARCH_linux_x86 | 32 #ifdef TARGET_OS_ARCH_linux_x86 |
31 # include "atomic_linux_x86.inline.hpp" | |
32 # include "orderAccess_linux_x86.inline.hpp" | 33 # include "orderAccess_linux_x86.inline.hpp" |
33 #endif | 34 #endif |
34 #ifdef TARGET_OS_ARCH_linux_sparc | 35 #ifdef TARGET_OS_ARCH_linux_sparc |
35 # include "atomic_linux_sparc.inline.hpp" | |
36 # include "orderAccess_linux_sparc.inline.hpp" | 36 # include "orderAccess_linux_sparc.inline.hpp" |
37 #endif | 37 #endif |
38 #ifdef TARGET_OS_ARCH_linux_zero | 38 #ifdef TARGET_OS_ARCH_linux_zero |
39 # include "atomic_linux_zero.inline.hpp" | |
40 # include "orderAccess_linux_zero.inline.hpp" | 39 # include "orderAccess_linux_zero.inline.hpp" |
41 #endif | 40 #endif |
42 #ifdef TARGET_OS_ARCH_linux_arm | 41 #ifdef TARGET_OS_ARCH_linux_arm |
43 # include "atomic_linux_arm.inline.hpp" | |
44 # include "orderAccess_linux_arm.inline.hpp" | 42 # include "orderAccess_linux_arm.inline.hpp" |
45 #endif | 43 #endif |
46 #ifdef TARGET_OS_ARCH_linux_ppc | 44 #ifdef TARGET_OS_ARCH_linux_ppc |
47 # include "atomic_linux_ppc.inline.hpp" | |
48 # include "orderAccess_linux_ppc.inline.hpp" | 45 # include "orderAccess_linux_ppc.inline.hpp" |
49 #endif | 46 #endif |
50 | 47 |
51 // System includes | 48 // System includes |
52 | 49 |