Mercurial > hg > truffle
comparison src/os_cpu/linux_x86/vm/os_linux_x86.cpp @ 6825:bf2edd3c9b0f
8000102: Resolve include conflicts
Summary: Removing include of c1/c1_runtime.hpp and opto/runtime.hpp from all os-files.
Reviewed-by: kvn
Contributed-by: nils.eliasson@oracle.com
author | neliasso |
---|---|
date | Thu, 04 Oct 2012 06:31:07 -0700 |
parents | 716e6ef4482a |
children | b9a9ed0f8eeb |
comparison
equal
deleted
inserted
replaced
6824:f13867c41f73 | 6825:bf2edd3c9b0f |
---|---|
50 #include "runtime/stubRoutines.hpp" | 50 #include "runtime/stubRoutines.hpp" |
51 #include "runtime/timer.hpp" | 51 #include "runtime/timer.hpp" |
52 #include "thread_linux.inline.hpp" | 52 #include "thread_linux.inline.hpp" |
53 #include "utilities/events.hpp" | 53 #include "utilities/events.hpp" |
54 #include "utilities/vmError.hpp" | 54 #include "utilities/vmError.hpp" |
55 #ifdef COMPILER1 | |
56 #include "c1/c1_Runtime1.hpp" | |
57 #endif | |
58 #ifdef COMPILER2 | |
59 #include "opto/runtime.hpp" | |
60 #endif | |
61 | 55 |
62 // put OS-includes here | 56 // put OS-includes here |
63 # include <sys/types.h> | 57 # include <sys/types.h> |
64 # include <sys/mman.h> | 58 # include <sys/mman.h> |
65 # include <pthread.h> | 59 # include <pthread.h> |