From c4096266797d900fd454435d3c586bf10dd58415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 24 Jan 2021 18:31:51 -0300 Subject: [PATCH 1/2] polkit: update to 0.118. Also add checkdepends. --- srcpkgs/polkit/template | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index 0681449a0d9..13a1c10c1d2 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -1,23 +1,24 @@ # Template file for 'polkit' pkgname=polkit -version=0.116 -revision=3 +version=0.118 +revision=1 build_style=gnu-configure -build_helper="gir" +build_helper=gir configure_args="$(vopt_enable gir introspection) -disable-static - --with-authfw=pam --with-os-type=void --with-mozjs=mozjs-60.0" + --with-authfw=pam --with-os-type=void" make_dirs=" /etc/polkit-1/rules.d 0700 polkitd polkitd /usr/share/polkit-1/rules.d 0700 polkitd polkitd" hostmakedepends="autoconf-archive automake gettext-devel glib-devel gobject-introspection gtk-doc intltool libtool pkg-config" -makedepends="elogind-devel mozjs60-devel pam-devel" +makedepends="elogind-devel mozjs78-devel pam-devel" +checkdepends="python3-dbus python3-dbusmock" short_desc="Authorization Toolkit" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/polkit" distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.gz" -checksum=88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1 +checksum=6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b system_accounts="polkitd" #replaces="polkit-elogind>=0" #provides="polkit-elogind-${version}_${revision}" @@ -29,14 +30,7 @@ build_options_default="gir" pre_configure() { autoreconf -fi # Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF. - sed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure -} - -post_configure() { - if [ "$CROSS_BUILD" ]; then - sed -e "s#-include \(/usr/include/mozjs-52/js/RequiredDefines\.h\)#-include ${XBPS_CROSS_BASE}\1#" \ - -i $(find -name Makefile) - fi + vsed -e 's,/sys/fs/cgroup/systemd/,/sys/fs/cgroup,g' -i configure } post_install() { From 6b2f227814db8ac801f9d40745de8f8edad30466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 24 Jan 2021 18:40:51 -0300 Subject: [PATCH 2/2] mozjs60: remove package. --- common/shlibs | 1 - srcpkgs/mozjs60-devel | 1 - .../0001-silence-sandbox-violations.patch | 30 - ...nd-restore-non-volatile-x28-on-arm64.patch | 64 --- ...-clobbering-it-in-the-regex-compiler.patch | 97 ---- .../mozjs60/patches/0004-fix-soname-lib.patch | 30 - .../mozjs60/patches/0005-fix-musl-build.patch | 16 - srcpkgs/mozjs60/patches/0006-endianness.patch | 127 ----- .../patches/0007-jsproperty-endian.patch | 22 - .../mozjs60/patches/0008-copy-headers.patch | 30 - .../mozjs60/patches/0009-mips-sgidefs_h.patch | 11 - srcpkgs/mozjs60/patches/0010-mips-LIR.patch | 511 ------------------ .../patches/0011-mips-macroassembler.patch | 27 - .../0012-mozjs60.pc-honor-sysroot.patch | 13 - srcpkgs/mozjs60/template | 69 --- srcpkgs/mozjs60/update | 1 - srcpkgs/removed-packages/template | 1 + 17 files changed, 1 insertion(+), 1050 deletions(-) delete mode 120000 srcpkgs/mozjs60-devel delete mode 100644 srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch delete mode 100644 srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch delete mode 100644 srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch delete mode 100644 srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch delete mode 100644 srcpkgs/mozjs60/patches/0005-fix-musl-build.patch delete mode 100644 srcpkgs/mozjs60/patches/0006-endianness.patch delete mode 100644 srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch delete mode 100644 srcpkgs/mozjs60/patches/0008-copy-headers.patch delete mode 100644 srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch delete mode 100644 srcpkgs/mozjs60/patches/0010-mips-LIR.patch delete mode 100644 srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch delete mode 100644 srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch delete mode 100644 srcpkgs/mozjs60/template delete mode 100644 srcpkgs/mozjs60/update diff --git a/common/shlibs b/common/shlibs index 979daeddbf1..33085e11c45 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3519,7 +3519,6 @@ libmaxminddb.so.0 libmaxminddb-1.3.2_1 libmysqlpp.so.3 mysql++-3.2.5_1 libKF5Syndication.so.5 syndication-5.50.0_1 liblqr-1.so.0 liblqr-0.4.2_1 -libmozjs-60.so.0 mozjs60-60.0.2_1 libmozjs-68.so.0 mozjs68-68.8.0_1 libmozjs-78.so.0 mozjs78-78.1.0_1 libebur128.so.1 libebur128-1.2.4_1 diff --git a/srcpkgs/mozjs60-devel b/srcpkgs/mozjs60-devel deleted file mode 120000 index 46261b43dbe..00000000000 --- a/srcpkgs/mozjs60-devel +++ /dev/null @@ -1 +0,0 @@ -mozjs60 \ No newline at end of file diff --git a/srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch b/srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch deleted file mode 100644 index 91820267182..00000000000 --- a/srcpkgs/mozjs60/patches/0001-silence-sandbox-violations.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream: no -From 9ad10569e11a2fb96377188f895bc66abcc9511d Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou -Date: Wed, 5 Sep 2018 15:05:24 +0200 -Subject: [PATCH] silence sandbox violations - -Signed-off-by: Marc-Antoine Perennou ---- - python/mozbuild/mozbuild/frontend/emitter.py | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py -index 642b381c0..c37fbf5d0 100644 ---- a/python/mozbuild/mozbuild/frontend/emitter.py -+++ b/python/mozbuild/mozbuild/frontend/emitter.py -@@ -1127,11 +1127,6 @@ class TreeMetadataEmitter(LoggingMixin): - raise SandboxValidationError('Path specified in LOCAL_INCLUDES ' - 'does not exist: %s (resolved to %s)' % (local_include, - full_path), context) -- if (full_path == context.config.topsrcdir or -- full_path == context.config.topobjdir): -- raise SandboxValidationError('Path specified in LOCAL_INCLUDES ' -- 'is not allowed: %s (resolved to %s)' % (local_include, -- full_path), context) - include_obj = LocalInclude(context, local_include) - local_includes.append(include_obj.path.full_path) - yield include_obj --- -2.18.0 - diff --git a/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch b/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch deleted file mode 100644 index 46d280d06ae..00000000000 --- a/srcpkgs/mozjs60/patches/0002-save-and-restore-non-volatile-x28-on-arm64.patch +++ /dev/null @@ -1,64 +0,0 @@ -# HG changeset patch -# User Lars T Hansen -# Date 1519822672 -3600 -# Node ID 800abe66894d6b07b24bccecbf6a65e2261076f6 -# Parent 223c97459e96183eb616aed39147207bdb953ba8 -Bug 1375074 - Save and restore non-volatile x28 on ARM64 for generated unboxed object constructor. r=sstangl - -Origin: upstream -Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/800abe66894d ---- - js/src/vm/UnboxedObject.cpp | 30 ++++++++++++++++++++++++++---- - 1 file changed, 26 insertions(+), 4 deletions(-) - -diff --git a/js/src/vm/UnboxedObject.cpp b/js/src/vm/UnboxedObject.cpp -index 35ca20d7405f..1c20a1093d13 100644 ---- a/js/src/vm/UnboxedObject.cpp -+++ b/js/src/vm/UnboxedObject.cpp -@@ -86,9 +86,16 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; - #endif - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for -- // addressing. -- masm.initStackPtr(); -+ // ARM64 communicates stack address via sp, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. -+ masm.initStackPtr(); - #endif - - MOZ_ASSERT(propertiesReg.volatile_()); -@@ -239,7 +246,22 @@ static const uintptr_t CLEAR_CONSTRUCTOR_CODE_TOKEN = 0x1; - if (ScratchDoubleReg.volatile_()) masm.pop(ScratchDoubleReg); - masm.PopRegsInMask(savedNonVolatileRegisters); - -- masm.abiret(); -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else -+ masm.abiret(); -+#endif - - masm.bind(&failureStoreOther); - --- -2.21.0 - diff --git a/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch b/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch deleted file mode 100644 index 3886c0e9b21..00000000000 --- a/srcpkgs/mozjs60/patches/0003-save-x28-before-clobbering-it-in-the-regex-compiler.patch +++ /dev/null @@ -1,97 +0,0 @@ -# HG changeset patch -# User Lars T Hansen -# Date 1521449886 -3600 -# Node ID 903a79a1efff18fc7cc50db09a3fe5d768adc9a8 -# Parent 4d2955a9ca7e30ca4c3af9c214ccc77fb2fe7fb8 -Bug 1445907 - Save x28 before clobbering it in the regex compiler. r=sstangl - -Origin: upstream -Applied-upstream: 61, commit: https://hg.mozilla.org/mozilla-central/rev/903a79a1efff ---- -diff --git a/js/src/irregexp/NativeRegExpMacroAssembler.cpp b/js/src/irregexp/NativeRegExpMacroAssembler.cpp ---- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp -+++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp -@@ -118,17 +118,25 @@ NativeRegExpMacroAssembler::GenerateCode - - Label return_temp0; - - // Finalize code - write the entry point code now we know how many - // registers we need. - masm.bind(&entry_label_); - - #ifdef JS_CODEGEN_ARM64 -- // ARM64 communicates stack address via sp, but uses a pseudo-sp for addressing. -+ // ARM64 communicates stack address via SP, but uses a pseudo-sp (PSP) for -+ // addressing. The register we use for PSP may however also be used by -+ // calling code, and it is nonvolatile, so save it. Do this as a special -+ // case first because the generic save/restore code needs the PSP to be -+ // initialized already. -+ MOZ_ASSERT(PseudoStackPointer64.Is(masm.GetStackPointer64())); -+ masm.Str(PseudoStackPointer64, vixl::MemOperand(sp, -16, vixl::PreIndex)); -+ -+ // Initialize the PSP from the SP. - masm.initStackPtr(); - #endif - - // Push non-volatile registers which might be modified by jitcode. - size_t pushedNonVolatileRegisters = 0; - for (GeneralRegisterForwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) { - masm.Push(*iter); - pushedNonVolatileRegisters++; -@@ -416,17 +424,32 @@ NativeRegExpMacroAssembler::GenerateCode - masm.pop(temp0); - masm.movePtr(temp0, StackPointer); - #endif - - // Restore non-volatile registers which were saved on entry. - for (GeneralRegisterBackwardIterator iter(savedNonVolatileRegisters); iter.more(); ++iter) - masm.Pop(*iter); - -+#ifdef JS_CODEGEN_ARM64 -+ // Now restore the value that was in the PSP register on entry, and return. -+ -+ // Obtain the correct SP from the PSP. -+ masm.Mov(sp, PseudoStackPointer64); -+ -+ // Restore the saved value of the PSP register, this value is whatever the -+ // caller had saved in it, not any actual SP value, and it must not be -+ // overwritten subsequently. -+ masm.Ldr(PseudoStackPointer64, vixl::MemOperand(sp, 16, vixl::PostIndex)); -+ -+ // Perform a plain Ret(), as abiret() will move SP <- PSP and that is wrong. -+ masm.Ret(vixl::lr); -+#else - masm.abiret(); -+#endif - - // Backtrack code (branch target for conditional backtracks). - if (backtrack_label_.used()) { - masm.bind(&backtrack_label_); - Backtrack(); - } - - // Backtrack stack overflow code. -diff --git a/js/src/jit-test/tests/regexp/bug1445907.js b/js/src/jit-test/tests/regexp/bug1445907.js -new file mode 100644 ---- /dev/null -+++ b/js/src/jit-test/tests/regexp/bug1445907.js -@@ -0,0 +1,15 @@ -+// On ARM64, we failed to save x28 properly when generating code for the regexp -+// matcher. -+// -+// There's wasm and Debugger code here because the combination forces the use of -+// x28 and exposes the bug when running on the simulator. -+ -+if (!wasmIsSupported()) -+ quit(); -+ -+var g = newGlobal(''); -+var dbg = new Debugger(g); -+g.eval(`var m = new WebAssembly.Instance(new WebAssembly.Module(wasmTextToBinary('(module (func (export "test")))')))`); -+var re = /./; -+dbg.onEnterFrame = function(frame) { re.exec("x") }; -+result = g.eval("m.exports.test()"); - --- -2.21.0 - diff --git a/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch b/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch deleted file mode 100644 index b9147fa20c9..00000000000 --- a/srcpkgs/mozjs60/patches/0004-fix-soname-lib.patch +++ /dev/null @@ -1,30 +0,0 @@ -Source: Arch Linux -Upstream: Unknown -Reason: fixes linking against libmozjs-60 - -diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in -index ee19104e0ef5..a0f06fd35a18 100644 ---- i/js/src/build/Makefile.in -+++ w/js/src/build/Makefile.in -@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY)) - endif - ifneq (,$(SHARED_LIBRARY)) - $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir) -+ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0 -+ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) - ifeq ($(OS_ARCH),Darwin) - install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) - endif -diff --git i/js/src/build/moz.build w/js/src/build/moz.build -index a7f5fa4ce8eb..726687c13fb0 100644 ---- i/js/src/build/moz.build -+++ w/js/src/build/moz.build -@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']: - if CONFIG['JS_SHARED_LIBRARY']: - GeckoSharedLibrary('js', linkage=None) - SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME'] -+ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)] - else: - Library('js') - - diff --git a/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch b/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch deleted file mode 100644 index af394673990..00000000000 --- a/srcpkgs/mozjs60/patches/0005-fix-musl-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -Upstream: No -Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: -https://github.com/void-linux/void-packages/issues/2598 -diff --git a/js/src/old-configure.in b/js/src/old-configure.in ---- a/js/src/old-configure.in -+++ b/js/src/old-configure.in -@@ -1272,6 +1272,9 @@ - *-android*|*-linuxandroid*) - : - ;; -+ *-musl*) -+ : -+ ;; - *) - AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) - ;; diff --git a/srcpkgs/mozjs60/patches/0006-endianness.patch b/srcpkgs/mozjs60/patches/0006-endianness.patch deleted file mode 100644 index 56352b74c70..00000000000 --- a/srcpkgs/mozjs60/patches/0006-endianness.patch +++ /dev/null @@ -1,127 +0,0 @@ -Bug 1488552 - Ensure proper running on 64-bit and 32-bit BE platforms. - -Index: mozjs60/js/src/gc/Marking-inl.h -=================================================================== ---- a/js/src/gc/Marking-inl.h 2019-02-21 14:44:28.296951992 +0100 -+++ b/js/src/gc/Marking-inl.h 2019-02-22 10:22:54.612120604 +0100 -@@ -82,12 +82,28 @@ - MOZ_ASSERT(!isForwarded()); - // The location of magic_ is important because it must never be valid to see - // the value Relocated there in a GC thing that has not been moved. -+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 -+ // On 32-bit, the magic_ aliases with whatever comes after the first -+ // pointer; on little-endian 64-bit, the magic_ aliases with the -+ // 32 most significant bits of the pointer, which are the second half. - static_assert(offsetof(RelocationOverlay, magic_) == - offsetof(JSObject, group_) + sizeof(uint32_t), - "RelocationOverlay::magic_ is in the wrong location"); - static_assert(offsetof(RelocationOverlay, magic_) == - offsetof(js::Shape, base_) + sizeof(uint32_t), - "RelocationOverlay::magic_ is in the wrong location"); -+#elif JS_BITS_PER_WORD == 64 -+ // On big-endian 64-bit, the magic_ aliases with the 32 most -+ // significant bits of the pointer, but now that's the first half. -+ static_assert(offsetof(RelocationOverlay, magic_) == -+ offsetof(JSObject, group_), -+ "RelocationOverlay::magic_ is in the wrong location"); -+ static_assert(offsetof(RelocationOverlay, magic_) == -+ offsetof(js::Shape, base_), -+ "RelocationOverlay::magic_ is in the wrong location"); -+#else -+# error "Unknown endianness or word size" -+#endif - static_assert( - offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length), - "RelocationOverlay::magic_ is in the wrong location"); -Index: mozjs60/js/src/gc/RelocationOverlay.h -=================================================================== ---- a/js/src/gc/RelocationOverlay.h 2019-02-21 14:44:28.296951992 +0100 -+++ b/js/src/gc/RelocationOverlay.h 2019-02-22 10:19:41.816822202 +0100 -@@ -34,14 +34,25 @@ - /* See comment in js/public/HeapAPI.h. */ - static const uint32_t Relocated = js::gc::Relocated; - -+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 - /* -- * Keep the low 32 bits untouched. Use them to distinguish strings from -+ * Keep the first 32 bits untouched. Use them to distinguish strings from - * objects in the nursery. - */ - uint32_t preserve_; - - /* Set to Relocated when moved. */ - uint32_t magic_; -+#elif JS_BITS_PER_WORD == 64 -+ /* -+ * On big-endian, we need to reorder to keep preserve_ lined up with the -+ * low 32 bits of the aligned group_ pointer in JSObject. -+ */ -+ uint32_t magic_; -+ uint32_t preserve_; -+#else -+# error "Unknown endianness or word size" -+#endif - - /* The location |this| was moved to. */ - Cell* newLocation_; -Index: mozjs60/js/src/jsfriendapi.h -=================================================================== ---- a/js/src/jsfriendapi.h 2019-02-21 14:44:28.484951245 +0100 -+++ b/js/src/jsfriendapi.h 2019-02-22 10:24:25.663774399 +0100 -@@ -9,6 +9,7 @@ - - #include "mozilla/Atomics.h" - #include "mozilla/Casting.h" -+#include "mozilla/EndianUtils.h" - #include "mozilla/Maybe.h" - #include "mozilla/MemoryReporting.h" - #include "mozilla/UniquePtr.h" -@@ -640,8 +641,15 @@ - static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6); - static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5); - static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1; -+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 - uint32_t flags; - uint32_t length; -+#elif JS_BITS_PER_WORD == 64 -+ uint32_t length; -+ uint32_t flags; -+#else -+# error "Unknown endianness or word size" -+#endif - union { - const JS::Latin1Char* nonInlineCharsLatin1; - const char16_t* nonInlineCharsTwoByte; -Index: mozjs60/js/src/vm/StringType.h -=================================================================== ---- a/js/src/vm/StringType.h 2019-02-21 14:44:29.072948907 +0100 -+++ b/js/src/vm/StringType.h 2019-02-22 10:21:20.464469244 +0100 -@@ -7,6 +7,7 @@ - #ifndef vm_StringType_h - #define vm_StringType_h - -+#include "mozilla/EndianUtils.h" - #include "mozilla/MemoryReporting.h" - #include "mozilla/PodOperations.h" - #include "mozilla/Range.h" -@@ -166,8 +167,20 @@ - { - union { - struct { -+#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 - uint32_t flags; /* JSString */ - uint32_t length; /* JSString */ -+#elif JS_BITS_PER_WORD == 64 -+ /* -+ * On big-endian, we need to reorder to keep flags lined up -+ * with the low 32 bits of the aligned group_ pointer in -+ * JSObject. -+ */ -+ uint32_t length; /* JSString */ -+ uint32_t flags; /* JSString */ -+#else -+# error "Unknown endianness or word size" -+#endif - }; - uintptr_t flattenData; /* JSRope (temporary while flattening) */ - } u1; diff --git a/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch b/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch deleted file mode 100644 index dd01c37ac92..00000000000 --- a/srcpkgs/mozjs60/patches/0007-jsproperty-endian.patch +++ /dev/null @@ -1,22 +0,0 @@ -Bug 1543659 - fix JSPropertySpec::ValueWrapper on 64-bit big-endian platforms - -Add some padding to make the union's int32 member correspond to the -low-order bits of the string member. This fixes TypedArray tests on -s390x. - ---- a/js/src/jsapi.h -+++ b/js/src/jsapi.h -@@ -1702,7 +1702,12 @@ - uintptr_t type; - union { - const char* string; -- int32_t int32; -+ struct { -+#if MOZ_BIG_ENDIAN && JS_BITS_PER_WORD == 64 -+ uint32_t padding; -+#endif -+ int32_t int32; -+ }; - }; - }; - diff --git a/srcpkgs/mozjs60/patches/0008-copy-headers.patch b/srcpkgs/mozjs60/patches/0008-copy-headers.patch deleted file mode 100644 index a4367411065..00000000000 --- a/srcpkgs/mozjs60/patches/0008-copy-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Rico Tzschichholz -Date: Wed, 5 Jul 2017 22:45:59 -0700 -Subject: build: Copy headers on install instead of symlinking - -Patch ported forward to mozjs52 by Philip Chimento -. ---- - python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py -index dd9020d..6918ef8 100644 ---- a/python/mozbuild/mozbuild/backend/recursivemake.py -+++ b/python/mozbuild/mozbuild/backend/recursivemake.py -@@ -1427,11 +1427,11 @@ class RecursiveMakeBackend(CommonBackend): - raise Exception("Wildcards are only supported in the filename part of " - "srcdir-relative or absolute paths.") - -- install_manifest.add_pattern_link(basepath, wild, path) -+ install_manifest.add_pattern_copy(basepath, wild, path) - else: -- install_manifest.add_pattern_link(f.srcdir, f, path) -+ install_manifest.add_pattern_copy(f.srcdir, f, path) - else: -- install_manifest.add_link(f.full_path, dest) -+ install_manifest.add_copy(f.full_path, dest) - else: - install_manifest.add_optional_exists(dest) - backend_file.write('%s_FILES += %s\n' % ( - diff --git a/srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch b/srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch deleted file mode 100644 index fdd25c61644..00000000000 --- a/srcpkgs/mozjs60/patches/0009-mips-sgidefs_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/js/src/jsmath.cpp 2019-07-03 02:08:06.000000000 +0200 -+++ b/js/src/jsmath.cpp 2019-11-10 19:04:26.132589059 +0100 -@@ -71,7 +71,7 @@ - #elif defined(__s390__) - #define GETRANDOM_NR 349 - #elif defined(__mips__) --#include -+#include - #if _MIPS_SIM == _MIPS_SIM_ABI32 - #define GETRANDOM_NR 4353 - #elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/srcpkgs/mozjs60/patches/0010-mips-LIR.patch b/srcpkgs/mozjs60/patches/0010-mips-LIR.patch deleted file mode 100644 index 4bdb08ad6e2..00000000000 --- a/srcpkgs/mozjs60/patches/0010-mips-LIR.patch +++ /dev/null @@ -1,511 +0,0 @@ -From: Dragan Mladjenovic -Date: Fri, 9 Mar 2018 07:58:43 +0100 -Subject: Bug 1444303 : [MIPS] Fix build failures after Bug 1425580 part 17 - -From upstream, via firefox-esr 60.2.0esr-1. - -Reviewed-by: jandem -Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1444303 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908486 -Applied-upstream: 61, commit:https://hg.mozilla.org/mozilla-central/rev/7de4ca7b082a ---- - js/src/jit/mips-shared/LIR-mips-shared.h | 88 +++++++++++++++++++++----------- - js/src/jit/mips32/LIR-mips32.h | 26 ++++++++-- - js/src/jit/mips64/LIR-mips64.h | 33 ++++++++---- - 3 files changed, 102 insertions(+), 45 deletions(-) - -Index: mozjs-60.8.0/js/src/jit/mips-shared/LIR-mips-shared.h -=================================================================== ---- mozjs-60.8.0.orig/js/src/jit/mips-shared/LIR-mips-shared.h -+++ mozjs-60.8.0/js/src/jit/mips-shared/LIR-mips-shared.h -@@ -15,7 +15,10 @@ class LWasmUint32ToDouble : public LInst - public: - LIR_HEADER(WasmUint32ToDouble) - -- LWasmUint32ToDouble(const LAllocation& input) { setOperand(0, input); } -+ LWasmUint32ToDouble(const LAllocation& input) -+ : LInstructionHelper(classOpcode) { -+ setOperand(0, input); -+ } - }; - - // Convert a 32-bit unsigned integer to a float32. -@@ -23,15 +26,18 @@ class LWasmUint32ToFloat32 : public LIns - public: - LIR_HEADER(WasmUint32ToFloat32) - -- LWasmUint32ToFloat32(const LAllocation& input) { setOperand(0, input); } -+ LWasmUint32ToFloat32(const LAllocation& input) -+ : LInstructionHelper(classOpcode) { -+ setOperand(0, input); -+ } - }; - - class LDivI : public LBinaryMath<1> { - public: - LIR_HEADER(DivI); - -- LDivI(const LAllocation& lhs, const LAllocation& rhs, -- const LDefinition& temp) { -+ LDivI(const LAllocation& lhs, const LAllocation& rhs, const LDefinition& temp) -+ : LBinaryMath(classOpcode) { - setOperand(0, lhs); - setOperand(1, rhs); - setTemp(0, temp); -@@ -47,15 +53,13 @@ class LDivPowTwoI : public LInstructionH - LIR_HEADER(DivPowTwoI) - - LDivPowTwoI(const LAllocation& lhs, int32_t shift, const LDefinition& temp) -- : shift_(shift) { -+ : LInstructionHelper(classOpcode), shift_(shift) { - setOperand(0, lhs); - setTemp(0, temp); - } - - const LAllocation* numerator() { return getOperand(0); } -- -- int32_t shift() { return shift_; } -- -+ int32_t shift() const { return shift_; } - MDiv* mir() const { return mir_->toDiv(); } - }; - -@@ -64,14 +68,14 @@ class LModI : public LBinaryMath<1> { - LIR_HEADER(ModI); - - LModI(const LAllocation& lhs, const LAllocation& rhs, -- const LDefinition& callTemp) { -+ const LDefinition& callTemp) -+ : LBinaryMath(classOpcode) { - setOperand(0, lhs); - setOperand(1, rhs); - setTemp(0, callTemp); - } - - const LDefinition* callTemp() { return getTemp(0); } -- - MMod* mir() const { return mir_->toMod(); } - }; - -@@ -80,12 +84,13 @@ class LModPowTwoI : public LInstructionH - - public: - LIR_HEADER(ModPowTwoI); -- int32_t shift() { return shift_; } - -- LModPowTwoI(const LAllocation& lhs, int32_t shift) : shift_(shift) { -+ LModPowTwoI(const LAllocation& lhs, int32_t shift) -+ : LInstructionHelper(classOpcode), shift_(shift) { - setOperand(0, lhs); - } - -+ int32_t shift() const { return shift_; } - MMod* mir() const { return mir_->toMod(); } - }; - -@@ -97,14 +102,13 @@ class LModMaskI : public LInstructionHel - - LModMaskI(const LAllocation& lhs, const LDefinition& temp0, - const LDefinition& temp1, int32_t shift) -- : shift_(shift) { -+ : LInstructionHelper(classOpcode), shift_(shift) { - setOperand(0, lhs); - setTemp(0, temp0); - setTemp(1, temp1); - } - - int32_t shift() const { return shift_; } -- - MMod* mir() const { return mir_->toMod(); } - }; - -@@ -114,7 +118,8 @@ class LTableSwitch : public LInstruction - LIR_HEADER(TableSwitch); - - LTableSwitch(const LAllocation& in, const LDefinition& inputCopy, -- const LDefinition& jumpTablePointer, MTableSwitch* ins) { -+ const LDefinition& jumpTablePointer, MTableSwitch* ins) -+ : LInstructionHelper(classOpcode) { - setOperand(0, in); - setTemp(0, inputCopy); - setTemp(1, jumpTablePointer); -@@ -122,7 +127,6 @@ class LTableSwitch : public LInstruction - } - - MTableSwitch* mir() const { return mir_->toTableSwitch(); } -- - const LAllocation* index() { return getOperand(0); } - const LDefinition* tempInt() { return getTemp(0); } - // This is added to share the same CodeGenerator prefixes. -@@ -136,7 +140,8 @@ class LTableSwitchV : public LInstructio - - LTableSwitchV(const LBoxAllocation& input, const LDefinition& inputCopy, - const LDefinition& floatCopy, -- const LDefinition& jumpTablePointer, MTableSwitch* ins) { -+ const LDefinition& jumpTablePointer, MTableSwitch* ins) -+ : LInstructionHelper(classOpcode) { - setBoxOperand(InputValue, input); - setTemp(0, inputCopy); - setTemp(1, floatCopy); -@@ -157,6 +162,8 @@ class LMulI : public LBinaryMath<0> { - public: - LIR_HEADER(MulI); - -+ LMulI() : LBinaryMath(classOpcode) {} -+ - MMul* mir() { return mir_->toMul(); } - }; - -@@ -164,6 +171,8 @@ class LUDivOrMod : public LBinaryMath<0> - public: - LIR_HEADER(UDivOrMod); - -+ LUDivOrMod() : LBinaryMath(classOpcode) {} -+ - MBinaryArithInstruction* mir() const { - MOZ_ASSERT(mir_->isDiv() || mir_->isMod()); - return static_cast(mir_); -@@ -194,12 +203,13 @@ class LWasmUnalignedLoadBase : public de - public: - typedef LWasmLoadBase Base; - -- explicit LWasmUnalignedLoadBase(const LAllocation& ptr, -+ explicit LWasmUnalignedLoadBase(LNode::Opcode opcode, const LAllocation& ptr, - const LDefinition& valueHelper) -- : Base(ptr, LAllocation()) { -+ : Base(opcode, ptr, LAllocation()) { - Base::setTemp(0, LDefinition::BogusTemp()); - Base::setTemp(1, valueHelper); - } -+ - const LAllocation* ptr() { return Base::getOperand(0); } - const LDefinition* ptrCopy() { return Base::getTemp(0); } - }; -@@ -208,19 +218,21 @@ class LWasmUnalignedLoadBase : public de - - class LWasmUnalignedLoad : public details::LWasmUnalignedLoadBase<1> { - public: -+ LIR_HEADER(WasmUnalignedLoad); -+ - explicit LWasmUnalignedLoad(const LAllocation& ptr, - const LDefinition& valueHelper) -- : LWasmUnalignedLoadBase(ptr, valueHelper) {} -- LIR_HEADER(WasmUnalignedLoad); -+ : LWasmUnalignedLoadBase(classOpcode, ptr, valueHelper) {} - }; - - class LWasmUnalignedLoadI64 - : public details::LWasmUnalignedLoadBase { - public: -+ LIR_HEADER(WasmUnalignedLoadI64); -+ - explicit LWasmUnalignedLoadI64(const LAllocation& ptr, - const LDefinition& valueHelper) -- : LWasmUnalignedLoadBase(ptr, valueHelper) {} -- LIR_HEADER(WasmUnalignedLoadI64); -+ : LWasmUnalignedLoadBase(classOpcode, ptr, valueHelper) {} - }; - - namespace details { -@@ -234,12 +246,14 @@ class LWasmUnalignedStoreBase : public L - static const size_t PtrIndex = 0; - static const size_t ValueIndex = 1; - -- LWasmUnalignedStoreBase(const LAllocation& ptr, -- const LDefinition& valueHelper) { -+ LWasmUnalignedStoreBase(LNode::Opcode opcode, const LAllocation& ptr, -+ const LDefinition& valueHelper) -+ : Base(opcode) { - Base::setOperand(0, ptr); - Base::setTemp(0, LDefinition::BogusTemp()); - Base::setTemp(1, valueHelper); - } -+ - MWasmStore* mir() const { return Base::mir_->toWasmStore(); } - const LAllocation* ptr() { return Base::getOperand(PtrIndex); } - const LDefinition* ptrCopy() { return Base::getTemp(0); } -@@ -250,11 +264,13 @@ class LWasmUnalignedStoreBase : public L - class LWasmUnalignedStore : public details::LWasmUnalignedStoreBase<2> { - public: - LIR_HEADER(WasmUnalignedStore); -+ - LWasmUnalignedStore(const LAllocation& ptr, const LAllocation& value, - const LDefinition& valueHelper) -- : LWasmUnalignedStoreBase(ptr, valueHelper) { -+ : LWasmUnalignedStoreBase(classOpcode, ptr, valueHelper) { - setOperand(1, value); - } -+ - const LAllocation* value() { return Base::getOperand(ValueIndex); } - }; - -@@ -264,9 +280,10 @@ class LWasmUnalignedStoreI64 - LIR_HEADER(WasmUnalignedStoreI64); - LWasmUnalignedStoreI64(const LAllocation& ptr, const LInt64Allocation& value, - const LDefinition& valueHelper) -- : LWasmUnalignedStoreBase(ptr, valueHelper) { -+ : LWasmUnalignedStoreBase(classOpcode, ptr, valueHelper) { - setInt64Operand(1, value); - } -+ - const LInt64Allocation value() { return getInt64Operand(ValueIndex); } - }; - -@@ -278,7 +295,8 @@ class LWasmCompareExchangeI64 - - LWasmCompareExchangeI64(const LAllocation& ptr, - const LInt64Allocation& oldValue, -- const LInt64Allocation& newValue) { -+ const LInt64Allocation& newValue) -+ : LInstructionHelper(classOpcode) { - setOperand(0, ptr); - setInt64Operand(1, oldValue); - setInt64Operand(1 + INT64_PIECES, newValue); -@@ -299,8 +317,8 @@ class LWasmAtomicExchangeI64 - public: - LIR_HEADER(WasmAtomicExchangeI64); - -- LWasmAtomicExchangeI64(const LAllocation& ptr, -- const LInt64Allocation& value) { -+ LWasmAtomicExchangeI64(const LAllocation& ptr, const LInt64Allocation& value) -+ : LInstructionHelper(classOpcode) { - setOperand(0, ptr); - setInt64Operand(1, value); - } -@@ -317,14 +335,14 @@ class LWasmAtomicBinopI64 - public: - LIR_HEADER(WasmAtomicBinopI64); - -- LWasmAtomicBinopI64(const LAllocation& ptr, const LInt64Allocation& value) { -+ LWasmAtomicBinopI64(const LAllocation& ptr, const LInt64Allocation& value) -+ : LInstructionHelper(classOpcode) { - setOperand(0, ptr); - setInt64Operand(1, value); - } - - const LAllocation* ptr() { return getOperand(0); } - const LInt64Allocation value() { return getInt64Operand(1); } -- - const MWasmAtomicBinopHeap* mir() const { - return mir_->toWasmAtomicBinopHeap(); - } -Index: mozjs-60.8.0/js/src/jit/mips32/LIR-mips32.h -=================================================================== ---- mozjs-60.8.0.orig/js/src/jit/mips32/LIR-mips32.h -+++ mozjs-60.8.0/js/src/jit/mips32/LIR-mips32.h -@@ -18,7 +18,7 @@ class LBoxFloatingPoint : public LInstru - - LBoxFloatingPoint(const LAllocation& in, const LDefinition& temp, - MIRType type) -- : type_(type) { -+ : LInstructionHelper(classOpcode), type_(type) { - setOperand(0, in); - setTemp(0, temp); - } -@@ -31,6 +31,8 @@ class LUnbox : public LInstructionHelper - public: - LIR_HEADER(Unbox); - -+ LUnbox() : LInstructionHelper(classOpcode) {} -+ - MUnbox* mir() const { return mir_->toUnbox(); } - const LAllocation* payload() { return getOperand(0); } - const LAllocation* type() { return getOperand(1); } -@@ -45,12 +47,12 @@ class LUnboxFloatingPoint : public LInst - - static const size_t Input = 0; - -- LUnboxFloatingPoint(const LBoxAllocation& input, MIRType type) : type_(type) { -+ LUnboxFloatingPoint(const LBoxAllocation& input, MIRType type) -+ : LInstructionHelper(classOpcode), type_(type) { - setBoxOperand(Input, input); - } - - MUnbox* mir() const { return mir_->toUnbox(); } -- - MIRType type() const { return type_; } - const char* extraName() const { return StringFromMIRType(type_); } - }; -@@ -63,14 +65,17 @@ class LDivOrModI64 - static const size_t Lhs = 0; - static const size_t Rhs = INT64_PIECES; - -- LDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs) { -+ LDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs) -+ : LCallInstructionHelper(classOpcode) { - setInt64Operand(Lhs, lhs); - setInt64Operand(Rhs, rhs); - } -+ - MBinaryArithInstruction* mir() const { - MOZ_ASSERT(mir_->isDiv() || mir_->isMod()); - return static_cast(mir_); - } -+ - bool canBeDivideByZero() const { - if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero(); - return mir_->toDiv()->canBeDivideByZero(); -@@ -94,7 +99,8 @@ class LUDivOrModI64 - static const size_t Lhs = 0; - static const size_t Rhs = INT64_PIECES; - -- LUDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs) { -+ LUDivOrModI64(const LInt64Allocation& lhs, const LInt64Allocation& rhs) -+ : LCallInstructionHelper(classOpcode) { - setInt64Operand(Lhs, lhs); - setInt64Operand(Rhs, rhs); - } -@@ -102,6 +108,7 @@ class LUDivOrModI64 - MOZ_ASSERT(mir_->isDiv() || mir_->isMod()); - return static_cast(mir_); - } -+ - bool canBeDivideByZero() const { - if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero(); - return mir_->toDiv()->canBeDivideByZero(); -@@ -121,7 +128,10 @@ class LWasmTruncateToInt64 : public LCal - public: - LIR_HEADER(WasmTruncateToInt64); - -- explicit LWasmTruncateToInt64(const LAllocation& in) { setOperand(0, in); } -+ explicit LWasmTruncateToInt64(const LAllocation& in) -+ : LCallInstructionHelper(classOpcode) { -+ setOperand(0, in); -+ } - - MWasmTruncateToInt64* mir() const { return mir_->toWasmTruncateToInt64(); } - }; -@@ -131,7 +141,8 @@ class LInt64ToFloatingPoint - public: - LIR_HEADER(Int64ToFloatingPoint); - -- explicit LInt64ToFloatingPoint(const LInt64Allocation& in) { -+ explicit LInt64ToFloatingPoint(const LInt64Allocation& in) -+ : LCallInstructionHelper(classOpcode) { - setInt64Operand(0, in); - } - -@@ -142,7 +153,9 @@ class LWasmAtomicLoadI64 : public LInstr - public: - LIR_HEADER(WasmAtomicLoadI64); - -- LWasmAtomicLoadI64(const LAllocation& ptr) { setOperand(0, ptr); } -+ LWasmAtomicLoadI64(const LAllocation& ptr) : LInstructionHelper(classOpcode) { -+ setOperand(0, ptr); -+ } - - const LAllocation* ptr() { return getOperand(0); } - const MWasmLoad* mir() const { return mir_->toWasmLoad(); } -@@ -153,7 +166,8 @@ class LWasmAtomicStoreI64 : public LInst - LIR_HEADER(WasmAtomicStoreI64); - - LWasmAtomicStoreI64(const LAllocation& ptr, const LInt64Allocation& value, -- const LDefinition& tmp) { -+ const LDefinition& tmp) -+ : LInstructionHelper(classOpcode) { - setOperand(0, ptr); - setInt64Operand(1, value); - setTemp(0, tmp); -Index: mozjs-60.8.0/js/src/jit/mips64/LIR-mips64.h -=================================================================== ---- mozjs-60.8.0.orig/js/src/jit/mips64/LIR-mips64.h -+++ mozjs-60.8.0/js/src/jit/mips64/LIR-mips64.h -@@ -11,10 +11,18 @@ namespace js { - namespace jit { - - class LUnbox : public LInstructionHelper<1, 1, 0> { -+ protected: -+ LUnbox(LNode::Opcode opcode, const LAllocation& input) -+ : LInstructionHelper(opcode) { -+ setOperand(0, input); -+ } -+ - public: - LIR_HEADER(Unbox); - -- explicit LUnbox(const LAllocation& input) { setOperand(0, input); } -+ explicit LUnbox(const LAllocation& input) : LInstructionHelper(classOpcode) { -+ setOperand(0, input); -+ } - - static const size_t Input = 0; - -@@ -29,7 +37,7 @@ class LUnboxFloatingPoint : public LUnbo - LIR_HEADER(UnboxFloatingPoint); - - LUnboxFloatingPoint(const LAllocation& input, MIRType type) -- : LUnbox(input), type_(type) {} -+ : LUnbox(classOpcode, input), type_(type) {} - - MIRType type() const { return type_; } - }; -@@ -39,18 +47,19 @@ class LDivOrModI64 : public LBinaryMath< - LIR_HEADER(DivOrModI64) - - LDivOrModI64(const LAllocation& lhs, const LAllocation& rhs, -- const LDefinition& temp) { -+ const LDefinition& temp) -+ : LBinaryMath(classOpcode) { - setOperand(0, lhs); - setOperand(1, rhs); - setTemp(0, temp); - } - - const LDefinition* remainder() { return getTemp(0); } -- - MBinaryArithInstruction* mir() const { - MOZ_ASSERT(mir_->isDiv() || mir_->isMod()); - return static_cast(mir_); - } -+ - bool canBeDivideByZero() const { - if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero(); - return mir_->toDiv()->canBeDivideByZero(); -@@ -71,14 +80,14 @@ class LUDivOrModI64 : public LBinaryMath - LIR_HEADER(UDivOrModI64); - - LUDivOrModI64(const LAllocation& lhs, const LAllocation& rhs, -- const LDefinition& temp) { -+ const LDefinition& temp) -+ : LBinaryMath(classOpcode) { - setOperand(0, lhs); - setOperand(1, rhs); - setTemp(0, temp); - } - - const LDefinition* remainder() { return getTemp(0); } -- - const char* extraName() const { - return mir()->isTruncated() ? "Truncated" : nullptr; - } -@@ -87,7 +96,6 @@ class LUDivOrModI64 : public LBinaryMath - MOZ_ASSERT(mir_->isDiv() || mir_->isMod()); - return static_cast(mir_); - } -- - bool canBeDivideByZero() const { - if (mir_->isMod()) return mir_->toMod()->canBeDivideByZero(); - return mir_->toDiv()->canBeDivideByZero(); -@@ -103,7 +111,10 @@ class LWasmTruncateToInt64 : public LIns - public: - LIR_HEADER(WasmTruncateToInt64); - -- explicit LWasmTruncateToInt64(const LAllocation& in) { setOperand(0, in); } -+ explicit LWasmTruncateToInt64(const LAllocation& in) -+ : LInstructionHelper(classOpcode) { -+ setOperand(0, in); -+ } - - MWasmTruncateToInt64* mir() const { return mir_->toWasmTruncateToInt64(); } - }; -@@ -112,7 +123,8 @@ class LInt64ToFloatingPoint : public LIn - public: - LIR_HEADER(Int64ToFloatingPoint); - -- explicit LInt64ToFloatingPoint(const LInt64Allocation& in) { -+ explicit LInt64ToFloatingPoint(const LInt64Allocation& in) -+ : LInstructionHelper(classOpcode) { - setInt64Operand(0, in); - } - - diff --git a/srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch b/srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch deleted file mode 100644 index 990eba6f793..00000000000 --- a/srcpkgs/mozjs60/patches/0011-mips-macroassembler.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Dragan Mladjenovic -Date: Mon, 12 Mar 2018 10:31:24 +0100 -Subject: Bug 1444834 : [MIPS] Stubout MacroAssembler::speculationBarrier - -From upstream, via firefox-esr 60.2.0esr-1. - -Reviewed-by: jandem -Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1444834 -Applied-upstream: 61, commit:https://hg.mozilla.org/mozilla-central/rev/739c536d2cd6 ---- - js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: mozjs-60.8.0/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp -=================================================================== ---- mozjs-60.8.0.orig/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp -+++ mozjs-60.8.0/js/src/jit/mips-shared/MacroAssembler-mips-shared.cpp -@@ -2687,4 +2687,8 @@ void MacroAssembler::atomicEffectOpJS(Sc - maskTemp); - } - -+// ======================================================================== -+// Spectre Mitigations. -+ -+void MacroAssembler::speculationBarrier() { MOZ_CRASH(); } - //}}} check_macroassembler_style - diff --git a/srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch b/srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch deleted file mode 100644 index 5c0b45a5ea5..00000000000 --- a/srcpkgs/mozjs60/patches/0012-mozjs60.pc-honor-sysroot.patch +++ /dev/null @@ -1,13 +0,0 @@ - js/src/build/js.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/src/build/js.pc.in b/js/src/build/js.pc.in -index 2eae393..0a6fd5c 100644 ---- a/js/src/build/js.pc.in -+++ b/js/src/build/js.pc.in -@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript - Version: @MOZILLA_VERSION@ - @PKGCONF_REQUIRES_PRIVATE@ - Libs: -L${libdir} -l@JS_LIBRARY_NAME@ --Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ -+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template deleted file mode 100644 index d2366ac11d6..00000000000 --- a/srcpkgs/mozjs60/template +++ /dev/null @@ -1,69 +0,0 @@ -# Template file for 'mozjs60' -pkgname=mozjs60 -version=60.8.0 -revision=5 -wrksrc="firefox-${version}" -build_wrksrc=js/src -build_style=gnu-configure -hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive - which" -makedepends="icu-devel libffi-devel nspr-devel python-devel readline-devel zlib-devel" -depends="nspr>=4.19" -short_desc="Mozilla JavaScript interpreter and library (60.x series)" -maintainer="Enno Boland " -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=c13387d944e635aebd5f1d2ce9ab77cb706a74043a240cbb7b70654519487fbe -patch_args="-Np1" -CXXFLAGS="-Wno-class-memaccess" -LDFLAGS+=" -Wl,-z,stack-size=1048576" - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" - LDFLAGS+=" -latomic" -fi - -do_configure() { - local _args - - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="-Os" - export HOST_CXXFLAGS="-Os" - _args+=" --target=$XBPS_CROSS_TRIPLET --enable-linker=bfd" - fi - - autoconf-2.13 old-configure.in > old-configure - - touch ${wrksrc}/js/src/configure - touch ${wrksrc}/js/src/old-configure - SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --disable-jemalloc --disable-optimize --enable-ctypes --enable-pie \ - --enable-readline --enable-shared-js --enable-system-ffi \ - --enable-tests --with-intl-api --with-system-icu \ - --with-system-nspr --with-system-zlib --target=${XBPS_TRIPLET} \ - --host=${XBPS_TRIPLET} \ - ${_args} -} - -do_check() { - dist/bin/jsapi-tests -} - -post_install() { - # Fix the '-include' directive, otherwise it tries to use the hosts' header - vsed 's|^Cflags:.*|Cflags: -include ${pc_sysrootdir}/${includedir}/mozjs-60/js/RequiredDefines.h -I${includedir}/mozjs-60|' \ - -i ${DESTDIR}/usr/lib/pkgconfig/mozjs-60.pc -} - -mozjs60-devel_package() { - depends="nspr-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/js60-config - vmove usr/include - vmove "usr/lib/*.so" - vmove "usr/lib/*.ajs" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/mozjs60/update b/srcpkgs/mozjs60/update deleted file mode 100644 index 1947e19217f..00000000000 --- a/srcpkgs/mozjs60/update +++ /dev/null @@ -1 +0,0 @@ -pkgname='mozjs' diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 9286101886a..75799c7b375 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -53,6 +53,7 @@ replaces=" mirrorbits<=0.5.1_1 mongroup<=0.4.1_2 mozjs52<=52.9.0_7 + mozjs60<=60.8.0_5 phonon-backend-gstreamer<=4.9.0_2 phonon-backend-vlc<=0.9.1_3 polkit-qt<=0.112.0_5