Update makefiles after merge of Chromium at 40.0.2214.27

This commit was generated by merge_from_chromium.py.

Change-Id: I9eadee206d7e2402c0d9518b6b915a69273626bd

96 files changed, 176 insertions, 304 deletions

diff --git a/tools/gyp/mksnapshot.host.darwin-arm.mk b/tools/gyp/mksnapshot.host.darwin-arm.mk
index 8fe45ae78..0c4f37972 100644
--- a/tools/gyp/mksnapshot.host.darwin-arm.mk
+++ b/tools/gyp/mksnapshot.host.darwin-arm.mk
@@ -186,8 +186,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-arm64.mk b/tools/gyp/mksnapshot.host.darwin-arm64.mk
index 715b0d185..1234a9471 100644
--- a/tools/gyp/mksnapshot.host.darwin-arm64.mk
+++ b/tools/gyp/mksnapshot.host.darwin-arm64.mk
@@ -182,8 +182,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-mips.mk b/tools/gyp/mksnapshot.host.darwin-mips.mk
index a2aa745bc..aa9e51a7a 100644
--- a/tools/gyp/mksnapshot.host.darwin-mips.mk
+++ b/tools/gyp/mksnapshot.host.darwin-mips.mk
@@ -90,8 +90,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -99,6 +97,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -183,8 +182,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -192,10 +189,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-mips64.mk b/tools/gyp/mksnapshot.host.darwin-mips64.mk
index 27e364f14..7918f8291 100644
--- a/tools/gyp/mksnapshot.host.darwin-mips64.mk
+++ b/tools/gyp/mksnapshot.host.darwin-mips64.mk
@@ -89,7 +89,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -97,6 +96,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -180,7 +180,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -188,10 +187,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-x86.mk b/tools/gyp/mksnapshot.host.darwin-x86.mk
index 04888f1b4..026d4bd71 100644
--- a/tools/gyp/mksnapshot.host.darwin-x86.mk
+++ b/tools/gyp/mksnapshot.host.darwin-x86.mk
@@ -184,8 +184,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.darwin-x86_64.mk b/tools/gyp/mksnapshot.host.darwin-x86_64.mk
index b7ce989f2..b981eb568 100644
--- a/tools/gyp/mksnapshot.host.darwin-x86_64.mk
+++ b/tools/gyp/mksnapshot.host.darwin-x86_64.mk
@@ -184,8 +184,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-arm.mk b/tools/gyp/mksnapshot.host.linux-arm.mk
index 6b88a9704..461338060 100644
--- a/tools/gyp/mksnapshot.host.linux-arm.mk
+++ b/tools/gyp/mksnapshot.host.linux-arm.mk
@@ -186,8 +186,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-arm64.mk b/tools/gyp/mksnapshot.host.linux-arm64.mk
index 571d49c74..13d1817bd 100644
--- a/tools/gyp/mksnapshot.host.linux-arm64.mk
+++ b/tools/gyp/mksnapshot.host.linux-arm64.mk
@@ -182,8 +182,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-mips.mk b/tools/gyp/mksnapshot.host.linux-mips.mk
index e7b6c469f..ec93ce0cb 100644
--- a/tools/gyp/mksnapshot.host.linux-mips.mk
+++ b/tools/gyp/mksnapshot.host.linux-mips.mk
@@ -90,8 +90,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -99,6 +97,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -183,8 +182,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -192,10 +189,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-mips64.mk b/tools/gyp/mksnapshot.host.linux-mips64.mk
index bc48535af..d0bc8ec94 100644
--- a/tools/gyp/mksnapshot.host.linux-mips64.mk
+++ b/tools/gyp/mksnapshot.host.linux-mips64.mk
@@ -89,7 +89,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -97,6 +96,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -180,7 +180,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DU_USING_ICU_NAMESPACE=0' \
 	'-DU_ENABLE_DYLOAD=0' \
@@ -188,10 +187,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-x86.mk b/tools/gyp/mksnapshot.host.linux-x86.mk
index a537898ac..945e24546 100644
--- a/tools/gyp/mksnapshot.host.linux-x86.mk
+++ b/tools/gyp/mksnapshot.host.linux-x86.mk
@@ -184,8 +184,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/mksnapshot.host.linux-x86_64.mk b/tools/gyp/mksnapshot.host.linux-x86_64.mk
index cef8b35c5..77731a904 100644
--- a/tools/gyp/mksnapshot.host.linux-x86_64.mk
+++ b/tools/gyp/mksnapshot.host.linux-x86_64.mk
@@ -184,8 +184,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk
index 17e40b09a..840dd4698 100644
--- a/tools/gyp/v8_base.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.host.darwin-arm.mk
@@ -438,8 +438,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk
index a081a53ed..c1b98fc16 100644
--- a/tools/gyp/v8_base.host.darwin-arm64.mk
+++ b/tools/gyp/v8_base.host.darwin-arm64.mk
@@ -438,8 +438,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk
index 98fa808a6..8474e5d9a 100644
--- a/tools/gyp/v8_base.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.host.darwin-mips.mk
@@ -340,8 +340,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -350,6 +348,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -434,8 +433,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -444,10 +441,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-mips64.mk b/tools/gyp/v8_base.host.darwin-mips64.mk
index f206c22b9..f9962753e 100644
--- a/tools/gyp/v8_base.host.darwin-mips64.mk
+++ b/tools/gyp/v8_base.host.darwin-mips64.mk
@@ -336,7 +336,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -345,6 +344,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -428,7 +428,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -437,10 +436,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk
index 936cb8afd..fbe8cf199 100644
--- a/tools/gyp/v8_base.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.host.darwin-x86.mk
@@ -434,8 +434,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk
index 3bbd36894..bea4d0385 100644
--- a/tools/gyp/v8_base.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.host.darwin-x86_64.mk
@@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \
 	v8/src/x64/lithium-x64.cc \
 	v8/src/x64/macro-assembler-x64.cc \
 	v8/src/x64/regexp-macro-assembler-x64.cc \
