diff options
| author | Martin Stransky <stransky@redhat.com> | 2016-04-26 10:46:50 +0200 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2016-04-26 10:46:50 +0200 |
| commit | 28e12762e32b16cc9af46d16b5f38d03b8d74a2a (patch) | |
| tree | db877a58699ae1681866a91cb962dbc549c4d3e6 | |
| parent | Don't use libvpx on F23 (diff) | |
| parent | Added nasm.base64 build fix (mozbz#1266366) (diff) | |
| download | librewolf-fedora-ff-28e12762e32b16cc9af46d16b5f38d03b8d74a2a.tar.gz librewolf-fedora-ff-28e12762e32b16cc9af46d16b5f38d03b8d74a2a.tar.bz2 librewolf-fedora-ff-28e12762e32b16cc9af46d16b5f38d03b8d74a2a.zip | |
Merge branch 'master' into f24
| -rw-r--r-- | firefox.spec | 6 | ||||
| -rw-r--r-- | mozilla-1266366-branch64.patch | 29 |
2 files changed, 33 insertions, 2 deletions
diff --git a/firefox.spec b/firefox.spec index 65ec592..d0301df 100644 --- a/firefox.spec +++ b/firefox.spec @@ -130,9 +130,10 @@ Patch304: mozilla-1253216.patch Patch305: mozilla-1245076.patch Patch306: mozilla-1245076-1.patch Patch400: mozilla-1255590.patch +Patch401: mozilla-1266366-branch64.patch # Debian patches -Patch401: mozilla-440908.patch +Patch500: mozilla-440908.patch %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} @@ -277,9 +278,10 @@ cd %{tarballdir} %patch305 -p1 -b .1245076 %patch306 -p1 -b .1245076-1 %patch400 -p1 -b .1255590 +%patch401 -p1 -b .1266366-branch64 # Debian extension patch -%patch401 -p1 -b .440908 +%patch500 -p1 -b .440908 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig diff --git a/mozilla-1266366-branch64.patch b/mozilla-1266366-branch64.patch new file mode 100644 index 0000000..590f745 --- /dev/null +++ b/mozilla-1266366-branch64.patch @@ -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(); } + |