1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

www/cliqz: unbreak

=> SHA256 Checksum mismatch for adult-domains.bin.
===>  Giving up on fetching files:  adult-domains.bin

1 out of 1 hunks failed--saving rejects to mozilla-release/third_party/rust/libc/.cargo-checksum.json.rej
=> FreeBSD patch patch-bug1530098 failed to apply cleanly.

PR:		236353 236444
Reported by:	Nuno Teixeira, pkg-fallout
Submitted by:	Santhosh Raju (maintainer)
This commit is contained in:
Jan Beich 2019-03-13 19:17:52 +00:00
parent 0e7e9b5c21
commit d251992860
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=495650
3 changed files with 35 additions and 35 deletions

View File

@ -1,5 +1,5 @@
TIMESTAMP = 1550727191
SHA256 (adult-domains.bin) = ca599140fe3c0be40426d5dfba99b9e4280031d6dc7fbe287fb7a0ac44f5978e
SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65
SIZE (adult-domains.bin) = 528392
SHA256 (cliqz@cliqz.com.xpi) = 011827de9cfdd1a4a921e35ffd20618950da34a1246d0058d219b89ca8b1b0f9
SIZE (cliqz@cliqz.com.xpi) = 6783625

File diff suppressed because one or more lines are too long

View File

@ -2,39 +2,39 @@ 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__) || \
@@ -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
+#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__) || \
#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)
# 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
+#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)
#define EIP_sig(p) ((p)->thread.uts.ts32.__eip)