+	v8/src/compiler/x64/code-generator-x64.cc \
+	v8/src/compiler/x64/instruction-selector-x64.cc \
+	v8/src/compiler/x64/linkage-x64.cc \
 	v8/src/ic/x64/access-compiler-x64.cc \
 	v8/src/ic/x64/handler-compiler-x64.cc \
 	v8/src/ic/x64/ic-x64.cc \
 	v8/src/ic/x64/ic-compiler-x64.cc \
-	v8/src/ic/x64/stub-cache-x64.cc \
-	v8/src/compiler/x64/code-generator-x64.cc \
-	v8/src/compiler/x64/instruction-selector-x64.cc \
-	v8/src/compiler/x64/linkage-x64.cc
+	v8/src/ic/x64/stub-cache-x64.cc
 
 
 # Flags passed to both C and C++ files.
@@ -434,8 +434,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk
index 17e40b09a..840dd4698 100644
--- a/tools/gyp/v8_base.host.linux-arm.mk
+++ b/tools/gyp/v8_base.host.linux-arm.mk
@@ -438,8 +438,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk
index a081a53ed..c1b98fc16 100644
--- a/tools/gyp/v8_base.host.linux-arm64.mk
+++ b/tools/gyp/v8_base.host.linux-arm64.mk
@@ -438,8 +438,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk
index 98fa808a6..8474e5d9a 100644
--- a/tools/gyp/v8_base.host.linux-mips.mk
+++ b/tools/gyp/v8_base.host.linux-mips.mk
@@ -340,8 +340,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -350,6 +348,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -434,8 +433,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -444,10 +441,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-mips64.mk b/tools/gyp/v8_base.host.linux-mips64.mk
index f206c22b9..f9962753e 100644
--- a/tools/gyp/v8_base.host.linux-mips64.mk
+++ b/tools/gyp/v8_base.host.linux-mips64.mk
@@ -336,7 +336,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -345,6 +344,7 @@ MY_DEFS_Debug := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -428,7 +428,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -437,10 +436,10 @@ MY_DEFS_Release := \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk
index 936cb8afd..fbe8cf199 100644
--- a/tools/gyp/v8_base.host.linux-x86.mk
+++ b/tools/gyp/v8_base.host.linux-x86.mk
@@ -434,8 +434,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk
index 3bbd36894..bea4d0385 100644
--- a/tools/gyp/v8_base.host.linux-x86_64.mk
+++ b/tools/gyp/v8_base.host.linux-x86_64.mk
@@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \
 	v8/src/x64/lithium-x64.cc \
 	v8/src/x64/macro-assembler-x64.cc \
 	v8/src/x64/regexp-macro-assembler-x64.cc \
