drop 1238661 patch, no longer applies, patched file not shipped anymore
This commit is contained in:
parent
291d884885
commit
71fbbe358d
@ -1,15 +0,0 @@
|
|||||||
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("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
|
|
||||||
}
|
|
||||||
|
|
||||||
# define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
|
|
@ -177,7 +177,6 @@ Patch227: firefox-locale-debug.patch
|
|||||||
# Upstream patches
|
# Upstream patches
|
||||||
Patch402: mozilla-1196777.patch
|
Patch402: mozilla-1196777.patch
|
||||||
Patch412: mozilla-1337988.patch
|
Patch412: mozilla-1337988.patch
|
||||||
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
|
|
||||||
Patch417: bug1375074-save-restore-x28.patch
|
Patch417: bug1375074-save-restore-x28.patch
|
||||||
Patch422: mozilla-1580174-webrtc-popup.patch
|
Patch422: mozilla-1580174-webrtc-popup.patch
|
||||||
|
|
||||||
@ -382,9 +381,6 @@ This package contains results of tests executed during build.
|
|||||||
%patch227 -p1 -b .locale-debug
|
%patch227 -p1 -b .locale-debug
|
||||||
|
|
||||||
%patch402 -p1 -b .1196777
|
%patch402 -p1 -b .1196777
|
||||||
%ifarch %{arm}
|
|
||||||
%patch415 -p1 -b .1238661
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
# Wayland specific upstream patches
|
# Wayland specific upstream patches
|
||||||
|
Loading…
Reference in New Issue
Block a user