From 1a516ea830c33f6320775c1e7b99b846cae0eca5 Mon Sep 17 00:00:00 2001
From: "akos.palfi" <akos.palfi@imgtec.com>
Date: Tue, 29 Sep 2015 15:10:13 -0700
Subject: [PATCH] deps: cherry pick d7f813b4 from V8 upstream

Original commit message:

    GYP: Don't pass -Wno-format-pedantic to GCC.

    This flag is not understood correctly by GCC and breaks the GCC ARM and MIPS optdebug builds.

    Patch from Brendan Kirby <brendan.kirby@imgtec.com>

    BUG=

    Review URL: https://codereview.chromium.org/1369273003

    Cr-Commit-Position: refs/heads/master@{#31013}
---
 deps/v8/build/standalone.gypi | 21 +++++++++++++++++++--
 deps/v8/include/v8-version.h  |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/deps/v8/build/standalone.gypi b/deps/v8/build/standalone.gypi
index 2cd0b51d43..48f2194aaa 100644
--- a/deps/v8/build/standalone.gypi
+++ b/deps/v8/build/standalone.gypi
@@ -367,8 +367,25 @@
         # things when their commandline changes). Nothing should ever read this
         # define.
         'defines': ['CR_CLANG_REVISION=<!(<(DEPTH)/tools/clang/scripts/update.sh --print-revision)'],
-        'cflags+': [
-          '-Wno-format-pedantic',
+        'conditions': [
+          ['host_clang==1', {
+            'target_conditions': [
+              ['_toolset=="host"', {
+                'cflags+': [
+                  '-Wno-format-pedantic',
+                 ],
+              }],
+           ],
+          }],
+          ['clang==1', {
+            'target_conditions': [
+              ['_toolset=="target"', {
+                'cflags+': [
+                  '-Wno-format-pedantic',
+                 ],
+              }],
+           ],
+          }],
         ],
       }],
     ],
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
index b0b42462ed..20282039be 100644
--- a/deps/v8/include/v8-version.h
+++ b/deps/v8/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 5
 #define V8_BUILD_NUMBER 103
-#define V8_PATCH_LEVEL 50
+#define V8_PATCH_LEVEL 51
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)