Mercurial > hg > truffle
comparison src/cpu/x86/vm/stubRoutines_x86_64.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Fri, 14 Dec 2012 14:35:13 +0100 |
parents | f34d701e952e |
children | b800986664f4 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
24 | 24 |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #include "runtime/deoptimization.hpp" | 26 #include "runtime/deoptimization.hpp" |
27 #include "runtime/frame.inline.hpp" | 27 #include "runtime/frame.inline.hpp" |
28 #include "runtime/stubRoutines.hpp" | 28 #include "runtime/stubRoutines.hpp" |
29 #ifdef TARGET_OS_FAMILY_linux | 29 #include "runtime/thread.inline.hpp" |
30 # include "thread_linux.inline.hpp" | |
31 #endif | |
32 #ifdef TARGET_OS_FAMILY_solaris | |
33 # include "thread_solaris.inline.hpp" | |
34 #endif | |
35 #ifdef TARGET_OS_FAMILY_windows | |
36 # include "thread_windows.inline.hpp" | |
37 #endif | |
38 #ifdef TARGET_OS_FAMILY_bsd | |
39 # include "thread_bsd.inline.hpp" | |
40 #endif | |
41 | 30 |
42 // Implementation of the platform-specific part of StubRoutines - for | 31 // Implementation of the platform-specific part of StubRoutines - for |
43 // a description of how to extend it, see the stubRoutines.hpp file. | 32 // a description of how to extend it, see the stubRoutines.hpp file. |
44 | 33 |
45 address StubRoutines::x86::_get_previous_fp_entry = NULL; | 34 address StubRoutines::x86::_get_previous_fp_entry = NULL; |