+	v8/src/compiler/x64/code-generator-x64.cc \
+	v8/src/compiler/x64/instruction-selector-x64.cc \
+	v8/src/compiler/x64/linkage-x64.cc \
 	v8/src/ic/x64/access-compiler-x64.cc \
 	v8/src/ic/x64/handler-compiler-x64.cc \
 	v8/src/ic/x64/ic-x64.cc \
 	v8/src/ic/x64/ic-compiler-x64.cc \
-	v8/src/ic/x64/stub-cache-x64.cc \
-	v8/src/compiler/x64/code-generator-x64.cc \
-	v8/src/compiler/x64/instruction-selector-x64.cc \
-	v8/src/compiler/x64/linkage-x64.cc
+	v8/src/ic/x64/stub-cache-x64.cc
 
 
 # Flags passed to both C and C++ files.
@@ -434,8 +434,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk
index 33b77c2e5..90c451845 100644
--- a/tools/gyp/v8_base.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.target.darwin-arm.mk
@@ -484,8 +484,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk
index abfc28713..a3d5bf852 100644
--- a/tools/gyp/v8_base.target.darwin-arm64.mk
+++ b/tools/gyp/v8_base.target.darwin-arm64.mk
@@ -463,8 +463,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk
index 5bfd50ba8..9daac3d1f 100644
--- a/tools/gyp/v8_base.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.target.darwin-mips.mk
@@ -347,8 +347,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -362,6 +360,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -459,8 +458,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -474,10 +471,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-mips64.mk b/tools/gyp/v8_base.target.darwin-mips64.mk
index 4b79273f2..522526662 100644
--- a/tools/gyp/v8_base.target.darwin-mips64.mk
+++ b/tools/gyp/v8_base.target.darwin-mips64.mk
@@ -344,7 +344,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -358,6 +357,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -455,7 +455,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -469,10 +468,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk
index c80d27f58..272ce49f3 100644
--- a/tools/gyp/v8_base.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.target.darwin-x86.mk
@@ -471,8 +471,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk
index 59c2022bc..0669b65d3 100644
--- a/tools/gyp/v8_base.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.target.darwin-x86_64.mk
@@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \
 	v8/src/x64/lithium-x64.cc \
 	v8/src/x64/macro-assembler-x64.cc \
 	v8/src/x64/regexp-macro-assembler-x64.cc \
+	v8/src/compiler/x64/code-generator-x64.cc \
+	v8/src/compiler/x64/instruction-selector-x64.cc \
+	v8/src/compiler/x64/linkage-x64.cc \
 	v8/src/ic/x64/access-compiler-x64.cc \
 	v8/src/ic/x64/handler-compiler-x64.cc \
 	v8/src/ic/x64/ic-x64.cc \
 	v8/src/ic/x64/ic-compiler-x64.cc \
-	v8/src/ic/x64/stub-cache-x64.cc \
-	v8/src/compiler/x64/code-generator-x64.cc \
-	v8/src/compiler/x64/instruction-selector-x64.cc \
-	v8/src/compiler/x64/linkage-x64.cc
+	v8/src/ic/x64/stub-cache-x64.cc
 
 
 # Flags passed to both C and C++ files.
