Arm build fix
This commit is contained in:
parent
7bf0e81c79
commit
3d70da77c4
19
Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
Normal file
19
Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
Normal file
@ -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");
|
||||||
|
}
|
||||||
|
|
@ -152,6 +152,7 @@ Patch411: mozilla-1321521-2.patch
|
|||||||
Patch412: mozilla-1337988.patch
|
Patch412: mozilla-1337988.patch
|
||||||
Patch413: mozilla-1353817.patch
|
Patch413: mozilla-1353817.patch
|
||||||
Patch414: mozilla-1435212-ffmpeg-4.0.patch
|
Patch414: mozilla-1435212-ffmpeg-4.0.patch
|
||||||
|
Patch415: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
|
||||||
|
|
||||||
# Debian patches
|
# Debian patches
|
||||||
Patch500: mozilla-440908.patch
|
Patch500: mozilla-440908.patch
|
||||||
@ -300,7 +301,6 @@ This package contains results of tests executed during build.
|
|||||||
%endif
|
%endif
|
||||||
%patch37 -p1 -b .jit-atomic-lucky
|
%patch37 -p1 -b .jit-atomic-lucky
|
||||||
%patch40 -p1 -b .aarch64-skia
|
%patch40 -p1 -b .aarch64-skia
|
||||||
|
|
||||||
%patch3 -p1 -b .arm
|
%patch3 -p1 -b .arm
|
||||||
|
|
||||||
# Fedora patches
|
# Fedora patches
|
||||||
@ -318,6 +318,9 @@ This package contains results of tests executed during build.
|
|||||||
%patch406 -p1 -b .256180
|
%patch406 -p1 -b .256180
|
||||||
%patch413 -p1 -b .1353817
|
%patch413 -p1 -b .1353817
|
||||||
%patch414 -p1 -b .ffmpeg-4.0
|
%patch414 -p1 -b .ffmpeg-4.0
|
||||||
|
%ifarch %{arm}
|
||||||
|
%patch415 -p1 -b .mozilla-1238661
|
||||||
|
%endif
|
||||||
|
|
||||||
# Patch for big endian platforms only
|
# Patch for big endian platforms only
|
||||||
%if 0%{?big_endian}
|
%if 0%{?big_endian}
|
||||||
|
Loading…
Reference in New Issue
Block a user