| 1 |
commit: 255b60802fb702c065999429fd3915751a3f056c |
| 2 |
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 29 18:16:40 2016 +0000 |
| 4 |
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 29 18:17:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255b6080 |
| 7 |
|
| 8 |
www-client/firefox-{45.1.0,46.0}: patch to fix branch64 calls missing from none-jit |
| 9 |
|
| 10 |
Bug: http://bugs.gentoo.org/581474 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.26 |
| 13 |
|
| 14 |
www-client/firefox/files/jit-none-branch64.patch | 29 ++++++++++++++++++++++++ |
| 15 |
www-client/firefox/firefox-45.1.0.ebuild | 3 ++- |
| 16 |
www-client/firefox/firefox-46.0.ebuild | 3 ++- |
| 17 |
3 files changed, 33 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/www-client/firefox/files/jit-none-branch64.patch b/www-client/firefox/files/jit-none-branch64.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..590f745 |
| 22 |
--- /dev/null |
| 23 |
+++ b/www-client/firefox/files/jit-none-branch64.patch |
| 24 |
@@ -0,0 +1,29 @@ |
| 25 |
+# HG changeset patch |
| 26 |
+# User Nicolas B. Pierron <nicolas.b.pierron@×××××××.com> |
| 27 |
+ |
| 28 |
+Bug 1266366 - Add branch64 functions to the none-backend MacroAssembler. r= |
| 29 |
+ |
| 30 |
+diff --git a/js/src/jit/none/MacroAssembler-none.h b/js/src/jit/none/MacroAssembler-none.h |
| 31 |
+index 512ae81..4441d8d 100644 |
| 32 |
+--- a/js/src/jit/none/MacroAssembler-none.h |
| 33 |
++++ b/js/src/jit/none/MacroAssembler-none.h |
| 34 |
+@@ -254,16 +254,18 @@ class MacroAssemblerNone : public Assembler |
| 35 |
+ template <typename T, typename S> void branchSub32(Condition, T, S, Label*) { MOZ_CRASH(); } |
| 36 |
+ template <typename T, typename S> void branchPtr(Condition, T, S, Label*) { MOZ_CRASH(); } |
| 37 |
+ template <typename T, typename S> void branchTestPtr(Condition, T, S, Label*) { MOZ_CRASH(); } |
| 38 |
+ template <typename T, typename S> void branchDouble(DoubleCondition, T, S, Label*) { MOZ_CRASH(); } |
| 39 |
+ template <typename T, typename S> void branchFloat(DoubleCondition, T, S, Label*) { MOZ_CRASH(); } |
| 40 |
+ template <typename T, typename S> void branchPrivatePtr(Condition, T, S, Label*) { MOZ_CRASH(); } |
| 41 |
+ template <typename T, typename S> void decBranchPtr(Condition, T, S, Label*) { MOZ_CRASH(); } |
| 42 |
+ template <typename T, typename S> void branchTest64(Condition, T, T, S, Label*) { MOZ_CRASH(); } |
| 43 |
++ template <typename T, typename S> void branch64(Condition, T, S, Label*) { MOZ_CRASH(); } |
| 44 |
++ template <typename T, typename S> void branch64(Condition, T, T, S, Label*) { MOZ_CRASH(); } |
| 45 |
+ template <typename T, typename S> void mov(T, S) { MOZ_CRASH(); } |
| 46 |
+ template <typename T, typename S> void movq(T, S) { MOZ_CRASH(); } |
| 47 |
+ template <typename T, typename S> void movePtr(T, S) { MOZ_CRASH(); } |
| 48 |
+ template <typename T, typename S> void move32(T, S) { MOZ_CRASH(); } |
| 49 |
+ template <typename T, typename S> void moveFloat32(T, S) { MOZ_CRASH(); } |
| 50 |
+ template <typename T, typename S> void moveDouble(T, S) { MOZ_CRASH(); } |
| 51 |
+ template <typename T, typename S> void move64(T, S) { MOZ_CRASH(); } |
| 52 |
+ template <typename T> CodeOffset movWithPatch(T, Register) { MOZ_CRASH(); } |
| 53 |
+ |
| 54 |
|
| 55 |
diff --git a/www-client/firefox/firefox-45.1.0.ebuild b/www-client/firefox/firefox-45.1.0.ebuild |
| 56 |
index 67e1b8b..832e18b 100644 |
| 57 |
--- a/www-client/firefox/firefox-45.1.0.ebuild |
| 58 |
+++ b/www-client/firefox/firefox-45.1.0.ebuild |
| 59 |
@@ -132,7 +132,8 @@ src_prepare() { |
| 60 |
# Apply our patches |
| 61 |
eapply "${WORKDIR}/firefox" \ |
| 62 |
"${FILESDIR}"/arm64-4-link-chromium-mutex-based-atomics.patch \ |
| 63 |
- "${FILESDIR}"/arm64-5-mozjemalloc-no-static-page-sizes.patch |
| 64 |
+ "${FILESDIR}"/arm64-5-mozjemalloc-no-static-page-sizes.patch \ |
| 65 |
+ "${FILESDIR}"/jit-none-branch64.patch |
| 66 |
|
| 67 |
# Allow user to apply any additional patches without modifing ebuild |
| 68 |
eapply_user |
| 69 |
|
| 70 |
diff --git a/www-client/firefox/firefox-46.0.ebuild b/www-client/firefox/firefox-46.0.ebuild |
| 71 |
index 3dd0989..80407c0 100644 |
| 72 |
--- a/www-client/firefox/firefox-46.0.ebuild |
| 73 |
+++ b/www-client/firefox/firefox-46.0.ebuild |
| 74 |
@@ -116,7 +116,8 @@ src_unpack() { |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
# Apply our patches |
| 78 |
- eapply "${WORKDIR}/firefox" |
| 79 |
+ eapply "${WORKDIR}/firefox" \ |
| 80 |
+ "${FILESDIR}"/jit-none-branch64.patch |
| 81 |
|
| 82 |
# Enable gnomebreakpad |
| 83 |
if use debug ; then |
Archives