@@ -469,8 +469,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk
index 33b77c2e5..90c451845 100644
--- a/tools/gyp/v8_base.target.linux-arm.mk
+++ b/tools/gyp/v8_base.target.linux-arm.mk
@@ -484,8 +484,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk
index abfc28713..a3d5bf852 100644
--- a/tools/gyp/v8_base.target.linux-arm64.mk
+++ b/tools/gyp/v8_base.target.linux-arm64.mk
@@ -463,8 +463,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk
index 5bfd50ba8..9daac3d1f 100644
--- a/tools/gyp/v8_base.target.linux-mips.mk
+++ b/tools/gyp/v8_base.target.linux-mips.mk
@@ -347,8 +347,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -362,6 +360,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -459,8 +458,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -474,10 +471,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-mips64.mk b/tools/gyp/v8_base.target.linux-mips64.mk
index 4b79273f2..522526662 100644
--- a/tools/gyp/v8_base.target.linux-mips64.mk
+++ b/tools/gyp/v8_base.target.linux-mips64.mk
@@ -344,7 +344,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -358,6 +357,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -455,7 +455,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
 	'-DU_USING_ICU_NAMESPACE=0' \
@@ -469,10 +468,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk
index c80d27f58..272ce49f3 100644
--- a/tools/gyp/v8_base.target.linux-x86.mk
+++ b/tools/gyp/v8_base.target.linux-x86.mk
@@ -471,8 +471,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk
index 59c2022bc..0669b65d3 100644
--- a/tools/gyp/v8_base.target.linux-x86_64.mk
+++ b/tools/gyp/v8_base.target.linux-x86_64.mk
@@ -274,14 +274,14 @@ LOCAL_SRC_FILES := \
 	v8/src/x64/lithium-x64.cc \
 	v8/src/x64/macro-assembler-x64.cc \
 	v8/src/x64/regexp-macro-assembler-x64.cc \
+	v8/src/compiler/x64/code-generator-x64.cc \
+	v8/src/compiler/x64/instruction-selector-x64.cc \
+	v8/src/compiler/x64/linkage-x64.cc \
 	v8/src/ic/x64/access-compiler-x64.cc \
 	v8/src/ic/x64/handler-compiler-x64.cc \
 	v8/src/ic/x64/ic-x64.cc \
 	v8/src/ic/x64/ic-compiler-x64.cc \
-	v8/src/ic/x64/stub-cache-x64.cc \
-	v8/src/compiler/x64/code-generator-x64.cc \
-	v8/src/compiler/x64/instruction-selector-x64.cc \
-	v8/src/compiler/x64/linkage-x64.cc
+	v8/src/ic/x64/stub-cache-x64.cc
 
 
 # Flags passed to both C and C++ files.
