pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox firefox: NetBSD/aarch64 build fix



details:   https://anonhg.NetBSD.org/pkgsrc/rev/343a3fb6adf7
branches:  trunk
changeset: 440998:343a3fb6adf7
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Oct 23 12:37:14 2020 +0000

description:
firefox: NetBSD/aarch64 build fix

diffstat:

 www/firefox/distinfo                                            |   3 +-
 www/firefox/patches/patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp |  38 ++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)

diffs (59 lines):

diff -r 2643aebaadbe -r 343a3fb6adf7 www/firefox/distinfo
--- a/www/firefox/distinfo      Fri Oct 23 12:16:12 2020 +0000
+++ b/www/firefox/distinfo      Fri Oct 23 12:37:14 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.414 2020/10/20 20:15:29 maya Exp $
+$NetBSD: distinfo,v 1.415 2020/10/23 12:37:14 tnn Exp $
 
 SHA1 (firefox-82.0.source.tar.xz) = aa8485a65038f1390eb9c367f5b6195cb7ca3bb8
 RMD160 (firefox-82.0.source.tar.xz) = f2afbc309b0a304c6082731f9a652a750d307ac7
@@ -19,6 +19,7 @@
 SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 4a6606da590cfb8d855bde58b9c6f90e98d0870c
 SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 35d20981d33ccdb1d8ffb8039e48798777f11658
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
+SHA1 (patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp) = fbb3271ccc09112b191be1b04ba3023bd38f645f
 SHA1 (patch-js_src_jsfriendapi.h) = b5cb687dbbda314fe0f16521c1c042c105c4bbe4
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
diff -r 2643aebaadbe -r 343a3fb6adf7 www/firefox/patches/patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp   Fri Oct 23 12:37:14 2020 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-js_src_jit_arm64_vixl_MozCpu-vixl.cpp,v 1.1 2020/10/23 12:37:14 tnn Exp $
+
+NetBSD/aarch64 does not have the Linux-specific membarrier(2) syscall.
+
+--- js/src/jit/arm64/vixl/MozCpu-vixl.cpp.orig 2020-10-14 17:20:19.000000000 +0000
++++ js/src/jit/arm64/vixl/MozCpu-vixl.cpp
+@@ -42,6 +42,8 @@
+ #   elif defined(__ANDROID__)
+ #    include <sys/syscall.h>
+ #    include <unistd.h>
++#   elif defined(__NetBSD__)
++     // nothing
+ #   else
+ #    error "Missing platform-specific declarations for membarrier syscall!"
+ #   endif // __linux__ / ANDROID
+@@ -49,7 +51,11 @@
+ #  include "vm/JSContext.h" // TlsContext
+ 
+ static int membarrier(int cmd, int flags) {
++#if defined(__NetBSD__)
++    return ENOSYS;
++#else
+     return syscall(__NR_membarrier, cmd, flags);
++#endif
+ }
+ 
+ // These definitions come from the Linux kernel source, for kernels before 4.16
+@@ -116,7 +122,9 @@ uint32_t CPU::GetCacheType() {
+ }
+ 
+ bool CPU::CanFlushICacheFromBackgroundThreads() {
+-#if defined(__aarch64__) && !defined(_MSC_VER) && !defined(XP_DARWIN)
++#if defined(__NetBSD__) && defined(__aarch64__)
++  return false;
++#elif defined(__aarch64__) && !defined(_MSC_VER) && !defined(XP_DARWIN)
+   // On linux, check the kernel supports membarrier(2), that is, it's a kernel
+   // above Linux 4.16 included.
+   //



Home | Main Index | Thread Index | Old Index