diff options
Diffstat (limited to 'bsp/meta-synopsys/recipes-extended')
| -rw-r--r-- | bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-Add-ARC-CPU-support.patch | 48 | ||||
| -rw-r--r-- | bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-arc-Disable-atomic-operations.patch | 42 | ||||
| -rw-r--r-- | bsp/meta-synopsys/recipes-extended/mozjs/mozjs_60.9.0.bbappend (renamed from bsp/meta-synopsys/recipes-extended/mozjs/mozjs_52.9.1.bbappend) | 1 |
3 files changed, 67 insertions, 24 deletions
diff --git a/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-Add-ARC-CPU-support.patch b/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-Add-ARC-CPU-support.patch index e0ccee2a..5d90d4bd 100644 --- a/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-Add-ARC-CPU-support.patch +++ b/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-Add-ARC-CPU-support.patch @@ -1,18 +1,18 @@ -From e1a1c4b3daa5fdddae579405f32989156ff9db92 Mon Sep 17 00:00:00 2001 +From 9171149440fcb1e8c3459372716577cd81e62734 Mon Sep 17 00:00:00 2001 From: Evgeniy Didin <Evgeniy.Didin@synopsys.com> -Date: Tue, 26 Mar 2019 10:24:17 +0300 -Subject: [PATCH] Add ARC support +Date: Thu, 2 Apr 2020 20:33:21 +0300 +Subject: [PATCH] mozjs: Introduce ARC support Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> --- - build/autoconf/config.guess | 3 +++ - build/moz.configure/init.configure | 3 +++ - mfbt/double-conversion/utils.h | 2 +- - python/mozbuild/mozbuild/configure/constants.py | 2 ++ + build/autoconf/config.guess | 3 +++ + build/moz.configure/init.configure | 3 +++ + mfbt/double-conversion/double-conversion/utils.h | 2 +- + python/mozbuild/mozbuild/configure/constants.py | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess -index 1277a862..e3c40ec7 100755 +index 1277a86..e3c40ec 100755 --- a/build/autoconf/config.guess +++ b/build/autoconf/config.guess @@ -1032,6 +1032,9 @@ EOF @@ -26,45 +26,45 @@ index 1277a862..e3c40ec7 100755 echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 56e6730f..85a944c9 100644 +index 648ac2d..7618f08 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -365,6 +365,9 @@ def split_triplet(triplet): +@@ -661,6 +661,9 @@ def split_triplet(triplet, allow_unknown=False): elif cpu in ('riscv32', 'riscv64'): canonical_cpu = cpu endianness = 'little' + elif cpu in ('arc'): + canonical_cpu = 'arc' + endianness = 'little' - else: - die('Unknown CPU type: %s' % cpu) - -diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h -index 4f372180..c0680791 100644 ---- a/mfbt/double-conversion/utils.h -+++ b/mfbt/double-conversion/utils.h -@@ -61,7 +61,7 @@ + elif allow_unknown: + canonical_cpu = cpu + endianness = 'unknown' +diff --git a/mfbt/double-conversion/double-conversion/utils.h b/mfbt/double-conversion/double-conversion/utils.h +index 5f17c04..f4ff736 100644 +--- a/mfbt/double-conversion/double-conversion/utils.h ++++ b/mfbt/double-conversion/double-conversion/utils.h +@@ -77,7 +77,7 @@ inline void abort_noreturn() { MOZ_CRASH(); } defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) || \ defined(__AARCH64EL__) || defined(__aarch64__) || \ - defined(__riscv) + defined(__riscv) || defined(__arc__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) + #elif defined(__mc68000__) + #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index 4f8d6666..3cef1f50 100644 +index 1067b6a..1f700b8 100644 --- a/python/mozbuild/mozbuild/configure/constants.py +++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -50,6 +50,7 @@ CPU_bitness = { +@@ -52,6 +52,7 @@ CPU_bitness = { 'ppc64': 64, 'riscv32': 32, 'riscv64': 64, + 'arc': 32, 's390': 32, 's390x': 64, - 'sparc': 32, -@@ -83,6 +84,7 @@ CPU_preprocessor_checks = OrderedDict(( + 'sh4': 32, +@@ -86,6 +87,7 @@ CPU_preprocessor_checks = OrderedDict(( ('ppc', '__powerpc__'), ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), diff --git a/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-arc-Disable-atomic-operations.patch b/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-arc-Disable-atomic-operations.patch new file mode 100644 index 00000000..b609889a --- /dev/null +++ b/bsp/meta-synopsys/recipes-extended/mozjs/mozjs/0001-arc-Disable-atomic-operations.patch @@ -0,0 +1,42 @@ +From d8881cbf62d8bb5bc2acc57a5cf976138446c2bc Mon Sep 17 00:00:00 2001 +From: Evgeniy Didin <Evgeniy.Didin@synopsys.com> +Date: Thu, 2 Apr 2020 20:59:21 +0300 +Subject: [PATCH] arc: Disable atomic operations + +Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> +--- + js/src/jit/AtomicOperations.h | 2 ++ + js/src/jit/none/AtomicOperations-feeling-lucky.h | 4 ++++ + 2 files changed, 6 insertions(+) + +diff --git a/js/src/jit/AtomicOperations.h b/js/src/jit/AtomicOperations.h +index fda0b14..d583e4b 100644 +--- a/js/src/jit/AtomicOperations.h ++++ b/js/src/jit/AtomicOperations.h +@@ -395,6 +395,8 @@ inline bool AtomicOperations::isLockfreeJS(int32_t size) { + #include "jit/none/AtomicOperations-feeling-lucky.h" + #elif defined(__riscv) + #include "jit/none/AtomicOperations-feeling-lucky.h" ++#elif defined(__arc__) ++#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 42b1f3e..f49f680 100644 +--- a/js/src/jit/none/AtomicOperations-feeling-lucky.h ++++ b/js/src/jit/none/AtomicOperations-feeling-lucky.h +@@ -88,6 +88,10 @@ + #endif + #endif + ++#ifdef __arc__ ++#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.16.2 + diff --git a/bsp/meta-synopsys/recipes-extended/mozjs/mozjs_52.9.1.bbappend b/bsp/meta-synopsys/recipes-extended/mozjs/mozjs_60.9.0.bbappend index 903f5815..fa4a49e2 100644 --- a/bsp/meta-synopsys/recipes-extended/mozjs/mozjs_52.9.1.bbappend +++ b/bsp/meta-synopsys/recipes-extended/mozjs/mozjs_60.9.0.bbappend @@ -1,5 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/mozjs:" SRC_URI_append += "\ file://0001-Add-ARC-CPU-support.patch; \ + file://0001-arc-Disable-atomic-operations.patch; \ " |