summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@anakreon.cz>2016-05-03 11:02:24 +0200
committerMartin Stransky <stransky@anakreon.cz>2016-05-03 11:02:24 +0200
commitb7dea905ea917c91986bbd53a4403e62af7effed (patch)
treed01478dae0f87f3138f37aeed216f7bc09ab67e8
parentUpdated to 46.0.1 (diff)
downloadlibrewolf-fedora-ff-b7dea905ea917c91986bbd53a4403e62af7effed.tar.gz
librewolf-fedora-ff-b7dea905ea917c91986bbd53a4403e62af7effed.tar.bz2
librewolf-fedora-ff-b7dea905ea917c91986bbd53a4403e62af7effed.zip
removed alredy merged patch
-rw-r--r--firefox.spec2
-rw-r--r--mozilla-1266366-branch64.patch29
2 files changed, 0 insertions, 31 deletions
diff --git a/firefox.spec b/firefox.spec
index bf457ab..6fc4a1a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -135,7 +135,6 @@ Patch304: mozilla-1253216.patch
Patch305: mozilla-1245076.patch
Patch306: mozilla-1245076-1.patch
Patch400: mozilla-1255590.patch
-Patch401: mozilla-1266366-branch64.patch
Patch402: mozilla-1196777.patch
# Debian patches
@@ -280,7 +279,6 @@ cd %{tarballdir}
%patch305 -p1 -b .1245076
%patch306 -p1 -b .1245076-1
%patch400 -p1 -b .1255590
-%patch401 -p1 -b .1266366-branch64
%patch402 -p1 -b .1196777
# Debian extension patch
diff --git a/mozilla-1266366-branch64.patch b/mozilla-1266366-branch64.patch
deleted file mode 100644
index 590f745..0000000
--- a/mozilla-1266366-branch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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(); }
-
bgstack15