dev-lang/spidermonkey: drop 60.5.2_p0-r6

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-11-24 03:08:13 +00:00
parent 59aefbdbc1
commit 2cd007df03
4 changed files with 0 additions and 263 deletions
-2
View File
@@ -8,9 +8,7 @@ DIST firefox-78esr-patches-19.tar.xz 88424 BLAKE2B fdc7bf8f28b3e799551a70f1cec7a
DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a67bd63e958987e3147279af5f98ee9318fe91f42823bbc9afb0308638e42de789451b04ea895320a8c674cc221e0d4b0b1d80f38 SHA512 bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96
DIST firefox-91.13.0esr.source.tar.xz 380053584 BLAKE2B 75d0daa512b3a2d41974a0169778be9ef19a100de2bd382add9831860ca93976585a41e760b6a7ec753268fb78f9f61049780fa7961834248bc8157cfdcc2827 SHA512 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
DIST spidermonkey-102-patches-04j.tar.xz 3996 BLAKE2B 468697521adacc5d647b04f2228fc4c1a8131bc2523142f2d57f32e321303581ae8f793baae48966ecb27f48bf77eb084f7b2df1c1a0c667e9ed59ae93d786e6 SHA512 201bb779e2373cc00dfadc29a62b593030dfc12eec076114b92927f29f476d3fafdd056112dd1bb1f19f82827f4fe1252141e3998bec719e4196737a316d4ef2
DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
DIST spidermonkey-91-patches-04j.tar.xz 4624 BLAKE2B d9cf47b39a165e8434d4f2f20ae3a9734c1bb81c32ddb75360e5edfa6817d6343be89aff0f8ec381485772cad80b00a069789decbc462129161afc3d4acfcb53 SHA512 bd574fee600cb4c6a262893b7d992d85c4059d512b829cd2f226aff86d8a6a83c2bdab466704e22f64bf6d29f90901037a34f9e90a42251952ba1cdbc0cab968
@@ -1,59 +0,0 @@
From 8099213b51180254b322332ecd573239da4212c4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Thu, 23 Jan 2020 22:57:53 +0000
Subject: [PATCH] ProcessExecutableMemory.cpp: fix virtual address length on
ia64
ia64's usable virtual address space is page dependent. For 16K
pages with 3 levels of page tables de can address only 44 bits
of virtual memory, not default 47.
The change makes page size detection dynamic and adapts to
addressable bits. On ia64 it is '4 * log2(page_size/8)'.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
js/src/jit/ProcessExecutableMemory.cpp | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/js/src/jit/ProcessExecutableMemory.cpp b/js/src/jit/ProcessExecutableMemory.cpp
index 9e55c262..8581c150 100644
--- a/js/src/jit/ProcessExecutableMemory.cpp
+++ b/js/src/jit/ProcessExecutableMemory.cpp
@@ -248,7 +248,32 @@ static void* ComputeRandomAllocationAddress() {
// x64 CPUs have a 48-bit address space and on some platforms the OS will
// give us access to 47 bits, so to be safe we right shift by 18 to leave
// 46 bits.
+# ifdef __ia64__
+ // On ia64 virtual address space looks like one of:
+ // virt_addr_64 = [ <63..61> | <unimplemented> | L3 | L2 | L1 | offset ]
+ // virt_addr_64 = [ <63..61> | <unimplemented> | L4 | L3 | L2 | L1 | offset ]
+ // where L{1..L4} are page tables. Each page table (except top-level L3 or L4)
+ // is itself a page-size entry and can store PageSize / 8 entries. Top-level
+ // entry is 1/8 of of L1/L2 (as 3 upper bits are part of <63..61> address part).
+ // Note: that makes addressable size directly depend on page size.
+ //
+ // We conservatively assume 3 levels of page tables here. This makes the
+ // following formula:
+ // L3 = log2(PAGE / 8 / 8) = log2(PAGE / 8) - 3
+ // L2 = log2(PAGE / 8)
+ // L1 = log2(PAGE / 8)
+ // offset = log2(PAGE) = log2(PAGE / 8) + 3
+ // thus
+ // L3 + L2 + L1 + offset = 4 * log2(PAGE / 8)
+ // For more details see http://www.ia64-linux.org/doc/IA64linuxkernel.PDF
+ // (slide 19: "user regions").
+ static uint64_t ia64_virt_bits = std::min<uint64_t>(
+ 4 * (mozilla::FloorLog2(gc::SystemPageSize() / 8)),
+ 46);
+ rand >>= (64 - ia64_virt_bits);
+# else
rand >>= 18;
+# endif
#else
// On 32-bit, right shift by 34 to leave 30 bits, range [0, 1GiB). Then add
// 512MiB to get range [512MiB, 1.5GiB), or [0x20000000, 0x60000000). This
--
2.25.0
@@ -1,44 +0,0 @@
From 35d787c782a075c0a01e29605d254950fd1e81a6 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Thu, 25 Jul 2019 10:17:39 -0500
Subject: [PATCH] Add support for ia64 atomic-ops
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
---
js/src/jit/AtomicOperations.h | 2 ++
js/src/jit/none/AtomicOperations-feeling-lucky.h | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h
index 3501e65b..44c3f358 100644
--- a/js/src/jit/AtomicOperations.h
+++ b/js/src/jit/AtomicOperations.h
@@ -393,6 +393,8 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) {
#include "jit/none/AtomicOperations-feeling-lucky.h"
#elif defined(__s390__) || defined(__s390x__)
#include "jit/none/AtomicOperations-feeling-lucky.h"
+#elif defined(__ia64__)
+#include "jit/none/AtomicOperations-feeling-lucky.h"
#else
#error "No AtomicOperations support provided for this platform"
#endif
diff --git a/js/src/jit/none/AtomicOperations-feeling-lucky.h b/js/src/jit/none/AtomicOperations-feeling-lucky.h
index c0b43699..a3f4497e 100644
--- a/js/src/jit/none/AtomicOperations-feeling-lucky.h
+++ b/js/src/jit/none/AtomicOperations-feeling-lucky.h
@@ -80,6 +80,12 @@
#define GNUC_COMPATIBLE
#endif
+#ifdef __ia64__
+#define HAS_64BIT_ATOMICS
+#define HAS_64BIT_LOCKFREE
+#define GNUC_COMPATIBLE
+#endif
+
// The default implementation tactic for gcc/clang is to use the newer
// __atomic intrinsics added for use in C++11 <atomic>. Where that
// isn't available, we use GCC's older __sync functions instead.
--
2.22.0
@@ -1,158 +0,0 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
WANT_AUTOCONF="2.1"
inherit autotools check-reqs toolchain-funcs pax-utils mozcoreconf-v5 flag-o-matic
MY_PN="mozjs"
MY_P="${MY_PN}-${PV/_rc/.rc}"
MY_P="${MY_P/_pre/pre}"
MY_P="${MY_P%_p[0-9]*}"
DESCRIPTION="Stand-alone JavaScript C++ library"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
#SRC_URI="https://archive.mozilla.org/pub/spidermonkey/prereleases/60/pre3/${MY_P}.tar.bz2
SRC_URI="https://dev.gentoo.org/~axs/distfiles/${MY_P}.tar.bz2
https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PN}-60.0-patches-04.tar.xz"
LICENSE="NPL-1.1"
SLOT="60"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="debug +jit minimal +system-icu test"
# Disable tests:
# Version is dead and most issues are related to the use of
# system's ICU.
RESTRICT="test"
S="${WORKDIR}/${MY_P%.rc*}"
BUILDDIR="${S}/jsobj"
RDEPEND=">=dev-libs/nspr-4.13.1
dev-libs/libffi:=
sys-libs/readline:0=
>=sys-libs/zlib-1.2.3:=
system-icu? ( >=dev-libs/icu-59.1:= )"
DEPEND="${RDEPEND}"
pkg_pretend() {
CHECKREQS_DISK_BUILD="2G"
check-reqs_pkg_setup
}
pkg_setup() {
[[ ${MERGE_TYPE} == "binary" ]] || \
moz_pkgsetup
export SHELL="${EPREFIX}/bin/bash"
}
src_prepare() {
eapply "${WORKDIR}/${PN}"
eapply "${FILESDIR}/${PN}-60.5.2-ia64-support.patch"
eapply "${FILESDIR}/${PN}-60.5.2-ia64-fix-virtual-address-length.patch"
eapply_user
append-atomic-flags # bug 688574
cd "${S}/js/src" || die
eautoconf old-configure.in
eautoconf
# remove options that are not correct from js-config
sed '/lib-filenames/d' -i "${S}"/js/src/build/js-config.in || die "failed to remove invalid option from js-config"
# there is a default config.cache that messes everything up
rm -f "${S}/js/src"/config.cache || die
mkdir -p "${BUILDDIR}" || die
}
src_configure() {
cd "${BUILDDIR}" || die
tc-export AR RANLIB
ECONF_SOURCE="${S}/js/src" \
econf \
--disable-jemalloc \
--enable-readline \
--with-system-nspr \
--with-system-zlib \
--disable-optimize \
--with-intl-api \
--with-toolchain-prefix="${CHOST}-" \
$(use_with system-icu) \
$(use_enable debug) \
$(use_enable jit ion) \
$(use_enable test tests) \
XARGS="/usr/bin/xargs" \
CONFIG_SHELL="${EPREFIX}/bin/bash" \
CC="${CC}" CXX="${CXX}" LD="${LD}" AR="${AR}" RANLIB="${RANLIB}"
}
cross_make() {
emake \
CFLAGS="${BUILD_CFLAGS}" \
CXXFLAGS="${BUILD_CXXFLAGS}" \
AR="${BUILD_AR}" \
CC="${BUILD_CC}" \
CXX="${BUILD_CXX}" \
RANLIB="${BUILD_RANLIB}" \
"$@"
}
src_compile() {
cd "${BUILDDIR}" || die
if tc-is-cross-compiler; then
tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
cross_make \
MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
MOZ_PGO_OPTIMIZE_FLAGS="" \
host_jsoplengen host_jskwgen
cross_make \
MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" HOST_OPTIMIZE_FLAGS="" \
-C config nsinstall
mv {,native-}host_jskwgen || die
mv {,native-}host_jsoplengen || die
mv config/{,native-}nsinstall || die
sed -i \
-e 's@./host_jskwgen@./native-host_jskwgen@' \
-e 's@./host_jsoplengen@./native-host_jsoplengen@' \
Makefile || die
sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
rm -f config/host_nsinstall.o \
config/host_pathsub.o \
host_jskwgen.o \
host_jsoplengen.o || die
fi
MOZ_MAKE_FLAGS="${MAKEOPTS}" \
emake \
MOZ_OPTIMIZE_FLAGS="" MOZ_DEBUG_FLAGS="" \
HOST_OPTIMIZE_FLAGS="" MODULE_OPTIMIZE_FLAGS="" \
MOZ_PGO_OPTIMIZE_FLAGS=""
}
src_test() {
cd "${BUILDDIR}/js/src/jsapi-tests" || die
./jsapi-tests || die
}
src_install() {
cd "${BUILDDIR}" || die
emake DESTDIR="${D}" install
if ! use minimal; then
if use jit; then
pax-mark m "${ED}"usr/bin/js${SLOT}
fi
else
rm -f "${ED}"usr/bin/js${SLOT}
fi
# We can't actually disable building of static libraries
# They're used by the tests and in a few other places
find "${D}" -iname '*.a' -o -iname '*.ajs' -delete || die
}