Mercurial > hg > truffle
comparison src/share/vm/runtime/javaCalls.hpp @ 2211:0cd39a385a72
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
---|---|
date | Mon, 21 Feb 2011 19:17:33 +0100 |
parents | 9569fdf936ff b92c45f2bc75 |
children | 0654ee04b214 |
comparison
equal
deleted
inserted
replaced
2184:5d801e6b9a80 | 2211:0cd39a385a72 |
---|---|
36 #ifdef TARGET_ARCH_sparc | 36 #ifdef TARGET_ARCH_sparc |
37 # include "jniTypes_sparc.hpp" | 37 # include "jniTypes_sparc.hpp" |
38 #endif | 38 #endif |
39 #ifdef TARGET_ARCH_zero | 39 #ifdef TARGET_ARCH_zero |
40 # include "jniTypes_zero.hpp" | 40 # include "jniTypes_zero.hpp" |
41 #endif | |
42 #ifdef TARGET_ARCH_arm | |
43 # include "jniTypes_arm.hpp" | |
44 #endif | |
45 #ifdef TARGET_ARCH_ppc | |
46 # include "jniTypes_ppc.hpp" | |
41 #endif | 47 #endif |
42 #ifdef TARGET_OS_FAMILY_linux | 48 #ifdef TARGET_OS_FAMILY_linux |
43 # include "thread_linux.inline.hpp" | 49 # include "thread_linux.inline.hpp" |
44 #endif | 50 #endif |
45 #ifdef TARGET_OS_FAMILY_solaris | 51 #ifdef TARGET_OS_FAMILY_solaris |