diff options
| author | B Stack <bgstack15@gmail.com> | 2018-09-16 00:29:27 +0000 |
|---|---|---|
| committer | B Stack <bgstack15@gmail.com> | 2018-09-16 00:29:27 +0000 |
| commit | 06c2a09edcb5cd71519fe13fb3047f2a2bdb47d0 (patch) | |
| tree | 1661bae9f608448fed9832ca8aaa91891a2a9daa /waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch | |
| parent | Merge branch 'add-ublock' into 'master' (diff) | |
| parent | add waterfox-ublock-origin and fix palemoon-ub (diff) | |
| download | stackrpms-06c2a09edcb5cd71519fe13fb3047f2a2bdb47d0.tar.gz stackrpms-06c2a09edcb5cd71519fe13fb3047f2a2bdb47d0.tar.bz2 stackrpms-06c2a09edcb5cd71519fe13fb3047f2a2bdb47d0.zip | |
Merge branch 'add-waterfox' into 'master'
Add waterfox and its ublock-origin
See merge request bgstack15/stackrpms!8
Diffstat (limited to 'waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch')
| -rw-r--r-- | waterfox/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch | 19 |
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"); + } + |