From owner-svn-ports-head@freebsd.org Wed Mar 6 02:55:23 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 602B81522BB2; Wed, 6 Mar 2019 02:55:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 01E3B6F07A; Wed, 6 Mar 2019 02:55:23 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84AB1254E9; Wed, 6 Mar 2019 02:55:22 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x262tMaV014833; Wed, 6 Mar 2019 02:55:22 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x262tLWk014829; Wed, 6 Mar 2019 02:55:21 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201903060255.x262tLWk014829@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 6 Mar 2019 02:55:21 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: mail/thunderbird/files www/cliqz/files www/firefox-esr/files www/firefox/files X-SVN-Commit-Revision: 494761 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 01E3B6F07A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Mar 2019 02:55:23 -0000 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(&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(&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)