comparison src/share/vm/runtime/atomic.inline.hpp @ 17812:a7d4d4655766

Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents bdd155477289
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
55 // Windows 55 // Windows
56 #ifdef TARGET_OS_ARCH_windows_x86 56 #ifdef TARGET_OS_ARCH_windows_x86
57 # include "atomic_windows_x86.inline.hpp" 57 # include "atomic_windows_x86.inline.hpp"
58 #endif 58 #endif
59 59
60 // AIX
61 #ifdef TARGET_OS_ARCH_aix_ppc
62 # include "atomic_aix_ppc.inline.hpp"
63 #endif
64
60 // BSD 65 // BSD
61 #ifdef TARGET_OS_ARCH_bsd_x86 66 #ifdef TARGET_OS_ARCH_bsd_x86
62 # include "atomic_bsd_x86.inline.hpp" 67 # include "atomic_bsd_x86.inline.hpp"
63 #endif 68 #endif
64 #ifdef TARGET_OS_ARCH_bsd_zero 69 #ifdef TARGET_OS_ARCH_bsd_zero