Commit b2c3d2d8 authored by Tristan Cavelier's avatar Tristan Cavelier

xxx INT64_MIN

parent 4ceff1df
...@@ -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#6d987ef62655f000b05e2e4dcdbb6b2d ${:_profile_base_location_}/rewrite-scripts.patch#c88ec09852ce623c317a549751c0ba2f
${:_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,22 @@ @@ -0,0 +1,36 @@
+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..cbd177b 100644
+--- a/src/compiler/instruction-selector.cc +--- a/src/compiler/instruction-selector.cc
...@@ -361,3 +361,17 @@ ...@@ -361,3 +361,17 @@
+ } + }
+ +
+ +
+diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
+index 8a64744..0938c80 100644
+--- a/src/compiler/x64/code-generator-x64.cc
++++ b/src/compiler/x64/code-generator-x64.cc
+@@ -1076,6 +1076,9 @@ void CodeGenerator::AssembleArchInstruction(Instruction* instr) {
+ __ AssertZeroExtended(i.OutputRegister());
+ break;
+ }
++#ifndef INT64_MIN
++#define INT64_MIN (-9223372036854775807LL -1)
++#endif
+ case kSSEFloat32ToInt64:
+ if (instr->InputAt(0)->IsDoubleRegister()) {
+ __ Cvttss2siq(i.OutputRegister(), i.InputDoubleRegister(0));
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