Revert "Revert "Upgrade to 5.0.71.48"" DO NOT MERGE
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
FPIIM-449
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
(cherry picked from commit 109988c7ccb6f3fd1a58574fa3dfb88beaef6632)
diff --git a/WATCHLISTS b/WATCHLISTS
index 81e941f..29b957b 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -43,9 +43,11 @@
'filepath': 'src/debug/',
},
'interpreter': {
- 'filepath': 'src/interpreter/',
- 'filepath': 'test/cctest/interpreter/',
- 'filepath': 'test/unittests/interpreter/',
+ 'filepath': 'src/interpreter/' \
+ '|src/compiler/interpreter' \
+ '|src/compiler/bytecode' \
+ '|test/cctest/interpreter/' \
+ '|test/unittests/interpreter/',
},
'feature_shipping_status': {
'filepath': 'src/flag-definitions.h',
@@ -53,9 +55,12 @@
'gc_changes': {
'filepath': 'src/heap/',
},
- 'merges': {
- 'filepath': '.',
+ 'arm': {
+ 'filepath': '/arm/',
},
+ 'ia32': {
+ 'filepath': '/ia32/',
+ }
},
'WATCHLISTS': {
@@ -79,9 +84,12 @@
'hpayer@chromium.org',
'ulan@chromium.org',
],
- 'merges': [
- # Only enabled on branches created with tools/release/create_release.py
- 'v8-merges@googlegroups.com',
+ 'arm': [
+ 'v8-mips-ports@googlegroups.com',
+ 'v8-ppc-ports@googlegroups.com',
+ ],
+ 'ia32': [
+ 'v8-x87-ports@googlegroups.com',
],
},
}