@@ -469,8 +469,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-arm.mk b/tools/gyp/v8_libbase.host.darwin-arm.mk
index 072b24003..11502dd06 100644
--- a/tools/gyp/v8_libbase.host.darwin-arm.mk
+++ b/tools/gyp/v8_libbase.host.darwin-arm.mk
@@ -183,8 +183,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-arm64.mk b/tools/gyp/v8_libbase.host.darwin-arm64.mk
index 58b849fa1..554fd202f 100644
--- a/tools/gyp/v8_libbase.host.darwin-arm64.mk
+++ b/tools/gyp/v8_libbase.host.darwin-arm64.mk
@@ -179,8 +179,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-mips.mk b/tools/gyp/v8_libbase.host.darwin-mips.mk
index 37431950d..87335b5fe 100644
--- a/tools/gyp/v8_libbase.host.darwin-mips.mk
+++ b/tools/gyp/v8_libbase.host.darwin-mips.mk
@@ -95,12 +95,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -183,16 +182,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-mips64.mk b/tools/gyp/v8_libbase.host.darwin-mips64.mk
index 7c4c3927d..aa8f1b04a 100644
--- a/tools/gyp/v8_libbase.host.darwin-mips64.mk
+++ b/tools/gyp/v8_libbase.host.darwin-mips64.mk
@@ -94,11 +94,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -180,15 +180,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-x86.mk b/tools/gyp/v8_libbase.host.darwin-x86.mk
index 1657e1432..2922ae9f6 100644
--- a/tools/gyp/v8_libbase.host.darwin-x86.mk
+++ b/tools/gyp/v8_libbase.host.darwin-x86.mk
@@ -181,8 +181,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.darwin-x86_64.mk b/tools/gyp/v8_libbase.host.darwin-x86_64.mk
index 2cc1fd4b9..d36390182 100644
--- a/tools/gyp/v8_libbase.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_libbase.host.darwin-x86_64.mk
@@ -181,8 +181,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-arm.mk b/tools/gyp/v8_libbase.host.linux-arm.mk
index 301eba821..e6ec23ec4 100644
--- a/tools/gyp/v8_libbase.host.linux-arm.mk
+++ b/tools/gyp/v8_libbase.host.linux-arm.mk
@@ -185,8 +185,7 @@ MY_DEFS_Release := \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-arm64.mk b/tools/gyp/v8_libbase.host.linux-arm64.mk
index b3fe4dbeb..695e806e8 100644
--- a/tools/gyp/v8_libbase.host.linux-arm64.mk
+++ b/tools/gyp/v8_libbase.host.linux-arm64.mk
@@ -181,8 +181,7 @@ MY_DEFS_Release := \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-mips.mk b/tools/gyp/v8_libbase.host.linux-mips.mk
index e69e4d228..5dd1ba4bb 100644
--- a/tools/gyp/v8_libbase.host.linux-mips.mk
+++ b/tools/gyp/v8_libbase.host.linux-mips.mk
@@ -95,12 +95,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -184,17 +183,15 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-mips64.mk b/tools/gyp/v8_libbase.host.linux-mips64.mk
index 644c33858..ee6311cf1 100644
--- a/tools/gyp/v8_libbase.host.linux-mips64.mk
+++ b/tools/gyp/v8_libbase.host.linux-mips64.mk
@@ -94,11 +94,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
@@ -181,16 +181,15 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-x86.mk b/tools/gyp/v8_libbase.host.linux-x86.mk
index 69dd7e184..b42eb6fbe 100644
--- a/tools/gyp/v8_libbase.host.linux-x86.mk
+++ b/tools/gyp/v8_libbase.host.linux-x86.mk
@@ -183,8 +183,7 @@ MY_DEFS_Release := \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.host.linux-x86_64.mk b/tools/gyp/v8_libbase.host.linux-x86_64.mk
index 56448314d..6f2f9d258 100644
--- a/tools/gyp/v8_libbase.host.linux-x86_64.mk
+++ b/tools/gyp/v8_libbase.host.linux-x86_64.mk
@@ -183,8 +183,7 @@ MY_DEFS_Release := \
 	'-DV8_LIBRT_NOT_AVAILABLE=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-arm.mk b/tools/gyp/v8_libbase.target.darwin-arm.mk
