comparison src/os/linux/vm/os_linux.inline.hpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 4ca6dc0799b6 ce8f6bb717c9
children
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
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.inline.hpp" 28 #include "runtime/atomic.inline.hpp"
29 #include "runtime/orderAccess.inline.hpp"
29 #include "runtime/os.hpp" 30 #include "runtime/os.hpp"
30
31 #ifdef TARGET_OS_ARCH_linux_x86
32 # include "orderAccess_linux_x86.inline.hpp"
33 #endif
34 #ifdef TARGET_OS_ARCH_linux_sparc
35 # include "orderAccess_linux_sparc.inline.hpp"
36 #endif
37 #ifdef TARGET_OS_ARCH_linux_zero
38 # include "orderAccess_linux_zero.inline.hpp"
39 #endif
40 #ifdef TARGET_OS_ARCH_linux_arm
41 # include "orderAccess_linux_arm.inline.hpp"
42 #endif
43 #ifdef TARGET_OS_ARCH_linux_ppc
44 # include "orderAccess_linux_ppc.inline.hpp"
45 #endif
46 31
47 // System includes 32 // System includes
48 33
49 #include <unistd.h> 34 #include <unistd.h>
50 #include <sys/socket.h> 35 #include <sys/socket.h>