CVS commit: pkgsrc/www/firefox

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Nov 26 09:51:22 UTC 2020

Modified Files:
        pkgsrc/www/firefox: distinfo
Added Files:
        pkgsrc/www/firefox/patches: patch-js_src_wasm_WasmBaselineCompile.cpp

Log Message:
firefox: fix build on aarch64. Via upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.421 -r1.422 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-js_src_wasm_WasmBaselineCompile.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.421 pkgsrc/www/firefox/distinfo:1.422
--- pkgsrc/www/firefox/distinfo:1.421   Tue Nov 17 16:11:06 2020
+++ pkgsrc/www/firefox/distinfo Thu Nov 26 09:51:22 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.421 2020/11/17 16:11:06 ryoon Exp $
+$NetBSD: distinfo,v 1.422 2020/11/26 09:51:22 tnn Exp $
 
 SHA1 (firefox-83.0.source.tar.xz) = aaec6599db2102d8149a426a7deafbe35d248375
 RMD160 (firefox-83.0.source.tar.xz) = 5436b97f2dae7cb5a6dd128bcd8fb005a9104f0c
@@ -24,6 +24,7 @@ SHA1 (patch-js_src_jit_arm64_vixl_MozCpu
 SHA1 (patch-js_src_jsfriendapi.h) = b5cb687dbbda314fe0f16521c1c042c105c4bbe4
 SHA1 (patch-js_src_util_NativeStack.cpp) = a0a16d8d8d78d3cc3f4d2a508586f1a7821f7dba
 SHA1 (patch-js_src_vm_ArrayBufferObject.cpp) = ca117633d2aae52d82ec349a0bfb0c03b87898b4
+SHA1 (patch-js_src_wasm_WasmBaselineCompile.cpp) = 22bfb7d183964bc11e80c2d9073eee2d854cf121
 SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
 SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 31536f36cb33f16da309527b50eda9b721608115
 SHA1 (patch-media_libcubeb_src_moz.build) = e4e64a1135cf4157ae5b6f7c1710ebd076953479

Added files:

Index: pkgsrc/www/firefox/patches/patch-js_src_wasm_WasmBaselineCompile.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-js_src_wasm_WasmBaselineCompile.cpp:1.1
--- /dev/null   Thu Nov 26 09:51:22 2020
+++ pkgsrc/www/firefox/patches/patch-js_src_wasm_WasmBaselineCompile.cpp        Thu Nov 26 09:51:22 2020
@@ -0,0 +1,48 @@
+$NetBSD: patch-js_src_wasm_WasmBaselineCompile.cpp,v 1.1 2020/11/26 09:51:22 tnn Exp $
+
+https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch
+
+--- js/src/wasm/WasmBaselineCompile.cpp.orig   2020-11-25 22:18:17.992966827 +0000
++++ js/src/wasm/WasmBaselineCompile.cpp
+@@ -654,15 +654,13 @@ class BaseRegAlloc {
+ 
+   template <MIRType t>
+   bool hasFPU() {
+-    return availFPU.hasAny<RegTypeOf<t>::value>();
+-  }
+-
+ #ifdef RABALDR_SIDEALLOC_V128
+-  template <>
+-  bool hasFPU<MIRType::Simd128>() {
+-    MOZ_CRASH("Should not happen");
+-  }
++    if constexpr (t == MIRType::Simd128)
++      MOZ_CRASH("Should not happen");
++    else
+ #endif
++    return availFPU.hasAny<RegTypeOf<t>::value>();
++  }
+ 
+   bool isAvailableGPR(Register r) { return availGPR.has(r); }
+ 
+@@ -745,15 +743,13 @@ class BaseRegAlloc {
+ 
+   template <MIRType t>
+   FloatRegister allocFPU() {
+-    return availFPU.takeAny<RegTypeOf<t>::value>();
+-  }
+-
+ #ifdef RABALDR_SIDEALLOC_V128
+-  template <>
+-  FloatRegister allocFPU<MIRType::Simd128>() {
+-    MOZ_CRASH("Should not happen");
+-  }
++    if constexpr (t == MIRType::Simd128)
++      MOZ_CRASH("Should not happen");
++    else
+ #endif
++    return availFPU.takeAny<RegTypeOf<t>::value>();
++  }
+ 
+   void freeGPR(Register r) { availGPR.add(r); }
+