Merge branch 'master' into f30

1 files changed, 9 insertions, 13 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>)