diff options
author | Martin Stransky <stransky@redhat.com> | 2018-04-27 10:46:56 +0200 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2018-04-27 10:46:56 +0200 |
commit | b461a258ac6c3f4b54e636bc0bb1146dba8e153b (patch) | |
tree | 77151071960f2925f9b870877fa65ce8327c5208 /Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch | |
parent | Merge branch 'master' into f27 (diff) | |
parent | Update to 60.0 Beta 16 (diff) | |
download | librewolf-fedora-ff-b461a258ac6c3f4b54e636bc0bb1146dba8e153b.tar.gz librewolf-fedora-ff-b461a258ac6c3f4b54e636bc0bb1146dba8e153b.tar.bz2 librewolf-fedora-ff-b461a258ac6c3f4b54e636bc0bb1146dba8e153b.zip |
Merge branch 'master' into f27
Diffstat (limited to 'Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch')
-rw-r--r-- | Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch new file mode 100644 index 0000000..70e45ff --- /dev/null +++ b/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch @@ -0,0 +1,19 @@ +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"); + ++ // 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"); + } + |