Mercurial > hg > graal-jvmci-8
comparison src/share/vm/ci/ciEnv.cpp @ 8004:df8462fbe585
Merge
author | vladidan |
---|---|
date | Thu, 07 Feb 2013 20:40:14 -0500 |
parents | fcc9e7681d63 db9981fd3124 |
children | f16e75e0cf11 |
comparison
equal
deleted
inserted
replaced
8000:d05ff4bf41b3 | 8004:df8462fbe585 |
---|---|
50 #include "prims/jvmtiExport.hpp" | 50 #include "prims/jvmtiExport.hpp" |
51 #include "runtime/init.hpp" | 51 #include "runtime/init.hpp" |
52 #include "runtime/reflection.hpp" | 52 #include "runtime/reflection.hpp" |
53 #include "runtime/sharedRuntime.hpp" | 53 #include "runtime/sharedRuntime.hpp" |
54 #include "utilities/dtrace.hpp" | 54 #include "utilities/dtrace.hpp" |
55 #include "utilities/macros.hpp" | |
55 #ifdef COMPILER1 | 56 #ifdef COMPILER1 |
56 #include "c1/c1_Runtime1.hpp" | 57 #include "c1/c1_Runtime1.hpp" |
57 #endif | 58 #endif |
58 #ifdef COMPILER2 | 59 #ifdef COMPILER2 |
59 #include "opto/runtime.hpp" | 60 #include "opto/runtime.hpp" |