citadel/meta-gnome/recipes-support/mozjs/files/riscv32.patch
Bruce Leidl 3db0a6b032 Upgrade to Yocto 4.1 and GNOME 43
poky:

  Upgrade to Yocto 4.1 Langdale

meta-citadel/recipes-kernel:

  citadel-kernel             5.19.9 -> 6.0.8

meta-citadel/recipes-sway:

  sway                       1.5.1  -> 1.7      (meta-wayland)
  wlroots                    0.12.0 -> 0.15.1   (meta-wayland)

meta-gnome/recipes-connectivity:

  iwd                        1.27   -> 1.30     (meta-oe)
  modemmanager               1.18.2 -> 1.18.6   (meta-oe)
  networkmanager             1.36.2 -> 1.40.0   (meta-oe)

meta-gnome/recipes-freedesktop:

  libgusb                    0.3.7  -> 0.3.10   (meta-oe)

meta-gnome/recipes-gnome:

  adwaita-icon-theme         42     -> 43       (oe-core)
  geocode-glib               3.26.2 -> 3.26.4   (meta-oe)
  gjs                        1.72.0 -> 1.73.2   (meta-oe)
  gnome-bluetooth            42.0   -> 42.4     (meta-oe)
  gnome-control-center       42.1   -> 43.0
  gnome-desktop              42.1   -> 43.rc
  gnome-settings-daemon      42.1   -> 43.0
  gnome-shell                42.1   -> 43.0
  gsettings-desktop-schema   41.0   -> 43.0
  gtk4                       4.6.4  -> 4.6.7    (meta-oe)
  gvfs                       1.50.0 -> 1.50.2   (meta-oe)
  libadwaita                 1.1.1  -> 1.2.0    (meta-oe)
  libgee                     0.20.4 -> 0.20.6   (meta-oe)
  mutter                     42.1   -> 43.0
  rest                       0.8.1  -> 0.9.0    (meta-oe)

meta-gnome/recipes-support:

  ell                        0.50   -> 0.53     (poky)
  exiv2                      0.26   -> 0.27.3   (meta-oe)
  graphene                   1.10.2 -> 1.10.8   (meta-oe)
  gsound                     1.0.2  -> 1.0.3    (meta-oe)
  icu_71.1                   (removed from meta-gnome because this version is in poky)
  jansson                    2.12   -> 2.14     (meta-oe)
  lcms                       2.9    -> 2.14     (meta-oe)
  libdvdread                 6.1.1  -> 6.1.3    (meta-oe)
  libndp                     1.6    -> 1.8      (meta-oe)
  mozjs                      91.8.0 -> 102.3.0
  power-profiles-daemon      0.12      (new-recipe)
2022-11-15 12:25:32 -05:00

61 lines
2.7 KiB
Diff

From 5b595a31c53f9a4e660be9f1c28520d89c1386db Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 22 Sep 2022 23:20:45 +0000
Subject: [PATCH] Add RISCV32 support
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
build/moz.configure/init.configure | 3 +++
python/mozbuild/mozbuild/configure/constants.py | 2 ++
.../mozbuild/test/configure/test_toolchain_configure.py | 1 +
3 files changed, 6 insertions(+)
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index 0b7a2ff60f..54f8325b44 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -524,6 +524,9 @@ def split_triplet(triplet, allow_msvc=False, allow_wasi=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"
diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
index c71460cb20..15bef93e19 100644
--- a/python/mozbuild/mozbuild/configure/constants.py
+++ b/python/mozbuild/mozbuild/configure/constants.py
@@ -53,6 +53,7 @@ CPU_bitness = {
"mips64": 64,
"ppc": 32,
"ppc64": 64,
+ 'riscv32': 32,
"riscv64": 64,
"s390": 32,
"s390x": 64,
@@ -95,6 +96,7 @@ CPU_preprocessor_checks = OrderedDict(
("m68k", "__m68k__"),
("mips64", "__mips64"),
("mips32", "__mips__"),
+ ("riscv32", "__riscv && __riscv_xlen == 32"),
("riscv64", "__riscv && __riscv_xlen == 64"),
("loongarch64", "__loongarch64"),
("sh4", "__sh__"),
diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
index 059cde0139..4f9986eb31 100644
--- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
@@ -1192,6 +1192,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest):
"m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1},
"mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1},
"mips-unknown-linux-gnu": big_endian + {"__mips__": 1},
+ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32},
"riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64},
"sh4-unknown-linux-gnu": little_endian + {"__sh__": 1},
}