From cc28479164b8dc8afd4310716da32f16022f5974 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 Dec 2017 18:44:20 +0100 Subject: [PATCH] m68k: uClibc-ng now support NPTL/TLS --- target/config/Config.in.cpu | 16 ++++++++-------- target/m68k/uclibc-ng.config | 10 ++++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 41e45d2bd..a251a84a2 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -806,24 +806,24 @@ config ADK_TARGET_CPU_M32R config ADK_TARGET_CPU_M68K_68020 bool "68020" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_LIB_UCLIBC_NG - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_LIB_GLIBC + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_M68K_68030 bool "68030" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_LIB_UCLIBC_NG - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_LIB_GLIBC + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX depends on ADK_TARGET_ARCH_M68K config ADK_TARGET_CPU_M68K_68040 bool "68040" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_LIB_UCLIBC_NG - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_LIB_GLIBC + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX select ADK_TARGET_CPU_WITH_FPU depends on ADK_TARGET_ARCH_M68K @@ -831,8 +831,8 @@ config ADK_TARGET_CPU_M68K_68040 config ADK_TARGET_CPU_M68K_68060 bool "68060" select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_LIB_UCLIBC_NG - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_LIB_GLIBC + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_SUPPORTS_NPTL select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX depends on ADK_TARGET_ARCH_M68K diff --git a/target/m68k/uclibc-ng.config b/target/m68k/uclibc-ng.config index fa5e62c4c..3232efbcb 100644 --- a/target/m68k/uclibc-ng.config +++ b/target/m68k/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.25 C Library Configuration +# uClibc-ng 1.0.27 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -10,6 +10,7 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_csky is not set # TARGET_frv is not set # TARGET_h8300 is not set # TARGET_hppa is not set @@ -52,7 +53,6 @@ UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y DO_XSI_MATH=y -# UCLIBC_HAS_FENV is not set UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y @@ -80,8 +80,10 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -UCLIBC_HAS_LINUXTHREADS=y +# UCLIBC_HAS_LINUXTHREADS is not set +UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y +UCLIBC_HAS_TLS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y @@ -155,6 +157,7 @@ UCLIBC_HAS_RESOLVER_SUPPORT=y # UCLIBC_HAS_STRING_GENERIC_OPT=y UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_STDIO_FUTEXES=y UCLIBC_HAS_CTYPE_TABLES=y UCLIBC_HAS_CTYPE_SIGNED=y # UCLIBC_HAS_CTYPE_UNSAFE is not set @@ -229,7 +232,6 @@ UCLIBC_BUILD_NOEXECSTACK=y CROSS_COMPILER_PREFIX="" UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set -# DODEBUG_PT is not set # DOSTRIP is not set # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set -- 2.11.4.GIT