Mercurial > hg > truffle
comparison src/cpu/x86/vm/stubGenerator_x86_64.cpp @ 7182:c24f778e9401
Merge
author | johnc |
---|---|
date | Thu, 29 Nov 2012 11:23:15 -0800 |
parents | f34d701e952e |
children | d2f8c38e543d |
comparison
equal
deleted
inserted
replaced
7176:59c790074993 | 7182:c24f778e9401 |
---|---|
35 #include "runtime/frame.inline.hpp" | 35 #include "runtime/frame.inline.hpp" |
36 #include "runtime/handles.inline.hpp" | 36 #include "runtime/handles.inline.hpp" |
37 #include "runtime/sharedRuntime.hpp" | 37 #include "runtime/sharedRuntime.hpp" |
38 #include "runtime/stubCodeGenerator.hpp" | 38 #include "runtime/stubCodeGenerator.hpp" |
39 #include "runtime/stubRoutines.hpp" | 39 #include "runtime/stubRoutines.hpp" |
40 #include "runtime/thread.inline.hpp" | |
40 #include "utilities/top.hpp" | 41 #include "utilities/top.hpp" |
41 #ifdef TARGET_OS_FAMILY_linux | |
42 # include "thread_linux.inline.hpp" | |
43 #endif | |
44 #ifdef TARGET_OS_FAMILY_solaris | |
45 # include "thread_solaris.inline.hpp" | |
46 #endif | |
47 #ifdef TARGET_OS_FAMILY_windows | |
48 # include "thread_windows.inline.hpp" | |
49 #endif | |
50 #ifdef TARGET_OS_FAMILY_bsd | |
51 # include "thread_bsd.inline.hpp" | |
52 #endif | |
53 #ifdef COMPILER2 | 42 #ifdef COMPILER2 |
54 #include "opto/runtime.hpp" | 43 #include "opto/runtime.hpp" |
55 #endif | 44 #endif |
56 | 45 |
57 // Declaration and definition of StubGenerator (no .hpp file). | 46 // Declaration and definition of StubGenerator (no .hpp file). |