From 41d4d5049cec06e94d877c8361cc66985fb4a9cc Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Oct 2019 14:22:11 +0200 Subject: arm: allow to build FDPIC toolchain --- mk/vars.mk | 3 +++ target/config/Config.in.libc | 1 + target/config/Config.in.threads | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mk/vars.mk b/mk/vars.mk index b81a724a1..e476b8938 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -81,6 +81,9 @@ GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_VENDOR)-$(ADK_TARGET_LINUXTYPE)-$ ifeq ($(ADK_TARGET_ARCH_C6X),y) GNU_TARGET_NAME:= ti$(ADK_TARGET_CPU_ARCH)-$(ADK_VENDOR)-$(ADK_TARGET_LINUXTYPE) endif +ifeq ($(ADK_TARGET_ARCH_ARM)$(ADK_TARGET_BINFMT_FDPIC),yy) +GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_VENDOR)-$(ADK_TARGET_SUFFIX) +endif ifeq ($(ADK_TARGET_OS_BAREMETAL),y) GNU_TARGET_NAME:= $(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_SUFFIX) endif diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index f2e228580..04fd14692 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -218,6 +218,7 @@ config ADK_TARGET_SUFFIX default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_X32 && ADK_LINUX_64 default "gnuspe" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_PPC && ADK_TARGET_ARCH_PPC_WITH_SPE default "gnu" if ADK_TARGET_LIB_GLIBC + default "uclinuxfdpiceabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_BINFMT_FDPIC default "uclibceabihf" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT default "uclibceabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM default "uclinuxeabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_UCLINUX diff --git a/target/config/Config.in.threads b/target/config/Config.in.threads index b0bb2f452..059a20c47 100644 --- a/target/config/Config.in.threads +++ b/target/config/Config.in.threads @@ -7,7 +7,8 @@ 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_WITH_MMU + depends on ADK_TARGET_SUPPORTS_NPTL && ADK_TARGET_SUPPORTS_THREADS && \ + (ADK_TARGET_ARCH_ARM || ADK_TARGET_WITH_MMU) config ADK_TARGET_WITH_LT bool "Linuxthreads" -- cgit v1.2.3