summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2019-07-08 22:47:22 +0200
committerMartin Stransky <stransky@redhat.com>2019-07-08 22:47:22 +0200
commit091ea96b2e2aeeb5d6462b5e0b3e684ed0e6ae7a (patch)
treef0c6c5f9d66c5246471f14fe78aea8ea9313b538
parentMerge branch 'master' into f30 (diff)
parentFixed second arch patches (diff)
downloadlibrewolf-fedora-ff-091ea96b2e2aeeb5d6462b5e0b3e684ed0e6ae7a.tar.gz
librewolf-fedora-ff-091ea96b2e2aeeb5d6462b5e0b3e684ed0e6ae7a.tar.bz2
librewolf-fedora-ff-091ea96b2e2aeeb5d6462b5e0b3e684ed0e6ae7a.zip
Merge branch 'master' into f30
-rw-r--r--Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch22
-rw-r--r--rhbz-1354671.patch6
2 files changed, 12 insertions, 16 deletions
diff --git a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
index 70e45ff..d7e53e7 100644
--- a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
@@ -1,19 +1,15 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200
-@@ -25,10 +25,13 @@ SignalTrampoline(int aSignal, siginfo_t*
- "nop; nop; nop; nop"
- : : : "memory");
+diff -up firefox-68.0/mfbt/LinuxSignal.h.1238661 firefox-68.0/mfbt/LinuxSignal.h
+--- firefox-68.0/mfbt/LinuxSignal.h.1238661 2019-07-08 22:27:29.620749569 +0200
++++ firefox-68.0/mfbt/LinuxSignal.h 2019-07-08 22:44:17.794112428 +0200
+@@ -22,7 +22,10 @@ __attribute__((naked)) void SignalTrampo
+ void* aContext) {
+ asm volatile("nop; nop; nop; nop" : : : "memory");
+- asm volatile("b %0" : : "X"(H) : "memory");
+ // Because the assembler may generate additional insturctions below, we
+ // need to ensure NOPs are inserted first by separating them out above.
+
- asm volatile (
-- "b %0"
-+ "bx %0"
- :
-- : "X"(H)
-+ : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext)
- : "memory");
++ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
}
+ # define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/rhbz-1354671.patch b/rhbz-1354671.patch
index 0e22dab..1f867eb 100644
--- a/rhbz-1354671.patch
+++ b/rhbz-1354671.patch
@@ -1,6 +1,6 @@
-diff -up firefox-65.0/layout/base/nsIPresShell.h.1354671 firefox-65.0/layout/base/nsIPresShell.h
---- firefox-65.0/layout/base/nsIPresShell.h.1354671 2019-01-29 11:50:08.516649643 +0100
-+++ firefox-65.0/layout/base/nsIPresShell.h 2019-01-29 11:51:48.930258629 +0100
+diff -up firefox-65.0/layout/base/PresShell.h.1354671 firefox-65.0/layout/base/PresShell.h
+--- firefox-65.0/layout/base/PresShell.h.1354671 2019-01-29 11:50:08.516649643 +0100
++++ firefox-65.0/layout/base/PresShell.h 2019-01-29 11:51:48.930258629 +0100
@@ -205,7 +205,7 @@ class nsIPresShell : public nsStubDocume
* to the same aSize value. AllocateFrame is infallible and will abort
* on out-of-memory.
bgstack15