From 7532fc1bcd35f034754a467cb1dd39ecc8839b36 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 5 Jun 2022 21:42:55 +0200 Subject: [PATCH] package/musl: introduce and use BR2_PACKAGE_MUSL_ARCH_SUPPORTS and BR2_PACKAGE_MUSL_SUPPORTS In this commit BR2_PACKAGE_MUSL_SUPPORTS looks redundant with BR2_PACKAGE_MUSL_ARCH_SUPPORTS, but for other C libraries, like glibc, it can be different. To be consistent, we use the same pattern for musl. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/musl/Config.in | 28 +++++++++++++++++++++++++ toolchain/toolchain-buildroot/Config.in | 10 +-------- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/package/musl/Config.in b/package/musl/Config.in index 69da615b63..c1a10bdd58 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -1,3 +1,31 @@ +config BR2_PACKAGE_MUSL_ARCH_SUPPORTS + bool + default y if BR2_aarch64 + default y if BR2_arm + default y if BR2_armeb + default y if BR2_i386 + default y if BR2_microblaze + default y if BR2_mips + default y if BR2_mipsel + default y if BR2_mips64 + default y if BR2_mips64el + default y if BR2_or1k + default y if BR2_powerpc + default y if BR2_powerpc64 + default y if BR2_powerpc64le + default y if BR2_RISCV_64 + default y if BR2_sh + default y if BR2_x86_64 + depends on !BR2_powerpc_SPE # not supported, build breaks + depends on !(BR2_powerpc64 || BR2_powerpc64le) || BR2_POWERPC_CPU_HAS_ALTIVEC + # sh2 nommu is supported by musl, but we don't have support + # for it in Buildroot. + depends on BR2_USE_MMU + +config BR2_PACKAGE_MUSL_SUPPORTS + bool + default y if BR2_PACKAGE_MUSL_ARCH_SUPPORTS + config BR2_PACKAGE_MUSL bool default y diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 7ce2998cf7..0dac816a4d 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -61,15 +61,7 @@ comment "glibc on MIPS w/ NAN2008 needs a toolchain w/ headers >= 4.5" config BR2_TOOLCHAIN_BUILDROOT_MUSL bool "musl" - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_microblaze || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_or1k || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_RISCV_64 || BR2_sh || BR2_x86_64 - depends on !BR2_powerpc_SPE # not supported, build breaks - depends on !(BR2_powerpc64 || BR2_powerpc64le) || BR2_POWERPC_CPU_HAS_ALTIVEC - # sh2 nommu is supported by musl, but we don't have support - # for it in Buildroot. - depends on BR2_USE_MMU + depends on BR2_PACKAGE_MUSL_SUPPORTS select BR2_TOOLCHAIN_USES_MUSL help This option selects musl as the C library for the