Update makefiles after merge of Chromium at 226237
This commit was generated by merge_from_chromium.py.
Change-Id: Ie5ac26966e4cb7c86197caa04d684cb94a0c1631
diff --git a/tools/gyp/mksnapshot.arm.host.darwin-arm.mk b/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
index 837c5ad..e5b6e92 100644
--- a/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
+++ b/tools/gyp/mksnapshot.arm.host.darwin-arm.mk
@@ -142,7 +142,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.arm.host.linux-arm.mk b/tools/gyp/mksnapshot.arm.host.linux-arm.mk
index 3bd0500..99d247d 100644
--- a/tools/gyp/mksnapshot.arm.host.linux-arm.mk
+++ b/tools/gyp/mksnapshot.arm.host.linux-arm.mk
@@ -142,7 +142,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk b/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
index f592ada..8805dd6 100644
--- a/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
+++ b/tools/gyp/mksnapshot.ia32.host.darwin-x86.mk
@@ -140,7 +140,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.ia32.host.linux-x86.mk b/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
index f1fad14..d586c44 100644
--- a/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
+++ b/tools/gyp/mksnapshot.ia32.host.linux-x86.mk
@@ -140,7 +140,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk b/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk
index 94a5ab0..b99c9bf 100644
--- a/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/mksnapshot.mipsel.host.darwin-mips.mk
@@ -144,7 +144,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk b/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk
index 92530e9..1414e6b 100644
--- a/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk
+++ b/tools/gyp/mksnapshot.mipsel.host.linux-mips.mk
@@ -144,7 +144,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.arm.host.darwin-arm.mk b/tools/gyp/v8_base.arm.host.darwin-arm.mk
index 5c61c3f..dbad8a7 100644
--- a/tools/gyp/v8_base.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.host.darwin-arm.mk
@@ -114,7 +114,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -310,7 +309,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.arm.host.linux-arm.mk b/tools/gyp/v8_base.arm.host.linux-arm.mk
index 40798f4..11aa823 100644
--- a/tools/gyp/v8_base.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.host.linux-arm.mk
@@ -114,7 +114,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -312,7 +311,8 @@
'-DV8_LIBRT_NOT_AVAILABLE=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.arm.target.darwin-arm.mk b/tools/gyp/v8_base.arm.target.darwin-arm.mk
index 2d75790..6f44868 100644
--- a/tools/gyp/v8_base.arm.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.target.darwin-arm.mk
@@ -115,7 +115,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -361,7 +360,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.arm.target.linux-arm.mk b/tools/gyp/v8_base.arm.target.linux-arm.mk
index 2d75790..6f44868 100644
--- a/tools/gyp/v8_base.arm.target.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.target.linux-arm.mk
@@ -115,7 +115,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -361,7 +360,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.ia32.host.darwin-x86.mk b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
index e0a77a8..80ab986 100644
--- a/tools/gyp/v8_base.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
@@ -114,7 +114,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -306,7 +305,8 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.ia32.host.linux-x86.mk b/tools/gyp/v8_base.ia32.host.linux-x86.mk
index 9638f4b..3008059 100644
--- a/tools/gyp/v8_base.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.linux-x86.mk
@@ -114,7 +114,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -308,7 +307,8 @@
'-DV8_LIBRT_NOT_AVAILABLE=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.ia32.target.darwin-x86.mk b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
index d844833..2e27aca 100644
--- a/tools/gyp/v8_base.ia32.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
@@ -115,7 +115,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -360,7 +359,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.ia32.target.linux-x86.mk b/tools/gyp/v8_base.ia32.target.linux-x86.mk
index d844833..2e27aca 100644
--- a/tools/gyp/v8_base.ia32.target.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.linux-x86.mk
@@ -115,7 +115,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -360,7 +359,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
index 6d20798..730a626 100644
--- a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
@@ -114,7 +114,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -312,7 +311,8 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.mipsel.host.linux-mips.mk b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
index 7bed584..37064ab 100644
--- a/tools/gyp/v8_base.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
@@ -114,7 +114,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -314,7 +313,8 @@
'-DV8_LIBRT_NOT_AVAILABLE=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
index 7bb85dc..aec42f4 100644
--- a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
@@ -115,7 +115,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -361,7 +360,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.mipsel.target.linux-mips.mk b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
index 7bb85dc..aec42f4 100644
--- a/tools/gyp/v8_base.mipsel.target.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
@@ -115,7 +115,6 @@
v8/src/log-utils.cc \
v8/src/log.cc \
v8/src/mark-compact.cc \
- v8/src/marking-thread.cc \
v8/src/messages.cc \
v8/src/objects-debug.cc \
v8/src/objects-printer.cc \
@@ -361,7 +360,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk
index f9c9fad..7babc0e 100644
--- a/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_nosnapshot.arm.host.darwin-arm.mk
@@ -143,7 +143,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
index 410a577..c3ced4a 100644
--- a/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_nosnapshot.arm.host.linux-arm.mk
@@ -143,7 +143,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
index b0e392f..2a6f088 100644
--- a/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_nosnapshot.ia32.host.darwin-x86.mk
@@ -141,7 +141,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
index 756a807..fe343c6 100644
--- a/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_nosnapshot.ia32.host.linux-x86.mk
@@ -141,7 +141,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk
index c552c35..3838781 100644
--- a/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_nosnapshot.mipsel.host.darwin-mips.mk
@@ -145,7 +145,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk
index 6c12e45..3698993 100644
--- a/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_nosnapshot.mipsel.host.linux-mips.mk
@@ -145,7 +145,8 @@
'-DV8_I18N_SUPPORT' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm.mk b/tools/gyp/v8_snapshot.target.darwin-arm.mk
index cc6c7e7..0e10219 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk
@@ -207,7 +207,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-mips.mk b/tools/gyp/v8_snapshot.target.darwin-mips.mk
index 24341ed..3515cf5 100644
--- a/tools/gyp/v8_snapshot.target.darwin-mips.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk
@@ -207,7 +207,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86.mk b/tools/gyp/v8_snapshot.target.darwin-x86.mk
index 4f7d109..bb96538 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk
@@ -208,7 +208,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-arm.mk b/tools/gyp/v8_snapshot.target.linux-arm.mk
index cc6c7e7..0e10219 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm.mk
@@ -207,7 +207,8 @@
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-mips.mk b/tools/gyp/v8_snapshot.target.linux-mips.mk
index 24341ed..3515cf5 100644
--- a/tools/gyp/v8_snapshot.target.linux-mips.mk
+++ b/tools/gyp/v8_snapshot.target.linux-mips.mk
@@ -207,7 +207,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-x86.mk b/tools/gyp/v8_snapshot.target.linux-x86.mk
index 4f7d109..bb96538 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86.mk
@@ -208,7 +208,8 @@
'-DCHROME_BUILD_ID=""' \
'-DNDEBUG' \
'-DNVALGRIND' \
- '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
+ '-DENABLE_HANDLE_ZAPPING'
# Include paths placed before CFLAGS/CPPFLAGS