index 8d0938271..0e5b505e1 100644
--- a/tools/gyp/v8_libbase.target.darwin-arm.mk
+++ b/tools/gyp/v8_libbase.target.darwin-arm.mk
@@ -229,8 +229,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-arm64.mk b/tools/gyp/v8_libbase.target.darwin-arm64.mk
index 9adfbb6ad..246d7b280 100644
--- a/tools/gyp/v8_libbase.target.darwin-arm64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-arm64.mk
@@ -204,8 +204,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-mips.mk b/tools/gyp/v8_libbase.target.darwin-mips.mk
index 4a4d8fd6b..c6fc318b3 100644
--- a/tools/gyp/v8_libbase.target.darwin-mips.mk
+++ b/tools/gyp/v8_libbase.target.darwin-mips.mk
@@ -102,8 +102,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -113,6 +111,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -208,8 +207,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -219,10 +216,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-mips64.mk b/tools/gyp/v8_libbase.target.darwin-mips64.mk
index ba2bd02fd..83baa848a 100644
--- a/tools/gyp/v8_libbase.target.darwin-mips64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-mips64.mk
@@ -102,7 +102,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -112,6 +111,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -207,7 +207,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -217,10 +216,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-x86.mk b/tools/gyp/v8_libbase.target.darwin-x86.mk
index fcc15e376..e9c8b9d44 100644
--- a/tools/gyp/v8_libbase.target.darwin-x86.mk
+++ b/tools/gyp/v8_libbase.target.darwin-x86.mk
@@ -218,8 +218,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.darwin-x86_64.mk b/tools/gyp/v8_libbase.target.darwin-x86_64.mk
index b751ecc28..4dcf7b7f2 100644
--- a/tools/gyp/v8_libbase.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_libbase.target.darwin-x86_64.mk
@@ -216,8 +216,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-arm.mk b/tools/gyp/v8_libbase.target.linux-arm.mk
index 8d0938271..0e5b505e1 100644
--- a/tools/gyp/v8_libbase.target.linux-arm.mk
+++ b/tools/gyp/v8_libbase.target.linux-arm.mk
@@ -229,8 +229,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-arm64.mk b/tools/gyp/v8_libbase.target.linux-arm64.mk
index 9adfbb6ad..246d7b280 100644
--- a/tools/gyp/v8_libbase.target.linux-arm64.mk
+++ b/tools/gyp/v8_libbase.target.linux-arm64.mk
@@ -204,8 +204,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-mips.mk b/tools/gyp/v8_libbase.target.linux-mips.mk
index 4a4d8fd6b..c6fc318b3 100644
--- a/tools/gyp/v8_libbase.target.linux-mips.mk
+++ b/tools/gyp/v8_libbase.target.linux-mips.mk
@@ -102,8 +102,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -113,6 +111,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -208,8 +207,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -219,10 +216,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-mips64.mk b/tools/gyp/v8_libbase.target.linux-mips64.mk
index ba2bd02fd..83baa848a 100644
--- a/tools/gyp/v8_libbase.target.linux-mips64.mk
+++ b/tools/gyp/v8_libbase.target.linux-mips64.mk
@@ -102,7 +102,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -112,6 +111,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -207,7 +207,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -217,10 +216,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-x86.mk b/tools/gyp/v8_libbase.target.linux-x86.mk
index fcc15e376..e9c8b9d44 100644
--- a/tools/gyp/v8_libbase.target.linux-x86.mk
+++ b/tools/gyp/v8_libbase.target.linux-x86.mk
@@ -218,8 +218,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libbase.target.linux-x86_64.mk b/tools/gyp/v8_libbase.target.linux-x86_64.mk
index b751ecc28..4dcf7b7f2 100644
--- a/tools/gyp/v8_libbase.target.linux-x86_64.mk
+++ b/tools/gyp/v8_libbase.target.linux-x86_64.mk
@@ -216,8 +216,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.darwin-arm.mk b/tools/gyp/v8_libplatform.host.darwin-arm.mk
index 80663df2c..00be110a1 100644
--- a/tools/gyp/v8_libplatform.host.darwin-arm.mk
+++ b/tools/gyp/v8_libplatform.host.darwin-arm.mk
@@ -171,8 +171,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.darwin-arm64.mk b/tools/gyp/v8_libplatform.host.darwin-arm64.mk
index f677c0270..71ebbfc1a 100644
--- a/tools/gyp/v8_libplatform.host.darwin-arm64.mk
+++ b/tools/gyp/v8_libplatform.host.darwin-arm64.mk
@@ -167,8 +167,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.darwin-mips.mk b/tools/gyp/v8_libplatform.host.darwin-mips.mk
index 11c7794da..0f9486f2d 100644
--- a/tools/gyp/v8_libplatform.host.darwin-mips.mk
+++ b/tools/gyp/v8_libplatform.host.darwin-mips.mk
@@ -83,12 +83,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -171,16 +170,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.darwin-mips64.mk b/tools/gyp/v8_libplatform.host.darwin-mips64.mk
index 5410383ed..655b7758c 100644
--- a/tools/gyp/v8_libplatform.host.darwin-mips64.mk
+++ b/tools/gyp/v8_libplatform.host.darwin-mips64.mk
@@ -82,11 +82,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -168,15 +168,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.darwin-x86.mk b/tools/gyp/v8_libplatform.host.darwin-x86.mk
index a758ded3b..10147e19a 100644
--- a/tools/gyp/v8_libplatform.host.darwin-x86.mk
+++ b/tools/gyp/v8_libplatform.host.darwin-x86.mk
@@ -169,8 +169,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.darwin-x86_64.mk b/tools/gyp/v8_libplatform.host.darwin-x86_64.mk
index 7bbe845b7..f83871a63 100644
--- a/tools/gyp/v8_libplatform.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_libplatform.host.darwin-x86_64.mk
@@ -169,8 +169,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.linux-arm.mk b/tools/gyp/v8_libplatform.host.linux-arm.mk
index 80663df2c..00be110a1 100644
--- a/tools/gyp/v8_libplatform.host.linux-arm.mk
+++ b/tools/gyp/v8_libplatform.host.linux-arm.mk
@@ -171,8 +171,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.linux-arm64.mk b/tools/gyp/v8_libplatform.host.linux-arm64.mk
index f677c0270..71ebbfc1a 100644
--- a/tools/gyp/v8_libplatform.host.linux-arm64.mk
+++ b/tools/gyp/v8_libplatform.host.linux-arm64.mk
@@ -167,8 +167,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.linux-mips.mk b/tools/gyp/v8_libplatform.host.linux-mips.mk
index 11c7794da..0f9486f2d 100644
--- a/tools/gyp/v8_libplatform.host.linux-mips.mk
+++ b/tools/gyp/v8_libplatform.host.linux-mips.mk
@@ -83,12 +83,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -171,16 +170,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.linux-mips64.mk b/tools/gyp/v8_libplatform.host.linux-mips64.mk
index 5410383ed..655b7758c 100644
--- a/tools/gyp/v8_libplatform.host.linux-mips64.mk
+++ b/tools/gyp/v8_libplatform.host.linux-mips64.mk
@@ -82,11 +82,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -168,15 +168,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.linux-x86.mk b/tools/gyp/v8_libplatform.host.linux-x86.mk
index a758ded3b..10147e19a 100644
--- a/tools/gyp/v8_libplatform.host.linux-x86.mk
+++ b/tools/gyp/v8_libplatform.host.linux-x86.mk
@@ -169,8 +169,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_libplatform.host.linux-x86_64.mk b/tools/gyp/v8_libplatform.host.linux-x86_64.mk
index 7bbe845b7..f83871a63 100644
--- a/tools/gyp/v8_libplatform.host.linux-x86_64.mk
+++ b/tools/gyp/v8_libplatform.host.linux-x86_64.mk
@@ -169,8 +169,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk
index 9d86179c3..4fc55687d 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-arm.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-arm.mk
@@ -178,8 +178,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk
index 26decee29..0b0ec9347 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-arm64.mk
@@ -174,8 +174,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
index 2c1ed8ba7..36bd86910 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-mips.mk
@@ -90,12 +90,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -178,16 +177,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-mips64.mk b/tools/gyp/v8_nosnapshot.host.darwin-mips64.mk
index 9c2f536a5..94c092106 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-mips64.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-mips64.mk
@@ -89,11 +89,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -175,15 +175,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk
index 92d876e16..55216a414 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-x86.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-x86.mk
@@ -176,8 +176,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk
index 1d7639181..dc6766637 100644
--- a/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_nosnapshot.host.darwin-x86_64.mk
@@ -176,8 +176,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm.mk b/tools/gyp/v8_nosnapshot.host.linux-arm.mk
index 9d86179c3..4fc55687d 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-arm.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-arm.mk
@@ -178,8 +178,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk
index 26decee29..0b0ec9347 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-arm64.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-arm64.mk
@@ -174,8 +174,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips.mk b/tools/gyp/v8_nosnapshot.host.linux-mips.mk
index 2c1ed8ba7..36bd86910 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-mips.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-mips.mk
@@ -90,12 +90,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -178,16 +177,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-mips64.mk b/tools/gyp/v8_nosnapshot.host.linux-mips64.mk
index 9c2f536a5..94c092106 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-mips64.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-mips64.mk
@@ -89,11 +89,11 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -175,15 +175,14 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DUSE_OPENSSL_CERTS=1' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86.mk b/tools/gyp/v8_nosnapshot.host.linux-x86.mk
index 92d876e16..55216a414 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-x86.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-x86.mk
@@ -176,8 +176,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
index 1d7639181..dc6766637 100644
--- a/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
+++ b/tools/gyp/v8_nosnapshot.host.linux-x86_64.mk
@@ -176,8 +176,7 @@ MY_DEFS_Release := \
 	'-DUSE_OPENSSL_CERTS=1' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # 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 966e76562..371dd32b2 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm.mk
