Mercurial > hg > graal-jvmci-8
comparison src/share/vm/c1/c1_globals.hpp @ 2211:0cd39a385a72
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@gmail.com> |
---|---|
date | Mon, 21 Feb 2011 19:17:33 +0100 |
parents | 06f017f7daa7 b92c45f2bc75 |
children | 0654ee04b214 |
comparison
equal
deleted
inserted
replaced
2184:5d801e6b9a80 | 2211:0cd39a385a72 |
---|---|
29 #ifdef TARGET_ARCH_x86 | 29 #ifdef TARGET_ARCH_x86 |
30 # include "c1_globals_x86.hpp" | 30 # include "c1_globals_x86.hpp" |
31 #endif | 31 #endif |
32 #ifdef TARGET_ARCH_sparc | 32 #ifdef TARGET_ARCH_sparc |
33 # include "c1_globals_sparc.hpp" | 33 # include "c1_globals_sparc.hpp" |
34 #endif | |
35 #ifdef TARGET_ARCH_arm | |
36 # include "c1_globals_arm.hpp" | |
37 #endif | |
38 #ifdef TARGET_ARCH_ppc | |
39 # include "c1_globals_ppc.hpp" | |
34 #endif | 40 #endif |
35 #ifdef TARGET_OS_FAMILY_linux | 41 #ifdef TARGET_OS_FAMILY_linux |
36 # include "c1_globals_linux.hpp" | 42 # include "c1_globals_linux.hpp" |
37 #endif | 43 #endif |
38 #ifdef TARGET_OS_FAMILY_solaris | 44 #ifdef TARGET_OS_FAMILY_solaris |