Commit c14127c8 authored by Tristan Cavelier's avatar Tristan Cavelier

xxx no stdint.h + U?INT64_M(IN|AX)

parent 371834d7
...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d ...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d
md5sum = 2ead88646094941dc8de12cdc72ba3b2 md5sum = 2ead88646094941dc8de12cdc72ba3b2
patch-options = -p0 patch-options = -p0
patches = patches =
${:_profile_base_location_}/rewrite-scripts.patch#a37c5e278cd2e1cd92621beb967c2c0a ${:_profile_base_location_}/rewrite-scripts.patch#9626ac595abd6310aae98d38de2b78ec
${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
# ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7 # ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
# error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/ # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
......
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
+git apply ../slapos-v8.patch +git apply ../slapos-v8.patch
--- /dev/null 2017-01-30 09:00:09.914078893 +0100 --- /dev/null 2017-01-30 09:00:09.914078893 +0100
+++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100 +++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100
@@ -0,0 +1,105 @@ @@ -0,0 +1,145 @@
+diff --git a/build/standalone.gypi b/build/standalone.gypi +diff --git a/build/standalone.gypi b/build/standalone.gypi
+index f804715..48eea0f 100644 +index f804715..48eea0f 100644
+--- a/build/standalone.gypi +--- a/build/standalone.gypi
...@@ -375,32 +375,36 @@ ...@@ -375,32 +375,36 @@
+ 'linux_use_gold_flags%': 0, + 'linux_use_gold_flags%': 0,
+ }], + }],
+diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc +diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc
+index b3841d0..a250c41 100644 +index b3841d0..992d092 100644
+--- a/src/compiler/arm64/code-generator-arm64.cc +--- a/src/compiler/arm64/code-generator-arm64.cc
++++ b/src/compiler/arm64/code-generator-arm64.cc ++++ b/src/compiler/arm64/code-generator-arm64.cc
+@@ -1,6 +1,7 @@ +@@ -12,6 +12,10 @@
+ // Copyright 2014 the V8 project authors. All rights reserved. + #include "src/compiler/node-matchers.h"
+ // Use of this source code is governed by a BSD-style license that can be + #include "src/compiler/osr.h"
+ // found in the LICENSE file.
++#include <stdint.h>
+
+ #include "src/compiler/code-generator.h"
+ +
++#ifndef INT64_MIN
++#define INT64_MIN (-9223372036854775807LL -1)
++#endif
++
+ namespace v8 {
+ namespace internal {
+ namespace compiler {
+diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc +diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc
+index 053c646..08e4102 100644 +index 053c646..efd4242 100644
+--- a/src/compiler/instruction-selector.cc +--- a/src/compiler/instruction-selector.cc
++++ b/src/compiler/instruction-selector.cc ++++ b/src/compiler/instruction-selector.cc
+@@ -324,6 +324,9 @@ InstructionOperand OperandForDeopt(OperandGenerator* g, Node* input, +@@ -14,6 +14,10 @@
+ } + #include "src/compiler/state-values-utils.h"
+ + #include "src/deoptimizer.h"
+ +
++#ifndef SIZE_MAX ++#ifndef SIZE_MAX
++#define SIZE_MAX (4294967295U) ++#define SIZE_MAX (4294967295U)
++#endif ++#endif
+ class StateObjectDeduplicator { ++
+ public: + namespace v8 {
+ explicit StateObjectDeduplicator(Zone* zone) : objects_(zone) {} + namespace internal {
+@@ -387,6 +390,7 @@ size_t AddOperandToStateValueDescriptor(StateValueDescriptor* descriptor, + namespace compiler {
+@@ -387,6 +391,7 @@ size_t AddOperandToStateValueDescriptor(StateValueDescriptor* descriptor,
+ return 1; + return 1;
+ } + }
+ } + }
...@@ -409,38 +413,74 @@ ...@@ -409,38 +413,74 @@
+ +
+ +
+diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc +diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
+index 8a64744..bb723b3 100644 +index 8a64744..7c9b425 100644
+--- a/src/compiler/x64/code-generator-x64.cc +--- a/src/compiler/x64/code-generator-x64.cc
++++ b/src/compiler/x64/code-generator-x64.cc ++++ b/src/compiler/x64/code-generator-x64.cc
+@@ -1,6 +1,7 @@ +@@ -12,6 +12,10 @@
+ // Copyright 2013 the V8 project authors. All rights reserved. + #include "src/x64/assembler-x64.h"
+ // Use of this source code is governed by a BSD-style license that can be + #include "src/x64/macro-assembler-x64.h"
+ // found in the LICENSE file.
++#include <stdint.h>
+
+ #include "src/compiler/code-generator.h"
+ +
++#ifndef INT64_MIN
++#define INT64_MIN (-9223372036854775807LL -1)
++#endif
++
+ namespace v8 {
+ namespace internal {
+ namespace compiler {
+diff --git a/test/cctest/compiler/test-run-machops.cc b/test/cctest/compiler/test-run-machops.cc +diff --git a/test/cctest/compiler/test-run-machops.cc b/test/cctest/compiler/test-run-machops.cc
+index cea90a2..d52de12 100644 +index cea90a2..9f4978a 100644
+--- a/test/cctest/compiler/test-run-machops.cc +--- a/test/cctest/compiler/test-run-machops.cc
++++ b/test/cctest/compiler/test-run-machops.cc ++++ b/test/cctest/compiler/test-run-machops.cc
+@@ -5,6 +5,7 @@ +@@ -14,6 +14,16 @@
+ #include <cmath> + #include "test/cctest/compiler/graph-builder-tester.h"
+ #include <functional> + #include "test/cctest/compiler/value-helper.h"
+ #include <limits> +
++#include <stdint.h> ++#ifndef INT64_MIN
++#define INT64_MIN (-9223372036854775807LL -1)
++#endif
++#ifndef INT64_MAX
++#define INT64_MAX (9223372036854775807LL)
++#endif
++#ifndef UINT64_MAX
++#define UINT64_MAX (18446744073709551615ULL)
++#endif
++
+ using namespace v8::base;
+ +
+ #include "src/base/bits.h" + namespace v8 {
+ #include "src/base/utils/random-number-generator.h"
+diff --git a/test/cctest/test-macro-assembler-mips64.cc b/test/cctest/test-macro-assembler-mips64.cc +diff --git a/test/cctest/test-macro-assembler-mips64.cc b/test/cctest/test-macro-assembler-mips64.cc
+index e74703b..a251854 100644 +index e74703b..9495bfc 100644
+--- a/test/cctest/test-macro-assembler-mips64.cc +--- a/test/cctest/test-macro-assembler-mips64.cc
++++ b/test/cctest/test-macro-assembler-mips64.cc ++++ b/test/cctest/test-macro-assembler-mips64.cc
+@@ -27,6 +27,7 @@ +@@ -36,6 +36,10 @@
+ #include "src/mips64/macro-assembler-mips64.h"
+ #include "src/mips64/simulator-mips64.h"
+
++#ifndef INT64_MAX
++#define INT64_MAX (9223372036854775807LL)
++#endif
++
+ +
+ #include <stdlib.h> + using namespace v8::internal;
+ #include <iostream> // NOLINT(readability/streams)
++#include <stdint.h>
+ +
+ #include "src/v8.h" +diff --git a/test/cctest/wasm/test-run-wasm.cc b/test/cctest/wasm/test-run-wasm.cc
+ #include "test/cctest/cctest.h" +index a3730ca..9cb5026 100644
+--- a/test/cctest/wasm/test-run-wasm.cc
++++ b/test/cctest/wasm/test-run-wasm.cc
+@@ -13,6 +13,16 @@
+ #include "test/cctest/wasm/test-signatures.h"
+ #include "test/cctest/wasm/wasm-run-utils.h"
+
++#ifndef INT64_MIN
++#define INT64_MIN (-9223372036854775807LL -1)
++#endif
++#ifndef INT64_MAX
++#define INT64_MAX (9223372036854775807LL)
++#endif
++#ifndef UINT64_MAX
++#define UINT64_MAX (18446744073709551615ULL)
++#endif
++
+ using namespace v8::base;
+ using namespace v8::internal;
+ using namespace v8::internal::compiler;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment