From fe4e72251b2b2eaed6a2842b92198a9f78fe5d55 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 4 May 2022 22:22:26 -0600 Subject: [PATCH] package/pkg-meson: add support for new cpu families Add mappings for new cpu families based on the reference table: https://mesonbuild.com/Reference-tables.html#cpu-families Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) (cherry picked from commit 0a91f37c482914d70336454cb4ab4fa8ffda30a5) Signed-off-by: Peter Korsgaard --- package/pkg-meson.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index f1390a18d0..ff850fa79f 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -36,6 +36,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) PKG_MESON_TARGET_CPU_FAMILY = arm else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y) PKG_MESON_TARGET_CPU_FAMILY = aarch64 +else ifeq ($(BR2_csky),y) +PKG_MESON_TARGET_CPU_FAMILY = csky else ifeq ($(BR2_i386),y) PKG_MESON_TARGET_CPU_FAMILY = x86 else ifeq ($(BR2_m68k),y) @@ -50,8 +52,12 @@ else ifeq ($(BR2_powerpc),y) PKG_MESON_TARGET_CPU_FAMILY = ppc else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) PKG_MESON_TARGET_CPU_FAMILY = ppc64 -else ifeq ($(BR2_riscv),y) +else ifeq ($(BR2_riscv)$(BR2_RISCV_32),yy) +PKG_MESON_TARGET_CPU_FAMILY = riscv32 +else ifeq ($(BR2_riscv)$(BR2_RISCV_64),yy) PKG_MESON_TARGET_CPU_FAMILY = riscv64 +else ifeq ($(BR2_s390x),y) +PKG_MESON_TARGET_CPU_FAMILY = s390x else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) PKG_MESON_TARGET_CPU_FAMILY = sh4 else ifeq ($(BR2_sparc),y)