From af0062c6d688bd534b8ab85a5c409878d9d885b1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Dec 2020 17:35:08 +0100 Subject: allow to preset thread implementation --- mk/build.mk | 11 +++++++++++ target/config/Config.in.threads | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index c34b71c01..bbd123930 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -460,6 +460,17 @@ defconfig: .menu $(CONFIG)/conf printf "# ADK_TARGET_WITH_MMU is not set\n" \ >> $(ADK_TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(ADK_TARGET_THREADS)" ];then \ + if [ "$(ADK_TARGET_THREADS)" = "nptl" ];then \ + printf "ADK_TARGET_WITH_NPTL=y\n" >> $(ADK_TOPDIR)/.defconfig; \ + fi; \ + if [ "$(ADK_TARGET_THREADS)" = "lt" ];then \ + printf "ADK_TARGET_WITH_LT=y\n" >> $(ADK_TOPDIR)/.defconfig; \ + fi; \ + if [ "$(ADK_TARGET_THREADS)" = "none" ];then \ + printf "ADK_TARGET_WITHOUT_THREADS=y\n" >> $(ADK_TOPDIR)/.defconfig; \ + fi; \ + fi @if [ ! -z "$(ADK_TARGET_LIBC)" ];then \ libc=$$(echo "$(ADK_TARGET_LIBC)"|sed -e "s/-/_/"); \ grep "^config" target/config/Config.in.libc \ diff --git a/target/config/Config.in.threads b/target/config/Config.in.threads index d08a0c821..ff4fcac25 100644 --- a/target/config/Config.in.threads +++ b/target/config/Config.in.threads @@ -7,8 +7,7 @@ depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_WITH_NPTL bool "NPTL" - depends on ADK_TARGET_SUPPORTS_NPTL && ADK_TARGET_SUPPORTS_THREADS || \ - ((ADK_TARGET_ARCH_ARM && ADK_TARGET_BINFMT_FDPIC) || ADK_TARGET_WITH_MMU) + depends on ADK_TARGET_SUPPORTS_NPTL && ADK_TARGET_SUPPORTS_THREADS config ADK_TARGET_WITH_LT bool "Linuxthreads" -- cgit v1.2.3