Mercurial > hg > truffle
comparison src/share/vm/runtime/javaFrameAnchor.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | bdd155477289 |
children | 4ca6dc0799b6 ce8f6bb717c9 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
47 #ifdef TARGET_OS_ARCH_linux_arm | 47 #ifdef TARGET_OS_ARCH_linux_arm |
48 # include "orderAccess_linux_arm.inline.hpp" | 48 # include "orderAccess_linux_arm.inline.hpp" |
49 #endif | 49 #endif |
50 #ifdef TARGET_OS_ARCH_linux_ppc | 50 #ifdef TARGET_OS_ARCH_linux_ppc |
51 # include "orderAccess_linux_ppc.inline.hpp" | 51 # include "orderAccess_linux_ppc.inline.hpp" |
52 #endif | |
53 #ifdef TARGET_OS_ARCH_aix_ppc | |
54 # include "orderAccess_aix_ppc.inline.hpp" | |
52 #endif | 55 #endif |
53 #ifdef TARGET_OS_ARCH_bsd_x86 | 56 #ifdef TARGET_OS_ARCH_bsd_x86 |
54 # include "orderAccess_bsd_x86.inline.hpp" | 57 # include "orderAccess_bsd_x86.inline.hpp" |
55 #endif | 58 #endif |
56 #ifdef TARGET_OS_ARCH_bsd_zero | 59 #ifdef TARGET_OS_ARCH_bsd_zero |