snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

mozjs68: update to 68.11.0 + fix mips*

Browse source
This commit is contained in:
Jürgen Buchmüller 2020-08-04 20:57:41 +02:00
parent 64d7003103
commit 2c7515319c
3 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
srcpkgs/mozjs68/patches/008-fix-mips32-inl.patch Normal file
View file

@ -0,0 +1,37 @@
From: qiaopengcheng <qiaopengcheng-hf@loongson.cn>
Date: Sun, 2 Jun 2019 07:28:24 +0900
Subject: Bug 1556197 - amend Bug-1544631 for fixing mips32.
---
js/src/jit/mips32/MacroAssembler-mips32-inl.h | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/js/src/jit/mips32/MacroAssembler-mips32-inl.h b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
index 1f7f4d1cf31..06d8773e92a 100644
--- a/js/src/jit/mips32/MacroAssembler-mips32-inl.h
+++ b/js/src/jit/mips32/MacroAssembler-mips32-inl.h
@@ -820,19 +820,21 @@ void MacroAssembler::branchTestSymbol(Condition cond, const ValueOperand& value,
void MacroAssembler::branchTestBigInt(Condition cond, Register tag,
Label* label) {
- branchTestBigIntImpl(cond, tag, label);
+ MOZ_ASSERT(cond == Equal || cond == NotEqual);
+ ma_b(tag, ImmTag(JSVAL_TAG_BIGINT), label, cond);
}
void MacroAssembler::branchTestBigInt(Condition cond, const BaseIndex& address,
Label* label) {
SecondScratchRegisterScope scratch2(*this);
- splitTag(value, scratch2);
+ computeEffectiveAddress(address, scratch2);
branchTestBigInt(cond, scratch2, label);
}
void MacroAssembler::branchTestBigInt(Condition cond, const ValueOperand& value,
Label* label) {
- branchTestBigInt(cond, value.typeReg(), label);
+ SecondScratchRegisterScope scratch2(*this);
+ branchTestBigInt(cond, scratch2, label);
}
void MacroAssembler::branchTestBigIntTruthy(bool b, const ValueOperand& value,

11
srcpkgs/mozjs68/patches/009-fix-mips-sgidefs_h.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/mfbt/RandomNum.cpp 2020-04-29 23:49:40.000000000 +0200
+++ b/mfbt/RandomNum.cpp 2020-08-04 19:29:36.127471301 +0200
@@ -52,7 +52,7 @@
# elif defined(__s390__)
# define GETRANDOM_NR 349
# elif defined(__mips__)
-# include <sgidefs.h>
+# include <asm/sgidefs.h>
# if _MIPS_SIM == _MIPS_SIM_ABI32
# define GETRANDOM_NR 4353
# elif _MIPS_SIM == _MIPS_SIM_ABI64

6
srcpkgs/mozjs68/template
View file

@ -1,7 +1,7 @@
# Template file for 'mozjs68'
pkgname=mozjs68
version=68.8.0
revision=2
version=68.11.0
revision=1
wrksrc="firefox-${version}"
build_wrksrc=js/src
build_style=gnu-configure
@ -15,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MPL-2.0"
homepage="https://www.mozilla.org/js/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
checksum=fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842
checksum=91c1f7caaf1ba785b74799865227456bf784ba614d17cf5f0f41a5f25d6d2160
patch_args="-Np1"
CXXFLAGS="-Wno-class-memaccess"
LDFLAGS+=" -Wl,-z,stack-size=1048576"