@@ -238,8 +238,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-arm64.mk b/tools/gyp/v8_snapshot.target.darwin-arm64.mk
index f977f589a..cca319921 100644
--- a/tools/gyp/v8_snapshot.target.darwin-arm64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-arm64.mk
@@ -213,8 +213,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # 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 1b7a97c66..4a2dd1f13 100644
--- a/tools/gyp/v8_snapshot.target.darwin-mips.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-mips.mk
@@ -111,8 +111,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -122,6 +120,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -217,8 +216,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -228,10 +225,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-mips64.mk b/tools/gyp/v8_snapshot.target.darwin-mips64.mk
index ade300856..00d522845 100644
--- a/tools/gyp/v8_snapshot.target.darwin-mips64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-mips64.mk
@@ -111,7 +111,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -121,6 +120,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -216,7 +216,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -226,10 +225,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # 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 6269d0161..c6effaf58 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86.mk
@@ -227,8 +227,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
index 9a5b9f23c..563c18b5b 100644
--- a/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_snapshot.target.darwin-x86_64.mk
@@ -225,8 +225,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # 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 966e76562..371dd32b2 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm.mk
@@ -238,8 +238,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-arm64.mk b/tools/gyp/v8_snapshot.target.linux-arm64.mk
index f977f589a..cca319921 100644
--- a/tools/gyp/v8_snapshot.target.linux-arm64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-arm64.mk
@@ -213,8 +213,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # 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 1b7a97c66..4a2dd1f13 100644
--- a/tools/gyp/v8_snapshot.target.linux-mips.mk
+++ b/tools/gyp/v8_snapshot.target.linux-mips.mk
@@ -111,8 +111,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -122,6 +120,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -217,8 +216,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS32R2' \
-	'-DFPU_MODE_FP32' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -228,10 +225,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-DFPU_MODE_FP32' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-mips64.mk b/tools/gyp/v8_snapshot.target.linux-mips64.mk
index ade300856..00d522845 100644
--- a/tools/gyp/v8_snapshot.target.linux-mips64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-mips64.mk
@@ -111,7 +111,6 @@ MY_DEFS_Debug := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -121,6 +120,7 @@ MY_DEFS_Debug := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
 	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
 	'-D_DEBUG' \
