comparison src/share/vm/runtime/safepoint.cpp @ 2211:0cd39a385a72

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date Mon, 21 Feb 2011 19:17:33 +0100
parents b92c45f2bc75
children 1d1603768966
comparison
equal deleted inserted replaced
2184:5d801e6b9a80 2211:0cd39a385a72
58 # include "vmreg_sparc.inline.hpp" 58 # include "vmreg_sparc.inline.hpp"
59 #endif 59 #endif
60 #ifdef TARGET_ARCH_zero 60 #ifdef TARGET_ARCH_zero
61 # include "nativeInst_zero.hpp" 61 # include "nativeInst_zero.hpp"
62 # include "vmreg_zero.inline.hpp" 62 # include "vmreg_zero.inline.hpp"
63 #endif
64 #ifdef TARGET_ARCH_arm
65 # include "nativeInst_arm.hpp"
66 # include "vmreg_arm.inline.hpp"
67 #endif
68 #ifdef TARGET_ARCH_ppc
69 # include "nativeInst_ppc.hpp"
70 # include "vmreg_ppc.inline.hpp"
63 #endif 71 #endif
64 #ifdef TARGET_OS_FAMILY_linux 72 #ifdef TARGET_OS_FAMILY_linux
65 # include "thread_linux.inline.hpp" 73 # include "thread_linux.inline.hpp"
66 #endif 74 #endif
67 #ifdef TARGET_OS_FAMILY_solaris 75 #ifdef TARGET_OS_FAMILY_solaris