diff options
| author | Martin Stransky <stransky@redhat.com> | 2018-01-24 20:37:14 +0100 |
|---|---|---|
| committer | Martin Stransky <stransky@redhat.com> | 2018-01-24 20:37:14 +0100 |
| commit | 0c05b34f9a4f4bd4d8d0f2631d944824c32454f6 (patch) | |
| tree | a40550c184d592a01e89ee51427a68695935d571 | |
| parent | Merge branch 'master' into f26 (diff) | |
| parent | Added build patch for jit/CodeAlignment failure (diff) | |
| download | librewolf-fedora-ff-0c05b34f9a4f4bd4d8d0f2631d944824c32454f6.tar.gz librewolf-fedora-ff-0c05b34f9a4f4bd4d8d0f2631d944824c32454f6.tar.bz2 librewolf-fedora-ff-0c05b34f9a4f4bd4d8d0f2631d944824c32454f6.zip | |
Merge branch 'master' into f26
| -rw-r--r-- | build-jit-CodeAlignment.patch | 12 | ||||
| -rw-r--r-- | firefox.spec | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/build-jit-CodeAlignment.patch b/build-jit-CodeAlignment.patch new file mode 100644 index 0000000..0f0b10c --- /dev/null +++ b/build-jit-CodeAlignment.patch @@ -0,0 +1,12 @@ +diff -up firefox-58.0/js/src/jit/none/MacroAssembler-none.h.old firefox-58.0/js/src/jit/none/MacroAssembler-none.h +--- firefox-58.0/js/src/jit/none/MacroAssembler-none.h.old 2018-01-24 20:33:52.569147937 +0100 ++++ firefox-58.0/js/src/jit/none/MacroAssembler-none.h 2018-01-24 20:34:06.985088057 +0100 +@@ -88,7 +88,7 @@ static constexpr Register WasmTableCallI + static constexpr Register WasmTlsReg { Registers::invalid_reg }; + + static constexpr uint32_t ABIStackAlignment = 4; +-static constexpr uint32_t CodeAlignment = 4; ++static constexpr uint32_t CodeAlignment = 8; + static constexpr uint32_t JitStackAlignment = 8; + static constexpr uint32_t JitStackValueAlignment = JitStackAlignment / sizeof(Value); + diff --git a/firefox.spec b/firefox.spec index 69ee5e5..02303a6 100644 --- a/firefox.spec +++ b/firefox.spec @@ -143,6 +143,7 @@ Patch226: rhbz-1354671.patch Patch229: firefox-nss-version.patch Patch230: firefox-fedora-rhbz-1537287-v2.patch Patch231: build-with-nss-3.34.0.patch +Patch232: build-jit-CodeAlignment.patch # Upstream patches Patch402: mozilla-1196777.patch @@ -324,6 +325,7 @@ This package contains results of tests executed during build. %patch230 -p1 -b .rhbz-1537287 %endif %patch231 -p1 +%patch232 -p1 -b .CodeAlignment %patch402 -p1 -b .1196777 %patch406 -p1 -b .256180 |