Commit cf4fbde3 authored by Carsten Schoenert's avatar Carsten Schoenert
Browse files

rebuild patch queue from patch-queue branch

Removed patch (included upstream):
porting-s390x/Explicitly-instantiate-TIntermTraverser-traverse-TIntermN.patch
parent 0913fa24
......@@ -12,7 +12,7 @@ Subject: Add missing bindings for mips* in the authenticator crate
create mode 100644 third_party/rust/authenticator/src/linux/ioctl_mipsle.rs
diff --git a/Cargo.lock b/Cargo.lock
index 82d9a46..ce0fcac 100644
index c41d9fc..2d46a3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -183,8 +183,6 @@ dependencies = [
......@@ -25,10 +25,10 @@ index 82d9a46..ce0fcac 100644
"bitflags",
"boxfnonce",
diff --git a/Cargo.toml b/Cargo.toml
index 6f6199ab..c0ac0b3 100644
index b723c1da..b250d3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -73,6 +73,7 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3",
@@ -73,6 +73,7 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
# failure's backtrace feature might break our builds, see bug 1608157.
failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
......
......@@ -7,10 +7,10 @@ Subject: Bug 1556197 - amend Bug-1544631 for fixing mips32.
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
index af8b135..3441fd1 100644
index a420911..408b60b 100644
--- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
@@ -829,16 +829,25 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
@@ -842,16 +842,25 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
branchTestSymbol(cond, value.typeReg(), label);
}
......
......@@ -13,10 +13,10 @@ Patch cherry-picked from Ubuntu.
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 91736ea..71fc272 100755
index d6cadde..8b46285 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1873,8 +1873,8 @@ def rustc_opt_level(opt_level_option, moz_optimize):
@@ -1875,8 +1875,8 @@ def rustc_opt_level(opt_level_option, moz_optimize):
return '1' if moz_optimize.optimize else '0'
......@@ -27,7 +27,7 @@ index 91736ea..71fc272 100755
# Cargo currently supports only two interesting profiles for building:
# development and release. Those map (roughly) to --enable-debug and
# --disable-debug in Gecko, respectively.
@@ -1897,6 +1897,8 @@ def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers):
@@ -1899,6 +1899,8 @@ def rust_compile_flags(opt_level, debug_rust, debug_symbols, frame_pointers):
if debug_symbols:
debug_info = '2'
......
......@@ -12,10 +12,10 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index ce42ab7..91736ea 100755
index 5ef6e31..d6cadde 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -2125,15 +2125,16 @@ def select_linker(linker, c_compiler, developer_options, enable_gold,
@@ -2127,15 +2127,16 @@ def select_linker(linker, c_compiler, developer_options, enable_gold,
set_config('LINKER_KIND', select_linker.KIND)
......
......@@ -58,10 +58,10 @@ Additional changes:
create mode 100644 xpcom/reflect/xptcall/md/unix/xptcstubs_linux_m68k.cpp
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 5e07418..33221cc 100644
index b887153..3b94ee8 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -744,6 +744,9 @@ def split_triplet(triplet, allow_msvc=False):
@@ -758,6 +758,9 @@ def split_triplet(triplet, allow_msvc=False):
elif cpu == 'sh4':
canonical_cpu = 'sh4'
endianness = 'little'
......
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Fri, 26 Jul 2019 17:33:16 -0700
Subject: Explicitly instantiate TIntermTraverser::traverse(TIntermNode *).
(on behalf of RewriteAtomicFunctionExpressions)
The compile will occasionally choose to inline all instances of this
function, and therefore not export this entrypoint into the object file,
leaving other TUs (RewriteAtomicFunctionExpressions) with missing
link symbols.
Bug: angleproject:3752
Change-Id: Ida778bcd897a85567680911a88aae88a3797aa93
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1721954
Commit-Queue: Jeff Gilbert <jgilbert@mozilla.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
---
.../checkout/src/compiler/translator/tree_util/IntermTraverse.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp b/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp
index c38baa1..b587090 100644
--- a/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp
+++ b/gfx/angle/checkout/src/compiler/translator/tree_util/IntermTraverse.cpp
@@ -50,6 +50,10 @@ void TIntermTraverser::traverse(T *node)
}
}
+// Instantiate template for RewriteAtomicFunctionExpressions, in case this gets inlined thus not
+// exported from the TU.
+template void TIntermTraverser::traverse(TIntermNode *);
+
void TIntermNode::traverse(TIntermTraverser *it)
{
it->traverse(this);
......@@ -7,7 +7,7 @@ Subject: Don't auto-disable extensions in system directories
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/comm/mail/app/profile/all-thunderbird.js b/comm/mail/app/profile/all-thunderbird.js
index 9d0bc80..61269b8 100644
index 363b1da..6bccb25 100644
--- a/comm/mail/app/profile/all-thunderbird.js
+++ b/comm/mail/app/profile/all-thunderbird.js
@@ -143,7 +143,7 @@ pref("extensions.hotfix.certs.2.sha1Fingerprint", "39:E7:2B:7A:5B:CF:37:78:F9:5D
......
......@@ -35,6 +35,5 @@ debian-hacks/Make-Thunderbird-build-reproducible.patch
porting-s390x/Use-more-recent-embedded-version-of-sqlite3.patch
fixes/Add-missing-bindings-for-mips-in-the-authenticator-crate.patch
fixes/reduce-the-rust-debuginfo-level-on-selected-architectures.patch
porting-s390x/Explicitly-instantiate-TIntermTraverser-traverse-TIntermN.patch
fixes/Bug-1650299-Unify-the-inclusion-of-the-ICU-data-file.-r-f.patch
fixes/Don-t-build-ICU-in-parallel.patch
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