| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame^] | 1 | From 0e0548e3f95e22a39db8d5b934afe0672a3f801b Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> |
| 3 | Date: Mon, 1 Nov 2021 08:13:29 +0100 |
| 4 | Subject: [PATCH] Fix build on powerpc |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Another fix for (this time JIT enabled) |
| 10 | | <...>/irefox-91.2.0/js/src/wasm/WasmFrame.cpp:57:76: error: static assertion failed: Aligned after pushing DebugFrame |
| 11 | | 57 | static_assert((offsetof(DebugFrame, frame_) + sizeof(Frame)) % Alignment == 0, |
| 12 | | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~ |
| 13 | |
| 14 | Upstream-Status: Pending |
| 15 | |
| 16 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 17 | --- |
| 18 | js/src/wasm/WasmFrame.h | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/js/src/wasm/WasmFrame.h b/js/src/wasm/WasmFrame.h |
| 22 | index 893762e..2d90656 100644 |
| 23 | --- a/js/src/wasm/WasmFrame.h |
| 24 | +++ b/js/src/wasm/WasmFrame.h |
| 25 | @@ -232,7 +232,7 @@ class DebugFrame { |
| 26 | #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \ |
| 27 | (defined(JS_CODEGEN_NONE) && \ |
| 28 | (defined(__riscv) && __riscv_xlen == 32) || defined(__mips__)) || \ |
| 29 | - defined(JS_CODEGEN_X86) || defined(__wasi__) |
| 30 | + defined(JS_CODEGEN_X86) || defined(__wasi__) || defined(__powerpc__) |
| 31 | // See alignmentStaticAsserts(). For MIPS32, ARM32 and X86 DebugFrame is only |
| 32 | // 4-byte aligned, so we add another word to get up to 8-byte |
| 33 | // alignment. |
| 34 | -- |
| 35 | 2.31.1 |
| 36 | |