AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Some PNaCL compatibility fixes.

Browse Source 
* Removed a few useless and non-standard #includes.
* Made OS::GetCurrentProcessId compile without syscall.

R=bmeurer@chromium.org

Review URL: https://codereview.chromium.org/508933002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23459 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
svenpanne@chromium.org 2014-08-27 13:47:19 +00:00
parent c21026c816
commit ac8eb91185
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/base/platform/platform-posix.cc
View File

@ -6,7 +6,6 @@
// own, but contains the parts which are the same across the POSIX platforms
// Linux, MacOS, FreeBSD, OpenBSD, NetBSD and QNX.
#include <dlfcn.h>
#include <errno.h>
#include <limits.h>
#include <pthread.h>
@ -20,10 +19,12 @@
#include <sys/mman.h>
#include <sys/resource.h>
#include <sys/stat.h>
#if !defined(__pnacl__)
#include <sys/syscall.h>
#endif
#include <sys/time.h>
#include <sys/types.h>
#if defined(__linux__)
#if defined(__linux__) && !defined(__pnacl__)
#include <sys/prctl.h> // NOLINT, for prctl
#endif
#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
@ -31,10 +32,6 @@
#include <sys/sysctl.h> // NOLINT, for sysctl
#endif
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
#undef MAP_TYPE
#if defined(ANDROID) && !defined(V8_ANDROID_LOG_STDOUT)
@ -55,6 +52,10 @@
#include "src/base/atomicops.h"
#endif
#if V8_OS_MACOSX
#include <dlfcn.h>
#endif
namespace v8 {
namespace base {
@ -252,9 +253,13 @@ int OS::GetCurrentProcessId() {
int OS::GetCurrentThreadId() {
#if defined(ANDROID)
return static_cast<int>(syscall(__NR_gettid));
#else
#elif defined(SYS_gettid)
return static_cast<int>(syscall(SYS_gettid));
#endif // defined(ANDROID)
#else
// PNaCL doesn't have a way to get an integral thread ID, but it doesn't
// really matter, because we only need it in PerfJitLogger::LogRecordedBuffer.
return 0;
#endif
}

2
src/heap/mark-compact-inl.h
View File

@ -5,8 +5,6 @@
#ifndef V8_HEAP_MARK_COMPACT_INL_H_
#define V8_HEAP_MARK_COMPACT_INL_H_
#include <memory.h>
#include "src/heap/mark-compact.h"
#include "src/isolate.h"