diff options
-rw-r--r-- | target/alpha/uclibc-ng.config | 7 | ||||
-rw-r--r-- | target/avr32/uclibc-ng.config | 7 | ||||
-rw-r--r-- | target/bfin/uclibc-ng.config | 7 | ||||
-rw-r--r-- | target/c6x/uclibc-ng.config | 6 | ||||
-rw-r--r-- | target/config/Config.in.libc | 10 | ||||
-rw-r--r-- | target/config/Config.in.runtime | 2 | ||||
-rw-r--r-- | target/cris/uclibc-ng.config | 7 | ||||
-rw-r--r-- | target/frv/uclibc-ng.config | 5 | ||||
-rw-r--r-- | target/h8300/uclibc-ng.config | 8 | ||||
-rw-r--r-- | target/hppa/uclibc-ng.config | 6 | ||||
-rw-r--r-- | target/ia64/uclibc-ng.config | 7 | ||||
-rw-r--r-- | target/lm32/uclibc-ng.config | 12 | ||||
-rw-r--r-- | target/m68k/uclibc-ng.config | 7 | ||||
-rw-r--r-- | target/microblaze/uclibc-ng.config | 21 | ||||
-rw-r--r-- | target/nios2/uclibc-ng.config | 6 | ||||
-rw-r--r-- | target/or1k/uclibc-ng.config | 6 | ||||
-rw-r--r-- | target/sh/uclibc-ng.config | 6 | ||||
-rw-r--r-- | toolchain/uclibc-ng/Makefile | 9 |
18 files changed, 78 insertions, 61 deletions
diff --git a/target/alpha/uclibc-ng.config b/target/alpha/uclibc-ng.config index 7f56cac22..33ef87d6e 100644 --- a/target/alpha/uclibc-ng.config +++ b/target/alpha/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # TARGET_alpha=y # TARGET_arc is not set @@ -9,7 +9,9 @@ TARGET_alpha=y # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -60,8 +62,7 @@ ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y UCLIBC_CTOR_DTOR=y HAS_NO_THREADS=y -# LINUXTHREADS_OLD is not set -# LINUXTHREADS_NEW is not set +# UCLIBC_HAS_LINUXTHREADS is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y MALLOC=y diff --git a/target/avr32/uclibc-ng.config b/target/avr32/uclibc-ng.config index 427d78233..42799d8e4 100644 --- a/target/avr32/uclibc-ng.config +++ b/target/avr32/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ TARGET_avr32=y # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -76,8 +78,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/bfin/uclibc-ng.config b/target/bfin/uclibc-ng.config index 73c4c0a5e..9ad6e73b4 100644 --- a/target/bfin/uclibc-ng.config +++ b/target/bfin/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ TARGET_bfin=y # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -79,8 +81,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/c6x/uclibc-ng.config b/target/c6x/uclibc-ng.config index 9fee6cd76..a117f7655 100644 --- a/target/c6x/uclibc-ng.config +++ b/target/c6x/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set TARGET_c6x=y # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -79,7 +81,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 75b72873a..422e96fd0 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -115,6 +115,10 @@ endchoice choice prompt "C library version" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_15 + bool "1.0.15" + depends on ADK_TARGET_LIB_UCLIBC_NG + config ADK_TARGET_LIB_UCLIBC_NG_1_0_14 bool "1.0.14" depends on ADK_TARGET_LIB_UCLIBC_NG @@ -123,10 +127,6 @@ config ADK_TARGET_LIB_UCLIBC_NG_1_0_13 bool "1.0.13" depends on ADK_TARGET_LIB_UCLIBC_NG -config ADK_TARGET_LIB_UCLIBC_NG_1_0_12 - bool "1.0.12" - depends on ADK_TARGET_LIB_UCLIBC_NG - config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG @@ -222,9 +222,9 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string + default "1.0.15" if ADK_TARGET_LIB_UCLIBC_NG_1_0_15 default "1.0.14" if ADK_TARGET_LIB_UCLIBC_NG_1_0_14 default "1.0.13" if ADK_TARGET_LIB_UCLIBC_NG_1_0_13 - default "1.0.12" if ADK_TARGET_LIB_UCLIBC_NG_1_0_12 default "1.1.14" if ADK_TARGET_LIB_MUSL_1_1_14 default "1.1.13" if ADK_TARGET_LIB_MUSL_1_1_13 default "1.1.12" if ADK_TARGET_LIB_MUSL_1_1_12 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index cfe654582..4c8034c8f 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -24,7 +24,7 @@ endchoice choice prompt "System for /dev management" depends on !ADK_APPLIANCE_TOOLCHAIN -default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_WITHOUT_MMU +default ADK_RUNTIME_DEV_STATIC if ADK_TARGET_WITHOUT_MMU || ADK_TARGET_ARCH_CRIS default ADK_RUNTIME_DEV_MDEV config ADK_RUNTIME_DEV_MDEV diff --git a/target/cris/uclibc-ng.config b/target/cris/uclibc-ng.config index 9022ac3e4..c1d1a5f62 100644 --- a/target/cris/uclibc-ng.config +++ b/target/cris/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.14 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set TARGET_cris=y +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -76,8 +78,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/frv/uclibc-ng.config b/target/frv/uclibc-ng.config index 79dad094e..ddea51975 100644 --- a/target/frv/uclibc-ng.config +++ b/target/frv/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.13 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -77,8 +77,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/h8300/uclibc-ng.config b/target/h8300/uclibc-ng.config index 596b733d6..59412240c 100644 --- a/target/h8300/uclibc-ng.config +++ b/target/h8300/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set TARGET_h8300=y +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -64,9 +66,9 @@ ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y +# PTHREADS_DEBUG_SUPPORT is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y MALLOC=y diff --git a/target/hppa/uclibc-ng.config b/target/hppa/uclibc-ng.config index 73c5b0c69..ff8bfff10 100644 --- a/target/hppa/uclibc-ng.config +++ b/target/hppa/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.11 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,6 +9,7 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set TARGET_hppa=y # TARGET_i386 is not set @@ -60,8 +61,7 @@ ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/ia64/uclibc-ng.config b/target/ia64/uclibc-ng.config index 9943d374e..aa3dcf20b 100644 --- a/target/ia64/uclibc-ng.config +++ b/target/ia64/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set TARGET_ia64=y # TARGET_lm32 is not set @@ -60,8 +62,7 @@ ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/lm32/uclibc-ng.config b/target/lm32/uclibc-ng.config index 70de9ce7c..8e4860277 100644 --- a/target/lm32/uclibc-ng.config +++ b/target/lm32/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set TARGET_lm32=y @@ -61,9 +63,10 @@ HAVE_NO_PIC=y ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y UCLIBC_CTOR_DTOR=y -HAS_NO_THREADS=y -# LINUXTHREADS_OLD is not set -# LINUXTHREADS_NEW is not set +# HAS_NO_THREADS is not set +UCLIBC_HAS_LINUXTHREADS=y +UCLIBC_HAS_THREADS=y +# PTHREADS_DEBUG_SUPPORT is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y MALLOC=y @@ -215,6 +218,7 @@ 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 # UCLIBC_MALLOC_DEBUGGING is not set diff --git a/target/m68k/uclibc-ng.config b/target/m68k/uclibc-ng.config index 77cf1c7dd..0e0a93c26 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.10 C Library Configuration +# uClibc-ng 1.0.14 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -75,8 +77,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/microblaze/uclibc-ng.config b/target/microblaze/uclibc-ng.config index 2cbd7b86d..7612e8073 100644 --- a/target/microblaze/uclibc-ng.config +++ b/target/microblaze/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.14 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -58,12 +60,12 @@ HAVE_SHARED=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y -LDSO_PRELOAD_ENV_SUPPORT=y +# LDSO_PRELOAD_ENV_SUPPORT is not set # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" # LDSO_STANDALONE_SUPPORT is not set # LDSO_PRELINK_SUPPORT is not set -UCLIBC_STATIC_LDCONFIG=y +# UCLIBC_STATIC_LDCONFIG is not set LDSO_RUNPATH=y LDSO_RUNPATH_OF_EXECUTABLE=y LDSO_SAFE_RUNPATH=y @@ -73,8 +75,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y -# LINUXTHREADS_NEW is not set +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y @@ -199,9 +200,9 @@ UCLIBC_HAS_ARGP=y # Big and Tall # UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y +# UCLIBC_HAS_REGEX_OLD is not set UCLIBC_HAS_FNMATCH=y -UCLIBC_HAS_FNMATCH_OLD=y +# UCLIBC_HAS_FNMATCH_OLD is not set UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_NFTW=y # UCLIBC_HAS_FTW is not set @@ -212,8 +213,8 @@ UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options # -RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="/usr/" MULTILIB_DIR="lib" HARDWIRED_ABSPATH=y @@ -223,7 +224,7 @@ HARDWIRED_ABSPATH=y # UCLIBC_HAS_ARC4RANDOM is not set # UCLIBC_HAS_SSP is not set UCLIBC_BUILD_RELRO=y -# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOW=y UCLIBC_BUILD_NOEXECSTACK=y # diff --git a/target/nios2/uclibc-ng.config b/target/nios2/uclibc-ng.config index 3d4257340..590394cd8 100644 --- a/target/nios2/uclibc-ng.config +++ b/target/nios2/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.11 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -58,7 +60,7 @@ ARCH_HAS_NO_SHARED=y ARCH_HAS_NO_LDSO=y UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/or1k/uclibc-ng.config b/target/or1k/uclibc-ng.config index 1bfab5198..fde8024b3 100644 --- a/target/or1k/uclibc-ng.config +++ b/target/or1k/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -73,7 +75,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -LINUXTHREADS_OLD=y +UCLIBC_HAS_LINUXTHREADS=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_SYSLOG=y diff --git a/target/sh/uclibc-ng.config b/target/sh/uclibc-ng.config index cc5417219..a6f6df317 100644 --- a/target/sh/uclibc-ng.config +++ b/target/sh/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.10 C Library Configuration +# uClibc-ng 1.0.15 C Library Configuration # # TARGET_alpha is not set # TARGET_arc is not set @@ -9,7 +9,9 @@ # TARGET_bfin is not set # TARGET_c6x is not set # TARGET_cris is not set +# TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_ia64 is not set # TARGET_lm32 is not set @@ -79,7 +81,7 @@ LDSO_NO_CLEANUP=y UCLIBC_CTOR_DTOR=y # LDSO_GNU_HASH_SUPPORT is not set # HAS_NO_THREADS is not set -# LINUXTHREADS_OLD is not set +# UCLIBC_HAS_LINUXTHREADS is not set UCLIBC_HAS_THREADS_NATIVE=y UCLIBC_HAS_THREADS=y UCLIBC_HAS_TLS=y diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index d72994121..65427e0a7 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -106,20 +106,17 @@ ifeq ($(ADK_TARGET_WITH_NPTL),y) $(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_TLS\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*\(LINUXTHREADS_OLD\).*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_LINUXTHREADS\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(HAS_NO_THREADS\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_WITH_LT),y) $(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_TLS\).*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*\(LINUXTHREADS_OLD\).*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_LINUXTHREADS\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(HAS_NO_THREADS\).*/# \1 is not set/' ${WRKBUILD}/.config endif ifeq ($(ADK_TARGET_LIB_WITHOUT_THREADS)$(ADK_TARGET_WITHOUT_THREADS),y) - $(SED) 's/.*\(LINUXTHREADS_OLD\).*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*\(LINUXTHREADS_NEW\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_LINUXTHREADS\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_THREADS_NATIVE\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_TLS\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(PTHREADS_DEBUG_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config |