Commit dd43f653 authored by Tristan Cavelier's avatar Tristan Cavelier

xxx stdint.h

parent 8b498074
...@@ -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#fbcb935e02b549a0048606be758f33fc ${:_profile_base_location_}/rewrite-scripts.patch#7a6ea9bea94daeb01b9e0f3c061dd9fb
${:_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,71 @@ @@ -0,0 +1,103 @@
+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
...@@ -374,21 +374,31 @@ ...@@ -374,21 +374,31 @@
+ }, { + }, {
+ '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
+index b3841d0..a250c41 100644
+--- a/src/compiler/arm64/code-generator-arm64.cc
++++ b/src/compiler/arm64/code-generator-arm64.cc
+@@ -1,6 +1,7 @@
+ // Copyright 2014 the V8 project authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
++#include <stdint.h>
+
+ #include "src/compiler/code-generator.h"
+
+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..cbd177b 100644 +index 053c646..6142bc5 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, +@@ -5,6 +5,7 @@
+ } + #include "src/compiler/instruction-selector.h"
+ +
+ #include <limits>
++#include <stdint.h>
+ +
++#ifndef SIZE_MAX + #include "src/base/adapters.h"
++#define SIZE_MAX 65535 + #include "src/compiler/instruction-selector-impl.h"
++#endif +@@ -387,6 +388,7 @@ size_t AddOperandToStateValueDescriptor(StateValueDescriptor* descriptor,
+ class StateObjectDeduplicator {
+ public:
+ explicit StateObjectDeduplicator(Zone* zone) : objects_(zone) {}
+@@ -387,6 +390,7 @@ size_t AddOperandToStateValueDescriptor(StateValueDescriptor* descriptor,
+ return 1; + return 1;
+ } + }
+ } + }
...@@ -397,16 +407,38 @@ ...@@ -397,16 +407,38 @@
+ +
+ +
+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..0938c80 100644 +index 8a64744..bb723b3 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
+@@ -1076,6 +1076,9 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) { +@@ -1,6 +1,7 @@
+ __ AssertZeroExtended(i.OutputRegister()); + // Copyright 2013 the V8 project authors. All rights reserved.
+ break; + // Use of this source code is governed by a BSD-style license that can be
+ } + // found in the LICENSE file.
++#ifndef INT64_MIN ++#include <stdint.h>
++#define INT64_MIN (-9223372036854775807LL -1) +
++#endif + #include "src/compiler/code-generator.h"
+ case kSSEFloat32ToInt64: +
+ if (instr->InputAt(0)->IsDoubleRegister()) { +diff --git a/test/cctest/compiler/test-run-machops.cc b/test/cctest/compiler/test-run-machops.cc
+ __ Cvttss2siq(i.OutputRegister(), i.InputDoubleRegister(0)); +index cea90a2..d52de12 100644
+--- a/test/cctest/compiler/test-run-machops.cc
++++ b/test/cctest/compiler/test-run-machops.cc
+@@ -5,6 +5,7 @@
+ #include <cmath>
+ #include <functional>
+ #include <limits>
++#include <stdint.h>
+
+ #include "src/base/bits.h"
+ #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
+index e74703b..a251854 100644
+--- a/test/cctest/test-macro-assembler-mips64.cc
++++ b/test/cctest/test-macro-assembler-mips64.cc
+@@ -27,6 +27,7 @@
+
+ #include <stdlib.h>
+ #include <iostream> // NOLINT(readability/streams)
++#include <stdint.h>
+
+ #include "src/v8.h"
+ #include "test/cctest/cctest.h"
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