diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-11-01 12:49:10 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-11-02 08:07:17 -0700 |
commit | 659b72bb1c891dc6b74a8dd770640c5997c3be2b (patch) | |
tree | f6ce0c0bcc91c8c3006c583694075f48420c14e5 /meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch | |
parent | eb8d2568d0b48f30fe39a6bbe4a59bf32107f3b5 (diff) | |
download | meta-openembedded-contrib-659b72bb1c891dc6b74a8dd770640c5997c3be2b.tar.gz |
mozjs-78: Initial add
* Did not get rid of checks using llvm-objdump. So depend either llvm-native
from oe-core or clang-native from meta-clang
* Unfortunately we still need python3-six(-native) although firefox ships a
version in third_party. If somebody more clever than me can solve this,
mozjs-78 can be moved out of dynamic-layers
* Get rid of erroneous dependency trying to satisfy llvm_objdump
It was tested improperly so configure faile for meta-clang not in layers
It is not necessary for building js only - see mozjs-91
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch')
-rw-r--r-- | meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch new file mode 100644 index 0000000000..70177d003d --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs-78/0008-riscv.patch @@ -0,0 +1,52 @@ +Add RISCV32/64 support + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + build/moz.configure/init.configure | 6 ++++++ + python/mozbuild/mozbuild/configure/constants.py | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +index 0a6a33c..eeee87e 100644 +--- a/build/moz.configure/init.configure ++++ b/build/moz.configure/init.configure +@@ -755,6 +755,12 @@ def split_triplet(triplet, allow_msvc=False): + elif cpu.startswith('aarch64'): + canonical_cpu = 'aarch64' + endianness = 'little' ++ elif cpu in ("riscv32", "riscv32gc"): ++ canonical_cpu = "riscv32" ++ endianness = "little" ++ elif cpu in ("riscv64", "riscv64gc"): ++ canonical_cpu = "riscv64" ++ endianness = "little" + elif cpu == 'sh4': + canonical_cpu = 'sh4' + endianness = 'little' +diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py +index 7542dcd..de25be2 100644 +--- a/python/mozbuild/mozbuild/configure/constants.py ++++ b/python/mozbuild/mozbuild/configure/constants.py +@@ -50,6 +50,8 @@ CPU_bitness = { + 'mips64': 64, + 'ppc': 32, + 'ppc64': 64, ++ 'riscv32': 32, ++ 'riscv64': 64, + 's390': 32, + 's390x': 64, + 'sh4': 32, +@@ -82,6 +84,8 @@ CPU_preprocessor_checks = OrderedDict(( + ('s390', '__s390__'), + ('ppc64', '__powerpc64__'), + ('ppc', '__powerpc__'), ++ ('riscv32', '__riscv && __SIZEOF_POINTER__ == 4'), ++ ('riscv64', '__riscv && __SIZEOF_POINTER__ == 8'), + ('Alpha', '__alpha__'), + ('hppa', '__hppa__'), + ('sparc64', '__sparc__ && __arch64__'), +-- +2.31.1 + |