diff options
| -rw-r--r-- | deps/v8/include/v8-version.h | 2 | ||||
| -rw-r--r-- | deps/v8/src/ppc/macro-assembler-ppc.cc | 12 | ||||
| -rwxr-xr-x | deps/v8/tools/release/create_release.py | 3 | ||||
| -rwxr-xr-x | deps/v8/tools/release/filter_build_files.py | 2 | ||||
| -rw-r--r-- | deps/v8/tools/release/git_recipes.py | 6 | ||||
| -rwxr-xr-x | deps/v8/tools/release/test_scripts.py | 2 |
6 files changed, 14 insertions, 13 deletions
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index e52b5742f5..f0ded3542c 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 6 #define V8_MINOR_VERSION 8 #define V8_BUILD_NUMBER 275 -#define V8_PATCH_LEVEL 30 +#define V8_PATCH_LEVEL 32 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/ppc/macro-assembler-ppc.cc b/deps/v8/src/ppc/macro-assembler-ppc.cc index 2c0df5e5c4..160ce33530 100644 --- a/deps/v8/src/ppc/macro-assembler-ppc.cc +++ b/deps/v8/src/ppc/macro-assembler-ppc.cc @@ -2944,10 +2944,14 @@ void TurboAssembler::SwapP(Register src, MemOperand dst, Register scratch) { void TurboAssembler::SwapP(MemOperand src, MemOperand dst, Register scratch_0, Register scratch_1) { - if (src.ra() != r0) DCHECK(!AreAliased(src.ra(), scratch_0, scratch_1)); - if (src.rb() != r0) DCHECK(!AreAliased(src.rb(), scratch_0, scratch_1)); - if (dst.ra() != r0) DCHECK(!AreAliased(dst.ra(), scratch_0, scratch_1)); - if (dst.rb() != r0) DCHECK(!AreAliased(dst.rb(), scratch_0, scratch_1)); + if (src.ra() != r0 && src.ra().is_valid()) + DCHECK(!AreAliased(src.ra(), scratch_0, scratch_1)); + if (src.rb() != r0 && src.rb().is_valid()) + DCHECK(!AreAliased(src.rb(), scratch_0, scratch_1)); + if (dst.ra() != r0 && dst.ra().is_valid()) + DCHECK(!AreAliased(dst.ra(), scratch_0, scratch_1)); + if (dst.rb() != r0 && dst.rb().is_valid()) + DCHECK(!AreAliased(dst.rb(), scratch_0, scratch_1)); DCHECK(!AreAliased(scratch_0, scratch_1)); if (is_int16(src.offset()) || is_int16(dst.offset())) { if (!is_int16(src.offset())) { diff --git a/deps/v8/tools/release/create_release.py b/deps/v8/tools/release/create_release.py index e5c2114b1a..caee70308c 100755 --- a/deps/v8/tools/release/create_release.py +++ b/deps/v8/tools/release/create_release.py @@ -221,8 +221,7 @@ class LandBranch(Step): else: self.GitUpload(author=self._options.author, force=True, - bypass_hooks=True, - private=True) + bypass_hooks=True) cmd = "cl land --bypass-hooks -f" if self._options.dry_run: print "Dry run. Command:\ngit %s" % cmd diff --git a/deps/v8/tools/release/filter_build_files.py b/deps/v8/tools/release/filter_build_files.py index 7d3f22138a..9cc6607108 100755 --- a/deps/v8/tools/release/filter_build_files.py +++ b/deps/v8/tools/release/filter_build_files.py @@ -35,7 +35,7 @@ SUPPLEMENTARY_FILES = [ LIBRARY_FILES = { 'android': ['*.a', '*.so'], 'linux': ['*.a', '*.so'], - 'mac': ['*.a', '*.so'], + 'mac': ['*.a', '*.so', '*.dylib'], 'win': ['*.lib', '*.dll'], } diff --git a/deps/v8/tools/release/git_recipes.py b/deps/v8/tools/release/git_recipes.py index 9deaee891b..f3ac16058c 100644 --- a/deps/v8/tools/release/git_recipes.py +++ b/deps/v8/tools/release/git_recipes.py @@ -206,8 +206,8 @@ class GitRecipesMixin(object): self.Git(MakeArgs(args), **kwargs) def GitUpload(self, reviewer="", author="", force=False, cq=False, - cq_dry_run=False, bypass_hooks=False, cc="", private=False, - tbr_reviewer="", **kwargs): + cq_dry_run=False, bypass_hooks=False, cc="", tbr_reviewer="", + **kwargs): args = ["cl upload --send-mail"] if author: args += ["--email", Quoted(author)] @@ -226,8 +226,6 @@ class GitRecipesMixin(object): if cc: args += ["--cc", Quoted(cc)] args += ["--gerrit"] - if private: - args += ["--private"] # TODO(machenbach): Check output in forced mode. Verify that all required # base files were uploaded, if not retry. self.Git(MakeArgs(args), pipe=False, **kwargs) diff --git a/deps/v8/tools/release/test_scripts.py b/deps/v8/tools/release/test_scripts.py index 565b2b7c8f..86326bfda2 100755 --- a/deps/v8/tools/release/test_scripts.py +++ b/deps/v8/tools/release/test_scripts.py @@ -934,7 +934,7 @@ TBR=reviewer@chromium.org""" Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", cb=CheckVersionCommit), Cmd("git cl upload --send-mail --email \"author@chromium.org\" " - "-f --bypass-hooks --gerrit --private", ""), + "-f --bypass-hooks --gerrit", ""), Cmd("git cl land --bypass-hooks -f", ""), Cmd("git fetch", ""), Cmd("git log -1 --format=%H --grep=" |