Version 4.3.61.5 (cherry-pick)

Merged 536b7cf Set the default compiler for X87 to GCC. [email protected] BUG= Review URL: https://codereview.chromium.org/1078823002 Cr-Commit-Position: refs/branch-heads/4.3@{#7} Cr-Branched-From: f5c0a23-refs/heads/4.3.61@{#1} Cr-Branched-From: 0a7d4f4-refs/heads/master@{#27508}
crosswalk-project · Apr 9, 2015 · 6a3faf9 · 6a3faf9
1 parent 2e2ae74
commit 6a3faf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/standalone.gypi b/build/standalone.gypi
@@ -146,7 +146,8 @@
       }, {
         'v8_enable_gdbjit%': 0,
       }],
-      ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64")', {
+      ['(OS=="linux" or OS=="mac") and (target_arch=="ia32" or target_arch=="x64") and \
+        (v8_target_arch!="x87")', {
         'clang%': 1,
       }, {
         'clang%': 0,

diff --git a/include/v8-version.h b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 3
 #define V8_BUILD_NUMBER 61
-#define V8_PATCH_LEVEL 4
+#define V8_PATCH_LEVEL 5
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)