Mercurial > hg > truffle
comparison src/os/bsd/vm/os_bsd.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 | 3b01d0321dfa |
| children | 0af5da0c9d9d |
comparison
equal
deleted
inserted
replaced
| 6824:f13867c41f73 | 6825:bf2edd3c9b0f |
|---|---|
| 79 # include "nativeInst_arm.hpp" | 79 # include "nativeInst_arm.hpp" |
| 80 #endif | 80 #endif |
| 81 #ifdef TARGET_ARCH_ppc | 81 #ifdef TARGET_ARCH_ppc |
| 82 # include "assembler_ppc.inline.hpp" | 82 # include "assembler_ppc.inline.hpp" |
| 83 # include "nativeInst_ppc.hpp" | 83 # include "nativeInst_ppc.hpp" |
| 84 #endif | |
| 85 #ifdef COMPILER1 | |
| 86 #include "c1/c1_Runtime1.hpp" | |
| 87 #endif | |
| 88 #ifdef COMPILER2 | |
| 89 #include "opto/runtime.hpp" | |
| 90 #endif | 84 #endif |
| 91 | 85 |
| 92 // put OS-includes here | 86 // put OS-includes here |
| 93 # include <sys/types.h> | 87 # include <sys/types.h> |
| 94 # include <sys/mman.h> | 88 # include <sys/mman.h> |