summaryrefslogtreecommitdiff
path: root/waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2018-09-14 11:39:42 -0400
committerB Stack <bgstack15@gmail.com>2018-09-14 11:39:42 -0400
commit4ecb6db04ce862ec1b8a88db5daef0eda7c7a05d (patch)
tree512b8eae0c2ef46e9debfe96af748b308deb27c4 /waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
parentMerge branch 'add-ublock' into 'master' (diff)
downloadstackrpms-4ecb6db04ce862ec1b8a88db5daef0eda7c7a05d.tar.gz
stackrpms-4ecb6db04ce862ec1b8a88db5daef0eda7c7a05d.tar.bz2
stackrpms-4ecb6db04ce862ec1b8a88db5daef0eda7c7a05d.zip
bring in chinforpms/waterfox
Diffstat (limited to 'waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch')
-rw-r--r--waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
new file mode 100644
index 0000000..70e45ff
--- /dev/null
+++ b/waterfox/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");
+ }
+
bgstack15