From 2ca806ecec85fc6e410ef3ae9e37c2879ee7ecfd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 13 May 2017 20:22:54 +0200 Subject: or1k: allow to test uClibc-ng NPTL support --- target/config/Config.in.cpu | 6 ++---- target/or1k/uclibc-ng.config | 14 ++++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'target') diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 5eadc4e92..8d2dcb9bf 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -951,13 +951,11 @@ config ADK_TARGET_CPU_NIOS2 config ADK_TARGET_CPU_OR1K bool "or1k" 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_MUSL - 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 depends on ADK_TARGET_ARCH_OR1K - # ppc32 config ADK_TARGET_CPU_PPC bool "ppc" diff --git a/target/or1k/uclibc-ng.config b/target/or1k/uclibc-ng.config index 9166fb142..3304f7013 100644 --- a/target/or1k/uclibc-ng.config +++ b/target/or1k/uclibc-ng.config @@ -1,7 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.21 C Library Configuration +# uClibc-ng 1.0.24 C Library Configuration # +# TARGET_aarch64 is not set # TARGET_alpha is not set # TARGET_arc is not set # TARGET_arm is not set @@ -50,6 +51,7 @@ UCLIBC_HAS_FPU=y DO_C99_MATH=y # DO_XSI_MATH is not set # UCLIBC_HAS_FENV is not set +UCLIBC_HAS_LONG_DOUBLE_MATH=y KERNEL_HEADERS="" HAVE_DOT_CONFIG=y @@ -76,10 +78,13 @@ 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 # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y @@ -138,7 +143,6 @@ UCLIBC_HAS_NETWORK_SUPPORT=y UCLIBC_HAS_SOCKET=y UCLIBC_HAS_IPV4=y UCLIBC_HAS_IPV6=y -# UCLIBC_HAS_RPC is not set UCLIBC_USE_NETLINK=y UCLIBC_SUPPORT_AI_ADDRCONFIG=y UCLIBC_HAS_BSD_RES_CLOSE=y @@ -151,6 +155,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 @@ -194,9 +199,7 @@ UCLIBC_HAS_ARGP=y # Big and Tall # UCLIBC_HAS_REGEX=y -# UCLIBC_HAS_REGEX_OLD is not set UCLIBC_HAS_FNMATCH=y -# UCLIBC_HAS_FNMATCH_OLD is not set UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y UCLIBC_HAS_FTW=y @@ -228,7 +231,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 -- cgit v1.2.3