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

[jumbo] avoid MAP_TYPE system header symbol clashes

Browse Source 
Linux builds have an include chain from src/perf-jit.cc:
sys/mman.h -> bits/mman.h -> bits/mman-linux.h, which defines
a MAP_TYPE macro that conflicts with InstanceType::MAP_TYPE
in jumbo builds, for some jumbo_file_merge_limit values.

Since MAP_TYPE isn't used in perf-jit.cc, it should be safe
to #undef the macro immediately after the sys/mman.h #include
statement.

Bug: chromium:746958
Change-Id: I1339a4f56cf6783bf6121cd44c93e776af9458ba
Reviewed-on: https://chromium-review.googlesource.com/654042
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@opera.com>
Cr-Commit-Position: refs/heads/master@{#47971}
This commit is contained in:
Mostyn Bramley-Moore 2017-09-07 20:32:13 +02:00 committed by Commit Bot
parent ae53f26d8f
commit 5af9ec2cca
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/perf-jit.cc
View File

@ -37,6 +37,7 @@
#if V8_OS_LINUX #if V8_OS_LINUX
#include <fcntl.h> #include <fcntl.h>
#include <sys/mman.h> #include <sys/mman.h>
#undef MAP_TYPE // jumbo: conflicts with v8::internal::InstanceType::MAP_TYPE
#include <unistd.h> #include <unistd.h>
#endif // V8_OS_LINUX #endif // V8_OS_LINUX