Date: Wed, 6 Mar 2019 02:55:21 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494761 - in head: mail/thunderbird/files www/cliqz/files www/firefox-esr/files www/firefox/files Message-ID: <201903060255.x262tLWk014829@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Mar 6 02:55:21 2019 New Revision: 494761 URL: https://svnweb.freebsd.org/changeset/ports/494761 Log: www/firefox-esr: unbreak on powerpc64 after r472833 In file included from objdir/js/src/Unified_cpp_js_src41.cpp:2: js/src/wasm/WasmSignalHandlers.cpp: In function 'uint8_t** ContextToPC(ucontext_t*)': js/src/wasm/WasmSignalHandlers.cpp:439:19: error: 'R32_sig' was not declared in this scope #define PC_sig(p) R32_sig(p) ^~~~~~~ js/src/wasm/WasmSignalHandlers.cpp:450:39: note: in expansion of macro 'PC_sig' return reinterpret_cast<uint8_t**>(&PC_sig(context)); ^~~~~~ js/src/wasm/WasmSignalHandlers.cpp:439:19: note: suggested alternative: 'R12_sig' #define PC_sig(p) R32_sig(p) ^~~~~~~ js/src/wasm/WasmSignalHandlers.cpp:450:39: note: in expansion of macro 'PC_sig' return reinterpret_cast<uint8_t**>(&PC_sig(context)); ^~~~~~ Reported by: pkg-fallout Added: head/mail/thunderbird/files/patch-bug1532851 (contents, props changed) head/www/cliqz/files/patch-bug1532851 (contents, props changed) head/www/firefox-esr/files/patch-bug1532851 (contents, props changed) head/www/firefox/files/patch-bug1532851 (contents, props changed) Added: head/mail/thunderbird/files/patch-bug1532851 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/thunderbird/files/patch-bug1532851 Wed Mar 6 02:55:21 2019 (r494761) @@ -0,0 +1,40 @@ +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index fc49f361d82a..636537f84786 100644 +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -102,6 +102,11 @@ using mozilla::DebugOnly; + #define EPC_sig(p) ((p)->sc_pc) + #define RFP_sig(p) ((p)->sc_regs[30]) + #endif ++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++#define R01_sig(p) ((p)->sc_frame.fixreg[1]) ++#define R32_sig(p) ((p)->sc_frame.srr0) ++#endif + #elif defined(__linux__) || defined(__sun) + #if defined(__linux__) + #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) +@@ -169,6 +174,11 @@ using mozilla::DebugOnly; + #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) + #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) + #endif ++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1]) ++#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++#endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || \ + defined(__FreeBSD_kernel__) + #define EIP_sig(p) ((p)->uc_mcontext.mc_eip) +@@ -197,6 +207,11 @@ using mozilla::DebugOnly; + #if defined(__FreeBSD__) && defined(__mips__) + #define EPC_sig(p) ((p)->uc_mcontext.mc_pc) + #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++#endif ++#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \ ++ defined(__ppc64le__) || defined(__PPC64LE__)) ++#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1]) ++#define R32_sig(p) ((p)->uc_mcontext.mc_srr0) + #endif + #elif defined(XP_DARWIN) + #define EIP_sig(p) ((p)->thread.uts.ts32.__eip) Added: head/www/cliqz/files/patch-bug1532851 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1532851 Wed Mar 6 02:55:21 2019 (r494761) @@ -0,0 +1,40 @@ +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index fc49f361d82a..636537f84786 100644 +--- mozilla-release/js/src/wasm/WasmSignalHandlers.cpp ++++ mozilla-release/js/src/wasm/WasmSignalHandlers.cpp +@@ -94,6 +94,11 @@ using mozilla::DebugOnly; + # define EPC_sig(p) ((p)->sc_pc) + # define RFP_sig(p) ((p)->sc_regs[30]) + # endif ++# if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++# define R01_sig(p) ((p)->sc_frame.fixreg[1]) ++# define R32_sig(p) ((p)->sc_frame.srr0) ++# endif + #elif defined(__linux__) || defined(__sun) + # if defined(__linux__) + # define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) +@@ -161,6 +166,11 @@ using mozilla::DebugOnly; + # define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) + # define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) + # endif ++# if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++# define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1]) ++# define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++# endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + # define EIP_sig(p) ((p)->uc_mcontext.mc_eip) + # define EBP_sig(p) ((p)->uc_mcontext.mc_ebp) +@@ -188,6 +198,11 @@ using mozilla::DebugOnly; + # if defined(__FreeBSD__) && defined(__mips__) + # define EPC_sig(p) ((p)->uc_mcontext.mc_pc) + # define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++# endif ++# if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \ ++ defined(__ppc64le__) || defined(__PPC64LE__)) ++# define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1]) ++# define R32_sig(p) ((p)->uc_mcontext.mc_srr0) + # endif + #elif defined(XP_DARWIN) + # define EIP_sig(p) ((p)->thread.uts.ts32.__eip) Added: head/www/firefox-esr/files/patch-bug1532851 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox-esr/files/patch-bug1532851 Wed Mar 6 02:55:21 2019 (r494761) @@ -0,0 +1,40 @@ +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index fc49f361d82a..636537f84786 100644 +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -102,6 +102,11 @@ using mozilla::DebugOnly; + #define EPC_sig(p) ((p)->sc_pc) + #define RFP_sig(p) ((p)->sc_regs[30]) + #endif ++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++#define R01_sig(p) ((p)->sc_frame.fixreg[1]) ++#define R32_sig(p) ((p)->sc_frame.srr0) ++#endif + #elif defined(__linux__) || defined(__sun) + #if defined(__linux__) + #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) +@@ -169,6 +174,11 @@ using mozilla::DebugOnly; + #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) + #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) + #endif ++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1]) ++#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++#endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || \ + defined(__FreeBSD_kernel__) + #define EIP_sig(p) ((p)->uc_mcontext.mc_eip) +@@ -197,6 +207,11 @@ using mozilla::DebugOnly; + #if defined(__FreeBSD__) && defined(__mips__) + #define EPC_sig(p) ((p)->uc_mcontext.mc_pc) + #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++#endif ++#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \ ++ defined(__ppc64le__) || defined(__PPC64LE__)) ++#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1]) ++#define R32_sig(p) ((p)->uc_mcontext.mc_srr0) + #endif + #elif defined(XP_DARWIN) + #define EIP_sig(p) ((p)->thread.uts.ts32.__eip) Added: head/www/firefox/files/patch-bug1532851 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1532851 Wed Mar 6 02:55:21 2019 (r494761) @@ -0,0 +1,40 @@ +diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp +index fc49f361d82a..636537f84786 100644 +--- js/src/wasm/WasmSignalHandlers.cpp ++++ js/src/wasm/WasmSignalHandlers.cpp +@@ -102,6 +102,11 @@ using mozilla::DebugOnly; + #define EPC_sig(p) ((p)->sc_pc) + #define RFP_sig(p) ((p)->sc_regs[30]) + #endif ++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++#define R01_sig(p) ((p)->sc_frame.fixreg[1]) ++#define R32_sig(p) ((p)->sc_frame.srr0) ++#endif + #elif defined(__linux__) || defined(__sun) + #if defined(__linux__) + #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) +@@ -169,6 +174,11 @@ using mozilla::DebugOnly; + #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) + #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) + #endif ++#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ ++ defined(__PPC64LE__) ++#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1]) ++#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) ++#endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || \ + defined(__FreeBSD_kernel__) + #define EIP_sig(p) ((p)->uc_mcontext.mc_eip) +@@ -197,6 +207,11 @@ using mozilla::DebugOnly; + #if defined(__FreeBSD__) && defined(__mips__) + #define EPC_sig(p) ((p)->uc_mcontext.mc_pc) + #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) ++#endif ++#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \ ++ defined(__ppc64le__) || defined(__PPC64LE__)) ++#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1]) ++#define R32_sig(p) ((p)->uc_mcontext.mc_srr0) + #endif + #elif defined(XP_DARWIN) + #define EIP_sig(p) ((p)->thread.uts.ts32.__eip)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903060255.x262tLWk014829>