@@ -216,7 +216,6 @@ MY_DEFS_Release := \
 	'-DV8_TARGET_ARCH_MIPS64' \
 	'-DCAN_USE_FPU_INSTRUCTIONS' \
 	'-D__mips_hard_float=1' \
-	'-D_MIPS_ARCH_MIPS64R2' \
 	'-DV8_I18N_SUPPORT' \
 	'-DUSE_LIBPCI=1' \
 	'-DUSE_OPENSSL=1' \
@@ -226,10 +225,10 @@ MY_DEFS_Release := \
 	'-DUSE_STLPORT=1' \
 	'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
 	'-DCHROME_BUILD_ID=""' \
+	'-D_MIPS_ARCH_MIPS64R6' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # 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 6269d0161..c6effaf58 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86.mk
@@ -227,8 +227,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS
diff --git a/tools/gyp/v8_snapshot.target.linux-x86_64.mk b/tools/gyp/v8_snapshot.target.linux-x86_64.mk
index 9a5b9f23c..563c18b5b 100644
--- a/tools/gyp/v8_snapshot.target.linux-x86_64.mk
+++ b/tools/gyp/v8_snapshot.target.linux-x86_64.mk
@@ -225,8 +225,7 @@ MY_DEFS_Release := \
 	'-DCHROME_BUILD_ID=""' \
 	'-DNDEBUG' \
 	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0' \
-	'-DENABLE_HANDLE_ZAPPING'
+	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
 
 
 # Include paths placed before CFLAGS/CPPFLAGS