Mercurial > hg > graal-compiler
comparison src/share/vm/prims/nativeLookup.cpp @ 8124:5fc51c1ecdeb
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Tue, 05 Mar 2013 23:44:54 +0100 |
parents | 2cb439954abf db9981fd3124 |
children | 836a62f43af9 |
comparison
equal
deleted
inserted
replaced
7943:a413bcd552a4 | 8124:5fc51c1ecdeb |
---|---|
38 #include "runtime/arguments.hpp" | 38 #include "runtime/arguments.hpp" |
39 #include "runtime/handles.inline.hpp" | 39 #include "runtime/handles.inline.hpp" |
40 #include "runtime/javaCalls.hpp" | 40 #include "runtime/javaCalls.hpp" |
41 #include "runtime/sharedRuntime.hpp" | 41 #include "runtime/sharedRuntime.hpp" |
42 #include "runtime/signature.hpp" | 42 #include "runtime/signature.hpp" |
43 #include "utilities/macros.hpp" | |
43 #ifdef TARGET_OS_FAMILY_linux | 44 #ifdef TARGET_OS_FAMILY_linux |
44 # include "os_linux.inline.hpp" | 45 # include "os_linux.inline.hpp" |
45 #endif | 46 #endif |
46 #ifdef TARGET_OS_FAMILY_solaris | 47 #ifdef TARGET_OS_FAMILY_solaris |
47 # include "os_solaris.inline.hpp" | 48 # include "os_solaris.inline.hpp" |