Mercurial > hg > graal-jvmci-8
comparison src/os/linux/vm/os_linux.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 957c266d8bc5 bf2edd3c9b0f |
children | 2cb439954abf |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
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 | 84 #endif |
85 #ifdef COMPILER1 | |
86 #include "c1/c1_Runtime1.hpp" | |
87 #endif | |
88 #ifdef COMPILER2 | |
89 #include "opto/runtime.hpp" | |
90 #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> |
95 # include <sys/stat.h> | 89 # include <sys/stat.h> |