www-client/firefox-{45.1.0,46.0}: patch to fix branch64 calls missing from none-jit

Bug: http://bugs.gentoo.org/581474

Package-Manager: portage-2.2.26
This commit is contained in:
Ian Stakenvicius
2016-04-29 14:16:40 -04:00
parent ccb1e8ca8e
commit 255b60802f
3 changed files with 33 additions and 2 deletions

View File

@@ -0,0 +1,29 @@
# HG changeset patch
# User Nicolas B. Pierron <nicolas.b.pierron@mozilla.com>
Bug 1266366 - Add branch64 functions to the none-backend MacroAssembler. r=
diff --git a/js/src/jit/none/MacroAssembler-none.h b/js/src/jit/none/MacroAssembler-none.h
index 512ae81..4441d8d 100644
--- a/js/src/jit/none/MacroAssembler-none.h
+++ b/js/src/jit/none/MacroAssembler-none.h
@@ -254,16 +254,18 @@ class MacroAssemblerNone : public Assembler
template <typename T, typename S> void branchSub32(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchTestPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchDouble(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchFloat(DoubleCondition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
+ template <typename T, typename S> void branch64(Condition, T, S, Label*) { MOZ_CRASH(); }
+ template <typename T, typename S> void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); }
template <typename T, typename S> void mov(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void movq(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void movePtr(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void move32(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void moveFloat32(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void moveDouble(T, S) { MOZ_CRASH(); }
template <typename T, typename S> void move64(T, S) { MOZ_CRASH(); }
template <typename T> CodeOffset movWithPatch(T, Register) { MOZ_CRASH(); }

View File

@@ -132,7 +132,8 @@ src_prepare() {
# Apply our patches
eapply "${WORKDIR}/firefox" \
"${FILESDIR}"/arm64-4-link-chromium-mutex-based-atomics.patch \
"${FILESDIR}"/arm64-5-mozjemalloc-no-static-page-sizes.patch
"${FILESDIR}"/arm64-5-mozjemalloc-no-static-page-sizes.patch \
"${FILESDIR}"/jit-none-branch64.patch
# Allow user to apply any additional patches without modifing ebuild
eapply_user

View File

@@ -116,7 +116,8 @@ src_unpack() {
src_prepare() {
# Apply our patches
eapply "${WORKDIR}/firefox"
eapply "${WORKDIR}/firefox" \
"${FILESDIR}"/jit-none-branch64.patch
# Enable gnomebreakpad
if use debug ; then