From 1c667a11400e51618a4b38d288816cbb3ee7478f Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Wed, 26 Jan 2022 09:25:05 +0100 Subject: [PATCH] package/boost: enable context/coroutine for arm variants Add boost context support for aarch64/aarch64_be. Context support for ARM is only available in the AAPCS ABI, so switch to AAPCS ABI for all ARM variants. While we're at it, update the URL about the context architecture support to the one corresponding to the current version of boost. Signed-off-by: Pieter De Gendt [Arnout: update URL, extend commit message] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/boost/Config.in | 3 ++- package/boost/boost.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 1c405a36c3..2c458bf88a 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -68,12 +68,13 @@ config BR2_PACKAGE_BOOST_CONTAINER Standard library containers and extensions. # see -# http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html +# http://www.boost.org/doc/libs/1_78_0/libs/context/doc/html/context/architectures.html # for the list of supported architectures. Sparc pretends to be # supported, but it doesn't build. config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS bool default y if ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) + default y if (BR2_aarch64 || BR2_aarch64_be) default y if BR2_i386 default y if BR2_mips default y if BR2_mipsel diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 2d2a8fb311..b6681b0ad3 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -85,7 +85,7 @@ HOST_BOOST_OPTS += --no-cmake-config toolset=gcc threading=multi \ ifeq ($(BR2_MIPS_OABI32),y) BOOST_ABI = o32 -else ifeq ($(BR2_arm),y) +else ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y) BOOST_ABI = aapcs else BOOST_ABI = sysv