diff options
author | Martin Stransky <stransky@redhat.com> | 2016-07-27 09:48:01 +0200 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2016-07-27 09:48:01 +0200 |
commit | b5d279664f6a5c486f8bbfd81d2c1f4af7f4fbb0 (patch) | |
tree | 87541b34f3815fd34773db93507e171f91220c6b /mozilla-1253216.patch | |
parent | Merge branch 'master' into f23 (diff) | |
parent | Added arm build fix (diff) | |
download | librewolf-fedora-ff-b5d279664f6a5c486f8bbfd81d2c1f4af7f4fbb0.tar.gz librewolf-fedora-ff-b5d279664f6a5c486f8bbfd81d2c1f4af7f4fbb0.tar.bz2 librewolf-fedora-ff-b5d279664f6a5c486f8bbfd81d2c1f4af7f4fbb0.zip |
Merge branch 'master' into f23
Diffstat (limited to 'mozilla-1253216.patch')
-rw-r--r-- | mozilla-1253216.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mozilla-1253216.patch b/mozilla-1253216.patch index 6de0720..c9252da 100644 --- a/mozilla-1253216.patch +++ b/mozilla-1253216.patch @@ -1,12 +1,12 @@ -diff -up firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h.old firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h ---- firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h.old 2016-03-01 09:45:01.000000000 +0100 -+++ firefox-45.0/firefox-45.0/js/src/jit/AtomicOperations.h 2016-03-03 13:13:34.915015391 +0100 -@@ -305,7 +305,7 @@ AtomicOperations::isLockfree(int32_t siz - || defined(__ppc__) || defined(__PPC__) - # include "jit/none/AtomicOperations-ppc.h" - #elif defined(JS_CODEGEN_NONE) --# include "jit/none/AtomicOperations-none.h" -+# include "jit/none/AtomicOperations-ppc.h" +diff -up firefox-48.0/js/src/jit/AtomicOperations.h.old firefox-48.0/js/src/jit/AtomicOperations.h +--- firefox-48.0/js/src/jit/AtomicOperations.h.old 2016-07-27 09:42:43.148175449 +0200 ++++ firefox-48.0/js/src/jit/AtomicOperations.h 2016-07-27 09:41:13.000000000 +0200 +@@ -340,7 +340,7 @@ AtomicOperations::isLockfree(int32_t siz + # elif defined(__aarch64__) + # include "jit/arm64/AtomicOperations-arm64.h" + # else +-# include "jit/none/AtomicOperations-none.h" // These MOZ_CRASH() always ++# include "jit/none/AtomicOperations-ppc.h" + # endif #elif defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64) # include "jit/x86-shared/AtomicOperations-x86-shared.h" - #else |