Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
mongodb: 3.4.20 -> 3.4.22, 3.6.12 -> 3.6.13, 4.0.9 -> 4.0.11
- Loading branch information
Showing
6 changed files
with
61 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
pkgs/servers/nosql/mongodb/mozjs-45_fix-3-byte-opcode.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# HG changeset patch | ||
# User Dan Gohman <sunfish@mozilla.com> | ||
# Parent d9b405d82cffb07343a5f2fd941e029298c7f6c4 | ||
# Bug 1390214 - IonMonkey: Don't test for a 3-byte opcode in a 2-byte opcode predicate. | ||
# https://bug1390214.bmoattachments.org/attachment.cgi?id=8902972 | ||
|
||
diff --git a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h | ||
--- a/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h | ||
+++ b/src/third_party/mozjs-45/extract/js/src/jit/x86-shared/Encoding-x86-shared.h | ||
@@ -310,17 +310,16 @@ enum ThreeByteOpcodeID { | ||
|
||
// Test whether the given opcode should be printed with its operands reversed. | ||
inline bool IsXMMReversedOperands(TwoByteOpcodeID opcode) | ||
{ | ||
switch (opcode) { | ||
case OP2_MOVSD_WsdVsd: // also OP2_MOVPS_WpsVps | ||
case OP2_MOVAPS_WsdVsd: | ||
case OP2_MOVDQ_WdqVdq: | ||
- case OP3_PEXTRD_EdVdqIb: | ||
return true; | ||
default: | ||
break; | ||
} | ||
return false; | ||
} | ||
|
||
enum ThreeByteEscape { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,13 @@ | ||
{ stdenv, callPackage, lib, sasl, boost, Security }: | ||
{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: | ||
|
||
let | ||
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; }; | ||
buildMongoDB = callPackage ./mongodb.nix { inherit sasl; inherit boost; inherit Security; inherit CoreFoundation; inherit cctools; }; | ||
in | ||
buildMongoDB { | ||
version = "4.0.9"; | ||
sha256 = "0klm6dl1pr9wq4ghm2jjn3wzs1zpj1aabqjqjfddanxq2an7scph"; | ||
version = "4.0.11"; | ||
sha256 = "0kry8kzzpah0l7j8xa333y1ixwvarc28ip3f6lx5590yy11j8ry2"; | ||
patches = [ | ||
./forget-build-dependencies.patch | ||
./mozjs-45_fix-3-byte-opcode.patch | ||
]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters