diff options
author | Maxim Cournoyer <[email protected]> | 2022-05-13 14:03:41 -0400 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2022-05-31 14:54:10 -0400 |
commit | 5e25a69e6e3733ad8845d1b187940877deba7750 (patch) | |
tree | aa0aae964a6f9348ca0500a8cb33e4f45c241863 /gnu/packages/patches/mozjs17-aarch64-support.patch | |
parent | 425783b5dcec38842718829c9fe56741bbcfc567 (diff) |
gnu: mozjs: Cleanup to only keep the last version.
* gnu/packages/gnuzilla.scm (mozjs): Preserve only the metadata and otherwise
update fields to use those of mozjs-78.
[arguments]: Use gexps.
[phases]: Delete trailing #t.
[native-inputs]: Use new style.
(mozjs-38, mozjs-52, mozjs-60, mozjs-78): Delete variables.
* gnu/packages/patches/mozjs17-aarch64-support.patch
* gnu/packages/patches/mozjs24-aarch64-support.patch
* gnu/packages/patches/mozjs38-pkg-config-version.patch
* gnu/packages/patches/mozjs38-shell-version.patch
* gnu/packages/patches/mozjs38-tracelogger.patch
* gnu/packages/patches/mozjs38-version-detection.patch
* gnu/packages/patches/mozjs60-riscv64-support.patch: Delete patches.
* gnu/local.mk (dist_patch_DATA): De-register them.
* gnu/packages/games.scm (0ad): Adjust accordingly.
* gnu/packages/gnome.scm (gjs): Likewise.
* gnu/packages/polkit.scm (polkit-mozjs): Likewise.
Diffstat (limited to 'gnu/packages/patches/mozjs17-aarch64-support.patch')
-rw-r--r-- | gnu/packages/patches/mozjs17-aarch64-support.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/gnu/packages/patches/mozjs17-aarch64-support.patch b/gnu/packages/patches/mozjs17-aarch64-support.patch deleted file mode 100644 index 51e2e306d5..0000000000 --- a/gnu/packages/patches/mozjs17-aarch64-support.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://build.opensuse.org/package/view_file/openSUSE:Factory/mozjs17/mozjs-aarch64-support.patch - -index c071c33..90764c3 100644 ---- a/js/src/assembler/jit/ExecutableAllocator.h -+++ b/js/src/assembler/jit/ExecutableAllocator.h -@@ -382,6 +382,12 @@ public: - { - reprotectRegion(start, size, Executable); - } -+#elif WTF_CPU_AARCH64 && WTF_PLATFORM_LINUX -+ static void cacheFlush(void* code, size_t size) -+ { -+ intptr_t end = reinterpret_cast<intptr_t>(code) + size; -+ __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end)); -+ } - #else - static void makeWritable(void*, size_t) {} - static void makeExecutable(void*, size_t) {} -diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h -index 0c84896..e8763a7 100644 ---- a/js/src/assembler/wtf/Platform.h -+++ b/js/src/assembler/wtf/Platform.h -@@ -325,6 +325,10 @@ - #define WTF_THUMB_ARCH_VERSION 0 - #endif - -+/* CPU(AArch64) - 64-bit ARM */ -+#if defined(__aarch64__) -+#define WTF_CPU_AARCH64 1 -+#endif - - /* WTF_CPU_ARMV5_OR_LOWER - ARM instruction set v5 or earlier */ - /* On ARMv5 and below the natural alignment is required. -diff --git a/js/src/configure.in b/js/src/configure.in -index 15605b2..19fd704 100644 ---- a/js/src/configure.in -+++ b/js/src/configure.in -@@ -1121,6 +1121,10 @@ arm*) - CPU_ARCH=arm - ;; - -+aarch64) -+ CPU_ARCH=aarch64 -+ ;; -+ - mips|mipsel) - CPU_ARCH="mips" - ;; -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h -index 0eec2d9..fe26dab 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h -@@ -58,6 +58,7 @@ - defined(__mips__) || defined(__powerpc__) || \ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ -+ defined(__aarch64__) || \ - defined(_MIPS_ARCH_MIPS32R2) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) |