comparison src/share/vm/code/relocInfo.cpp @ 2211:0cd39a385a72

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@gmail.com>
date Mon, 21 Feb 2011 19:17:33 +0100
parents b92c45f2bc75
children d673ef06fe96
comparison
equal deleted inserted replaced
2184:5d801e6b9a80 2211:0cd39a385a72
38 # include "nativeInst_sparc.hpp" 38 # include "nativeInst_sparc.hpp"
39 #endif 39 #endif
40 #ifdef TARGET_ARCH_zero 40 #ifdef TARGET_ARCH_zero
41 # include "assembler_zero.inline.hpp" 41 # include "assembler_zero.inline.hpp"
42 # include "nativeInst_zero.hpp" 42 # include "nativeInst_zero.hpp"
43 #endif
44 #ifdef TARGET_ARCH_arm
45 # include "assembler_arm.inline.hpp"
46 # include "nativeInst_arm.hpp"
47 #endif
48 #ifdef TARGET_ARCH_ppc
49 # include "assembler_ppc.inline.hpp"
50 # include "nativeInst_ppc.hpp"
43 #endif 51 #endif
44 52
45 53
46 const RelocationHolder RelocationHolder::none; // its type is relocInfo::none 54 const RelocationHolder RelocationHolder::none; // its type is relocInfo::none
47 55