Retire obsoleted milestones

... and the code dependent on them, after the latest wave of obsolete
package removals. This concludes the glorious history of the original
uClibc (non-NG) with lots of kludges removed.

There was a choice here, whether to call the resulting libc "uClibc" or
"uClibc-ng". I opted in favor of giving uClibc-ng the recognition it
deserves, although it had some ripple effect in the ct-ng code.

Signed-off-by: Alexey Neyman <stilor@att.net>

config/cc/gcc.in

@@ -7,19 +7,14 @@
 ## select CC_SUPPORT_OBJC
 ## select CC_SUPPORT_OBJCXX
 ## select CC_SUPPORT_GOLANG
+# ISL 0.15 is the oldest release present in CTNG.
 # GCC7 requires ISL 0.15+
-## select ISL_REQUIRE_0_15_or_later if ISL_NEEDED && GCC_7_or_later
 # GCC6 requires ISL 0.14+ (it says 0.14-0.16, but accepts newer ISL as well)
-## select ISL_REQUIRE_0_14_or_later if ISL_NEEDED && GCC_6_or_later
 # GCC5 requires ISL 0.12+ (again, it says 0.12-0.16, but also accepts newer ISL up to 0.18;
 # fails to compile with 0.19+)
-## select ISL_REQUIRE_0_12_or_later if ISL_NEEDED && GCC_5_or_later
 ## select ISL_REQUIRE_0_18_or_older if ISL_NEEDED && GCC_5_or_later && !GCC_6_or_later
 # GCC4.9 requires ISL 0.10..0.15
-# GCC4.8 requires ISL 0.10..0.14
-## select ISL_REQUIRE_0_10_or_later if ISL_NEEDED && GCC_4_8_or_later
 ## select ISL_REQUIRE_0_15_or_older if ISL_NEEDED && GCC_4_9_or_later && !GCC_5_or_later
-## select ISL_REQUIRE_0_14_or_older if ISL_NEEDED && GCC_4_8_or_later && !GCC_4_9_or_later
 
 ## help gcc is the full-blown GNU compiler. This is what most people will choose.
 ## help
@@ -265,7 +260,7 @@ config CC_GCC_LIBSANITIZER
     bool
     prompt "Compile libsanitizer"
     depends on THREADS_NATIVE
-    depends on !LIBC_UCLIBC && !LIBC_MUSL # Currently lacks required headers (like netrom.h)
+    depends on !LIBC_UCLIBC_NG && !LIBC_MUSL # Currently lacks required headers (like netrom.h)
     help
       libsanitizer is a library which provides run-time sanitising of either
       or both of:

config/comp_libs/gmp.in

@@ -1,5 +1 @@
 # GMP options
-
-config GMP_HAS_MPBSD
-    bool
-    default y if !GMP_5_1_0_or_later

config/comp_libs/isl.in

@@ -1,13 +1 @@
 # ISL options
-# CLooG 0.18.4 requires ISL 0.12 or newer
-# CLooG 0.18.1 requires ISL 0.12 or older
-## select CLOOG_REQUIRE_0_18_1_or_older if CLOOG_NEEDED && !ISL_0_12_or_later
-## select CLOOG_REQUIRE_0_18_4_or_later if CLOOG_NEEDED && !ISL_0_14_or_older
-
-config ISL_NEEDS_WITH_GMP
-    bool
-    default y if !ISL_0_12_or_later
-
-config ISL_HAS_WITH_PIPLIB
-    bool
-    default y if !ISL_0_14_or_later

config/comp_libs/mpc.in

@@ -1,6 +1,3 @@
 # MPC options
-# MPC 1.1.0 and later requires MPFR 3.0.0 or later and GMP 5.0.0 or later.
 # MPC 1.0.x and earlier break with MPFR 4.0.0.
-## select MPFR_REQUIRE_3_0_0_or_later if MPFR_NEEDED && MPC_1_1_0_or_later
-## select GMP_REQUIRE_5_0_0_or_later if GMP_NEEDED && MPC_1_1_0_or_later
 ## select MPFR_REQUIRE_older_than_4_0_0 if MPFR_NEEDED && !MPC_1_1_0_or_later

config/comp_libs/newlib-nano.in

@@ -1,6 +1,7 @@
 # newlib-nano options
 
 ## depends on BARE_METAL
+## select LIBC_PROVIDES_CXA_ATEXIT
 
 ## help Newlib-nano is a C library intended for use on embedded systems. It is a
 ## help conglomeration of several library parts, all under free software
@@ -37,21 +38,6 @@ config NEWLIB_NANO_INSTALL_IN_TARGET
       Additionally the newlib-nano version of newlib.h will get copied to
       include/newlib-nano/newlib.h.
 
-# maybe older versions of newlib will support it too, but this
-# needs to be checked
-config NEWLIB_NANO_CXA_ATEXIT
-    def_bool y
-    depends on NEWLIB_NANO_2_0_or_later
-    select LIBC_PROVIDES_CXA_ATEXIT
-
-config NEWLIB_NANO_HAS_NANO_MALLOC
-    def_bool y
-    depends on NEWLIB_NANO_2_1_or_later
-
-config NEWLIB_NANO_HAS_NANO_FORMATTED_IO
-    def_bool y
-    depends on NEWLIB_NANO_2_2_or_later
-
 config LIBC_NEWLIB_NANO_TARGET_CFLAGS
     string
     prompt "Target CFLAGS for newlib"
@@ -225,7 +211,6 @@ config LIBC_NEWLIB_NANO_NANO_MALLOC
     bool
     prompt "Enable Nano Malloc"
     default y
-    depends on NEWLIB_NANO_HAS_NANO_MALLOC
     help
       NEWLIB has two implementations of malloc family's functions, one in
       `mallocr.c' and the other one in `nano-mallocr.c'.  This options
@@ -237,7 +222,6 @@ config LIBC_NEWLIB_NANO_NANO_FORMATTED_IO
     bool
     prompt "Enable Nano Formatted I/O"
     default y
-    depends on NEWLIB_NANO_HAS_NANO_FORMATTED_IO
     help
       This builds NEWLIB with a special implementation of formatted I/O
       functions, designed to lower the size of application on small systems

config/debug/gdb.in.native

@@ -6,8 +6,8 @@ config GDB_NATIVE
     depends on ! BARE_METAL
     depends on ! LIBC_BIONIC
     depends on CC_LANG_CXX || !GDB_8_0_or_later
-    select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later
+    select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_or_later
-    select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later
+    select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later
     select EXPAT_TARGET
     select NCURSES_TARGET
     select GMP_TARGET if GDB_11_1_or_later
@@ -19,8 +19,8 @@ config GDB_GDBSERVER
     prompt "gdbserver"
     default y
     depends on ! BARE_METAL
-    select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC && GDB_8_0_or_later
+    select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_or_later
-    select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later
+    select LIBC_UCLIBC_IPV6 if LIBC_UCLIBC_NG && GDB_8_3_or_later
     help
       Build and install a gdbserver for the target, to run on the target.
 

config/debug/ltrace.in

@@ -7,10 +7,3 @@
 ## help It intercepts and records the dynamic library calls which are called by
 ## help the executed process and the signals which are received by that process.
 ## help It can also intercept and print the system calls executed by the program.
-
-# Ltrace 0.5.3 had a unique hand-crafted configure script that has to be
-# run differently from any preceding or following releases. This serves
-# as a reminder to remove that code once 0.5.3 support is dropped.
-config LTRACE_0_5_3_CONFIGURE
-    bool
-    default y if LTRACE_V_0_5_3

config/libc/glibc.in

@@ -66,7 +66,6 @@ config GLIBC_DEP_MAKE_4_0
     def_bool y
     depends on GLIBC_2_28_or_later && !CONFIGURE_has_make_4_0_or_newer
     select COMP_TOOLS_MAKE
-    select MAKE_REQUIRE_4_0_or_later
     select MAKE_GNUMAKE_SYMLINK # Override old host make in .build/tools/bin
 
 # Glibc 2.31 removed support for pre-v8 SPARC in 32-bit mode (64-bit mode always

config/libc/mingw-w64.in

@@ -9,10 +9,6 @@
 ##
 ## help The de-facto standard for Mingw distributions.
 
-config MINGW_W64_REQUIRES_W64_VENDOR
-	bool
-	default y if MINGW_W64_V4_or_later
-
 config THREADS
     default "win32"  if THREADS_NATIVE
     default "posix"  if THREADS_POSIX

config/libc/newlib.in

@@ -1,6 +1,7 @@
 # newlib options
 
 ## depends on BARE_METAL
+## select LIBC_PROVIDES_CXA_ATEXIT
 ## select LIBC_SUPPORT_THREADS_NONE
 ## select CC_CORE_PASS_1_NEEDED
 
@@ -11,21 +12,6 @@
 ## help array of processors, and will usually work on any architecture with
 ## help the addition of a few low-level routines.
 
-# maybe older versions of newlib will support it too, but this
-# needs to be checked
-config NEWLIB_CXA_ATEXIT
-    def_bool y
-    depends on NEWLIB_2_0_or_later
-    select LIBC_PROVIDES_CXA_ATEXIT
-
-config NEWLIB_HAS_NANO_MALLOC
-    def_bool y
-    depends on NEWLIB_2_1_or_later
-
-config NEWLIB_HAS_NANO_FORMATTED_IO
-    def_bool y
-    depends on NEWLIB_2_2_or_later
-
 config LIBC_NEWLIB_TARGET_CFLAGS
     string
     prompt "Target CFLAGS for newlib"
@@ -197,7 +183,6 @@ config LIBC_NEWLIB_LTO
 config LIBC_NEWLIB_NANO_MALLOC
     bool
     prompt "Enable Nano Malloc"
-    depends on NEWLIB_HAS_NANO_MALLOC
     help
       NEWLIB has two implementations of malloc family's functions, one in
       `mallocr.c' and the other one in `nano-mallocr.c'.  This options
@@ -208,7 +193,6 @@ config LIBC_NEWLIB_NANO_MALLOC
 config LIBC_NEWLIB_NANO_FORMATTED_IO
     bool
     prompt "Enable Nano Formatted I/O"
-    depends on NEWLIB_HAS_NANO_FORMATTED_IO
     help
       This builds NEWLIB with a special implementation of formatted I/O
       functions, designed to lower the size of application on small systems

config/libc/uClibc-ng.in

@@ -4,7 +4,7 @@
 ##
 ## select LIBC_SUPPORT_THREADS_LT
 ## select LIBC_SUPPORT_THREADS_NONE
-## select LIBC_SUPPORT_THREADS_NATIVE if UCLIBC_0_9_33_2_or_later
+## select LIBC_SUPPORT_THREADS_NATIVE
 ## select CC_CORE_PASS_1_NEEDED
 ##
 ## help The de-facto standard for embeded linux systems.
@@ -21,27 +21,6 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG"
 comment "You may experience issues, although it should work just fine"
 endif # ARCH_FLOAT_SOFTFP
 
-config LIBC_UCLIBC_HAS_SUNRPC
-    bool
-    default y if !UCLIBC_1_0_23_or_later
-
-config LIBC_UCLIBC_HAS_LIBICONV
-    bool
-    default y if UCLIBC_1_0_21_or_later
-
-config LIBC_UCLIBC_PARALLEL
-    def_bool y
-    depends on UCLIBC_0_9_33_2_or_later
-
-config LIBC_UCLIBC_NG
-    def_bool y
-    depends on UCLIBC_1_0_0_or_later
-
-# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
-config UCLIBC_MERGED_LINUXTHREADS
-    def_bool y
-    depends on UCLIBC_1_0_15_or_later
-
 choice
     bool
     prompt "uClibc verbosity:"
@@ -74,10 +53,8 @@ endchoice
 config LIBC_UCLIBC_VERBOSITY
     string
     default ""      if LIBC_UCLIBC_VERBOSITY_0
-    default "V=2"   if LIBC_UCLIBC_VERBOSITY_1 && LIBC_UCLIBC_NG
+    default "V=2"   if LIBC_UCLIBC_VERBOSITY_1
-    default "V=1"   if LIBC_UCLIBC_VERBOSITY_1
+    default "V=1"   if LIBC_UCLIBC_VERBOSITY_2
-    default "V=1"   if LIBC_UCLIBC_VERBOSITY_2 && LIBC_UCLIBC_NG
-    default "V=2"   if LIBC_UCLIBC_VERBOSITY_2
 
 choice
     bool
@@ -118,44 +95,6 @@ config LIBC_UCLIBC_CONFIG_FILE
 
       If the file is not provided, we fall back to a default config file.
 
-if THREADS_LT && !UCLIBC_MERGED_LINUXTHREADS
-
-choice
-    bool
-    prompt "Linuxthread implementation: "
-    default LIBC_UCLIBC_LNXTHRD_OLD
-
-config LIBC_UCLIBC_LNXTHRD_OLD
-    bool
-    prompt "old/stable"
-    help
-      From the uClibc config option help:
-        There are two versions of linuxthreads.  The older (stable) version
-        has been in uClibc for quite a long time but hasn't seen too many
-        updates other than bugfixes.
-
-config LIBC_UCLIBC_LNXTHRD_NEW
-    bool
-    prompt "new"
-    help
-      From the uClibc config option help:
-        The new version has not been tested much, and lacks ports for arches
-        which glibc does not support (like frv, etc...), but is based on
-        the latest code from glibc, so it may be the only choice for the
-        newer ports (like alpha/amd64/64bit arches and hppa).
-
-endchoice
-
-endif # THREADS_LT
-
-config LIBC_UCLIBC_LNXTHRD
-    string
-    default ""      if THREADS_NONE
-    default ""      if THREADS_NATIVE
-    default ""      if UCLIBC_MERGED_LINUXTHREADS
-    default "old"   if LIBC_UCLIBC_LNXTHRD_OLD
-    default "new"   if LIBC_UCLIBC_LNXTHRD_NEW
-
 config LIBC_UCLIBC_LOCALES
     bool
     select LIBC_UCLIBC_WCHAR
@@ -168,7 +107,6 @@ config LIBC_UCLIBC_LOCALES
 
 config LIBC_UCLIBC_LIBICONV
     bool "Enable iconv"
-    depends on LIBC_UCLIBC_HAS_LIBICONV
     help
       Say y if you want to enable <iconv.h> and the corresponding interfaces.
 
@@ -201,13 +139,6 @@ config LIBC_UCLIBC_FENV
       If you need fenv.h on other architectures, say 'y' here, but you may
       encounter some issues.
 
-config LIBC_UCLIBC_RPC
-    bool
-    prompt "Add support for RPC"
-    depends on LIBC_UCLIBC_HAS_SUNRPC
-    help
-      Enable support for remote procedure calls (RPC) in uClibc.
-
 config LIBC_UCLIBC_HAS_SSP
     bool
     prompt "Support stack smashing protection (SSP)"

packages/cloog/package.desc

@@ -1,5 +1,4 @@
 pkg_label='CLooG'
 repository='git git://repo.or.cz/cloog.git'
 mirrors='http://www.bastoul.net/cloog/pages/download'
-milestones='0.18.1 0.18.4'
 archive_formats='.tar.gz'

packages/gcc/package.desc

@@ -2,5 +2,5 @@ repository='svn svn://gcc.gnu.org/svn/gcc'
 mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})'
 relevantpattern='4.*|. *|.'
 origin='GNU'
-milestones='4.8 4.9 5 6 7 8 9 10 11'
+milestones='4.9 5 6 7 8 9 10 11'
 archive_formats='.tar.xz .tar.gz'

packages/gmp/package.desc

@@ -2,6 +2,5 @@ repository='hg https://gmplib.org/repo/gmp/'
 bootstrap='./.bootstrap'
 mirrors='https://gmplib.org/download/gmp https://gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)'
 relevantpattern='*.*|.'
-milestones='5.0.0 5.1.0'
 archive_formats='.tar.xz .tar.lz .tar.bz2'
 signature_format='packed/.sig'

packages/isl/package.desc

@@ -2,5 +2,5 @@ repository='git git://repo.or.cz/isl.git'
 bootstrap='./autogen.sh'
 mirrors='https://libisl.sourceforge.io'
 relevantpattern='*.*|.'
-milestones='0.12 0.13 0.14 0.15 0.18'
+milestones='0.15 0.18'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'

packages/make/package.desc

@@ -4,4 +4,3 @@ mirrors='$(CT_Mirrors GNU make)'
 relevantpattern='*.*|.'
 archive_formats='.tar.lz .tar.gz'
 signature_format='packed/.sig'
-milestones='4.0'

packages/mingw-w64/package.desc

@@ -1,6 +1,5 @@
 repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64'
 mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/'
 relevantpattern='v*.*|.'
-milestones='v4'
 archive_formats='.tar.bz2 .zip'
 signature_format='packed/.sig'

packages/mpfr/package.desc

@@ -5,4 +5,4 @@ mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)'
 relevantpattern='*.*|.'
 archive_formats='.tar.xz .tar.bz2 .tar.gz .zip'
 signature_format='packed/.asc'
-milestones='3.0.0 4.0.0'
+milestones='4.0.0'

packages/newlib-nano/package.desc

@@ -3,7 +3,6 @@ repository='git git://sourceware.org/git/newlib-cygwin.git'
 # Do not use "$(CT_Mirrors sourceware newlib)" here: the mirrors (kernel.org
 # and gnu.org) only store some older releases of newlib (2.0.0 and before).
 mirrors='ftp://sourceware.org/pub/newlib'
-milestones='2.0 2.1 2.2'
 relevantpattern='*.*|.*. *.*|.'
 archive_filename='newlib-@{version}'
 archive_dirname='newlib-@{version}'

packages/newlib/package.desc

@@ -3,6 +3,5 @@ repository='git git://sourceware.org/git/newlib-cygwin.git'
 # Do not use "$(CT_Mirrors sourceware newlib)" here: the mirrors (kernel.org
 # and gnu.org) only store some older releases of newlib (2.0.0 and before).
 mirrors='ftp://sourceware.org/pub/newlib'
-milestones='2.0 2.1 2.2'
 relevantpattern='*.*|.*. *.*|.'
 archive_formats='.tar.gz'

packages/uClibc-ng/package.desc

@@ -1,4 +1,3 @@
-master='uClibc'
 origin='uclibc-ng.org'
 repository='git git://uclibc-ng.org/git/uclibc-ng'
 mirrors='http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}'

packages/uClibc/config

@@ -1,277 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Version: 0.9.32-git
-# Fri Jul  9 22:31:59 2010
-#
-# TARGET_alpha is not set
-# TARGET_arm is not set
-# TARGET_avr32 is not set
-# TARGET_bfin is not set
-# TARGET_cris is not set
-# TARGET_e1 is not set
-# TARGET_frv is not set
-# TARGET_h8300 is not set
-# TARGET_hppa is not set
-# TARGET_i386 is not set
-# TARGET_i960 is not set
-# TARGET_ia64 is not set
-# TARGET_m68k is not set
-# TARGET_microblaze is not set
-# TARGET_mips is not set
-# TARGET_nios is not set
-# TARGET_nios2 is not set
-# TARGET_powerpc is not set
-# TARGET_sh is not set
-# TARGET_sh64 is not set
-# TARGET_sparc is not set
-# TARGET_v850 is not set
-# TARGET_vax is not set
-# TARGET_x86_64 is not set
-# TARGET_xtensa is not set
-# TARGET_c6x is not set
-
-# CONFIG_GENERIC_ARM is not set
-# CONFIG_ARM610 is not set
-# CONFIG_ARM710 is not set
-# CONFIG_ARM7TDMI is not set
-# CONFIG_ARM720T is not set
-# CONFIG_ARM920T is not set
-# CONFIG_ARM922T is not set
-# CONFIG_ARM926T is not set
-# CONFIG_ARM10T is not set
-# CONFIG_ARM1136JF_S is not set
-# CONFIG_ARM1176JZ_S is not set
-# CONFIG_ARM1176JZF_S is not set
-# CONFIG_ARM_CORTEX_M3 is not set
-# CONFIG_ARM_CORTEX_M1 is not set
-# CONFIG_ARM_SA110 is not set
-# CONFIG_ARM_SA1100 is not set
-# CONFIG_ARM_XSCALE is not set
-# CONFIG_ARM_IWMMXT is not set
-
-# COMPILE_IN_THUMB_MODE is not set
-USE_BX=y
-
-TARGET_SUBARCH=""
-#
-# Target Architecture Features and Options
-#
-TARGET_ARCH="none"
-FORCE_OPTIONS_FOR_ARCH=y
-#
-# Using ELF file format
-#
-# ARCH_LITTLE_ENDIAN is not set
-# ARCH_BIG_ENDIAN is not set
-# ARCH_WANTS_LITTLE_ENDIAN is not set
-# ARCH_WANTS_BIG_ENDIAN is not set
-ARCH_HAS_MMU=y
-ARCH_USE_MMU=y
-UCLIBC_HAS_FLOATS=y
-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="/usr/src/linux/include"
-HAVE_DOT_CONFIG=y
-
-#
-# General Library Settings
-#
-# HAVE_NO_PIC is not set
-DOPIC=y
-# ARCH_HAS_NO_SHARED is not set
-# ARCH_HAS_NO_LDSO is not set
-# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
-LDSO_LDD_SUPPORT=y
-# LDSO_CACHE_SUPPORT is not set
-LDSO_PRELOAD_ENV_SUPPORT=y
-# LDSO_PRELOAD_FILE_SUPPORT is not set
-# LDSO_STANDALONE_SUPPORT is not set
-# LDSO_PRELINK_SUPPORT is not set
-# UCLIBC_STATIC_LDCONFIG is not set
-LDSO_RUNPATH=y
-LDSO_SEARCH_INTERP_PATH=y
-LDSO_LD_LIBRARY_PATH=y
-# LDSO_NO_CLEANUP is not set
-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_THREADS_NATIVE is not set
-UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
-UCLIBC_HAS_SYSLOG=y
-UCLIBC_HAS_LFS=y
-# MALLOC is not set
-# MALLOC_SIMPLE is not set
-MALLOC_STANDARD=y
-MALLOC_GLIBC_COMPAT=y
-UCLIBC_DYNAMIC_ATEXIT=y
-# COMPAT_ATEXIT is not set
-UCLIBC_SUSV3_LEGACY=y
-# UCLIBC_SUSV3_LEGACY_MACROS is not set
-UCLIBC_SUSV4_LEGACY=y
-# UCLIBC_STRICT_HEADERS is not set
-# UCLIBC_HAS_STUBS is not set
-UCLIBC_HAS_SHADOW=y
-UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-UCLIBC_HAS___PROGNAME=y
-UCLIBC_HAS_PTY=y
-ASSUME_DEVPTS=y
-UNIX98PTY_ONLY=y
-UCLIBC_HAS_GETPT=y
-UCLIBC_HAS_LIBUTIL=y
-UCLIBC_HAS_TM_EXTENSIONS=y
-UCLIBC_HAS_TZ_CACHING=y
-UCLIBC_HAS_TZ_FILE=y
-UCLIBC_HAS_TZ_FILE_READ_MANY=y
-UCLIBC_TZ_FILE_PATH="/etc/TZ"
-UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
-
-#
-# Advanced Library Settings
-#
-UCLIBC_PWD_BUFFER_SIZE=256
-UCLIBC_GRP_BUFFER_SIZE=256
-
-#
-# Support various families of functions
-#
-UCLIBC_LINUX_MODULE_26=y
-# UCLIBC_LINUX_MODULE_24 is not set
-UCLIBC_LINUX_SPECIFIC=y
-UCLIBC_HAS_GNU_ERROR=y
-UCLIBC_BSD_SPECIFIC=y
-UCLIBC_HAS_BSD_ERR=y
-# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-# UCLIBC_NTP_LEGACY is not set
-# UCLIBC_SV4_DEPRECATED is not set
-UCLIBC_HAS_REALTIME=y
-UCLIBC_HAS_ADVANCED_REALTIME=y
-UCLIBC_HAS_EPOLL=y
-UCLIBC_HAS_XATTR=y
-UCLIBC_HAS_PROFILING=y
-UCLIBC_HAS_CRYPT_IMPL=y
-# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
-# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
-UCLIBC_HAS_CRYPT=y
-UCLIBC_HAS_NETWORK_SUPPORT=y
-UCLIBC_HAS_SOCKET=y
-UCLIBC_HAS_IPV4=y
-# UCLIBC_HAS_IPV6 is not set
-# UCLIBC_HAS_RPC is not set
-# UCLIBC_HAS_FULL_RPC is not set
-# UCLIBC_HAS_REENTRANT_RPC is not set
-UCLIBC_USE_NETLINK=y
-UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-# UCLIBC_HAS_BSD_RES_CLOSE is not set
-UCLIBC_HAS_COMPAT_RES_STATE=y
-# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-UCLIBC_HAS_RESOLVER_SUPPORT=y
-UCLIBC_HAS_LIBRESOLV_STUB=y
-UCLIBC_HAS_LIBNSL_STUB=y
-
-#
-# String and Stdio Support
-#
-UCLIBC_HAS_STRING_GENERIC_OPT=y
-UCLIBC_HAS_STRING_ARCH_OPT=y
-UCLIBC_HAS_CTYPE_TABLES=y
-UCLIBC_HAS_CTYPE_SIGNED=y
-# UCLIBC_HAS_CTYPE_UNSAFE is not set
-UCLIBC_HAS_CTYPE_CHECKED=y
-# UCLIBC_HAS_CTYPE_ENFORCED is not set
-# UCLIBC_HAS_WCHAR is not set
-# UCLIBC_HAS_LOCALE is not set
-UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
-UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-# USE_OLD_VFPRINTF is not set
-UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-UCLIBC_HAS_STDIO_GETC_MACRO=y
-UCLIBC_HAS_STDIO_PUTC_MACRO=y
-UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
-UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
-UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-UCLIBC_HAS_PRINTF_M_SPEC=y
-UCLIBC_HAS_ERRNO_MESSAGES=y
-# UCLIBC_HAS_SYS_ERRLIST is not set
-UCLIBC_HAS_SIGNUM_MESSAGES=y
-# UCLIBC_HAS_SYS_SIGLIST is not set
-UCLIBC_HAS_GNU_GETOPT=y
-UCLIBC_HAS_GNU_GETSUBOPT=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 is not set
-UCLIBC_HAS_NFTW=y
-UCLIBC_HAS_FTW=y
-# UCLIBC_HAS_FTS is not set
-UCLIBC_HAS_GLOB=y
-UCLIBC_HAS_GNU_GLOB=y
-UCLIBC_HAS_UTMPX=y
-
-#
-# Library Installation Options
-#
-RUNTIME_PREFIX="/"
-DEVEL_PREFIX="/usr/"
-MULTILIB_DIR="lib"
-HARDWIRED_ABSPATH=y
-
-#
-# Security options
-#
-# UCLIBC_BUILD_PIE is not set
-# UCLIBC_HAS_ARC4RANDOM is not set
-# HAVE_NO_SSP is not set
-UCLIBC_HAS_SSP=y
-# UCLIBC_HAS_SSP_COMPAT is not set
-# SSP_QUICK_CANARY is not set
-PROPOLICE_BLOCK_ABRT=y
-# PROPOLICE_BLOCK_SEGV is not set
-# UCLIBC_BUILD_SSP is not set
-UCLIBC_BUILD_RELRO=y
-UCLIBC_BUILD_NOW=y
-UCLIBC_BUILD_NOEXECSTACK=y
-
-#
-# uClibc development/debugging options
-#
-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
-# SUPPORT_LD_DEBUG_EARLY is not set
-# UCLIBC_MALLOC_DEBUGGING is not set
-# UCLIBC_HAS_BACKTRACE is not set
-WARNINGS="-Wall"
-# EXTRA_WARNINGS is not set
-# DOMULTI is not set
-# UCLIBC_MJN3_ONLY is not set

packages/uClibc/package.desc

@@ -1,8 +0,0 @@
-# Even though this is the "master" package, we really want to steer the users
-# towards uClibc-ng, as the original uClibc is no longer maintained.
-preferred='uClibc-ng'
-origin='uclibc.org'
-repository='git git://git.busybox.net/uClibc'
-mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases'
-milestones='0.9.33.2 1.0.0 1.0.15 1.0.21 1.0.23'
-archive_formats='.tar.xz .tar.bz2'

scripts/build/arch/arm.sh

@@ -16,7 +16,7 @@ CT_DoArchTupleValues() {
     # The system part of the tuple:
     case "${CT_LIBC},${CT_ARCH_ARM_EABI}" in
         glibc,y)    CT_TARGET_SYS=gnueabi;;
-        uClibc,y)   CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;;
+        uClibc-ng,y)CT_TARGET_SYS=uclibc${CT_LIBC_UCLIBC_USE_GNU_SUFFIX:+gnu}eabi;;
         musl,y)     CT_TARGET_SYS=musleabi;;
         bionic,y)   CT_TARGET_SYS=androideabi;;
         *,y)        CT_TARGET_SYS=eabi;;

scripts/build/arch/powerpc.sh

@@ -14,7 +14,7 @@ CT_DoArchTupleValues () {
             case "${CT_LIBC}" in
                 none|newlib|picolibc)    CT_TARGET_SYS="elfspe";;
                 *glibc)         CT_TARGET_SYS="gnuspe";;
-                uClibc)         CT_TARGET_SYS="uclibcgnuspe";;
+                uClibc-ng)      CT_TARGET_SYS="uclibcgnuspe";;
             esac
             ;;
     esac

scripts/build/companion_libs/100-gmp.sh

@@ -109,12 +109,6 @@ do_gmp_backend() {
 
     CT_DoLog EXTRA "Configuring GMP"
 
-    # FIXME is it needed even for older versions? They seem to compile fine
-    # without it.
-    if [ "${CT_GMP_HAS_MPBSD}" = "y" ]; then
-        extra_config+=("--enable-mpbsd")
-    fi
-
     # To avoind “illegal text-relocation” linking error against
     # the static library, see:
     #     https://github.com/Homebrew/homebrew-core/pull/25470

scripts/build/companion_libs/121-isl.sh

@@ -84,15 +84,6 @@ do_isl_backend() {
 
     CT_DoLog EXTRA "Configuring ISL"
 
-    if [ "${CT_ISL_NEEDS_WITH_GMP}" != "y" ]; then
-        extra_config+=("--with-libgmp-prefix=${prefix}")
-        extra_config+=("--with-libgmpxx-prefix=${prefix}")
-    fi
-
-    if [ "${CT_ISL_HAS_WITH_PIPLIB}" != "y" ]; then
-        extra_config+=("--with-piplib=no")
-    fi
-
     CT_DoExecLog CFG                                \
     CFLAGS="${cflags}"                              \
     CXXFLAGS="${cxxflags}"                          \

scripts/build/debug/400-ltrace.sh

@@ -19,32 +19,12 @@ do_debug_ltrace_build() {
     CT_Pushd "${CT_BUILD_DIR}/build-ltrace"
 
     CT_DoLog EXTRA "Configuring ltrace"
-    # ltrace-0.5.3 has a unique hand-crafted configure script. Releases
-    # 0.5.2 and earlier as well as 0.6.0 and later use GNU autotools.
-    if [ "${LTRACE_0_5_3_CONFIGURE}" = "y" ]; then
-        case "${CT_ARCH}:${CT_ARCH_BITNESS}" in
-            x86:32)     ltrace_host="i386";;
-            x86:64)     ltrace_host="x86_64";;
-            powerpc:*)  ltrace_host="ppc";;
-            mips:*)     ltrace_host="mipsel";;
-            *)          ltrace_host="${CT_ARCH}";;
-        esac
-        CT_DoExecLog CFG                \
-        CC="${CT_TARGET}-${CT_CC}"      \
-        AR="${CT_TARGET}-ar"            \
-        HOST="${ltrace_host}"           \
-        HOST_OS="${CT_TARGET_KERNEL}"   \
-        CFLAGS="${CT_ALL_TARGET_CFLAGS}"\
-        ${CONFIG_SHELL}                 \
-        ./configure --prefix=/usr
-    else
     CT_DoExecLog CFG        \
     ${CONFIG_SHELL}         \
     ./configure             \
         --build=${CT_BUILD} \
         --host=${CT_TARGET} \
         --prefix=/usr
-    fi
 
     CT_DoLog EXTRA "Building ltrace"
     CT_DoExecLog ALL make

scripts/build/libc/mingw-w64.sh

@@ -56,7 +56,6 @@ mingw_w64_start_files() {
 
 do_check_mingw_vendor_tuple()
 {
-    if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then
    CT_DoStep INFO "Checking configured vendor tuple"
    if [ ${CT_TARGET_VENDOR} = "w64" ]; then
        CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
@@ -64,7 +63,6 @@ do_check_mingw_vendor_tuple()
        CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
    fi
    CT_EndStep
-    fi
 }
 
 do_mingw_tools()

scripts/build/libc/uClibc-ng.sh

@@ -3,21 +3,21 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 # Build and install headers and start files
-uClibc_start_files()
+uClibc_ng_start_files()
 {
     # Start files and Headers should be configured the same way as the
     # final libc, but built and installed differently.
-    uClibc_backend libc_mode=startfiles
+    uClibc_ng_backend libc_mode=startfiles
 }
 
 # This function builds and install the full C library
-uClibc_main()
+uClibc_ng_main()
 {
-    uClibc_backend libc_mode=final
+    uClibc_ng_backend libc_mode=final
 }
 
 # Common backend for 1st and 2nd passes.
-uClibc_backend()
+uClibc_ng_backend()
 {
     local libc_mode
     local arg
@@ -33,33 +33,26 @@ uClibc_backend()
     esac
 
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc-${libc_mode}"
-    CT_IterateMultilibs uClibc_backend_once multilib libc_mode="${libc_mode}"
+    CT_IterateMultilibs uClibc_ng_backend_once multilib libc_mode="${libc_mode}"
     CT_Popd
     CT_EndStep
 }
 
 # Common backend for 1st and 2nd passes, once per multilib.
-uClibc_backend_once()
+uClibc_ng_backend_once()
 {
     local libc_mode
     local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count
     local multilib_dir startfiles_dir
-    local jflag=${CT_LIBC_UCLIBC_PARALLEL:+${CT_JOBSFLAGS}}
+    local jflag=${CT_JOBSFLAGS}
     local -a make_args
     local extra_cflags f cfg_cflags cf
     local hdr_install_subdir
-    local uClibc_name
 
     for arg in "$@"; do
         eval "${arg// /\\ }"
     done
 
-    if [ "${CT_UCLIBC_USE_UCLIBC_NG_ORG}" = "y" ]; then
-        uClibc_name="uClibc-ng"
-    elif [ "${CT_UCLIBC_USE_UCLIBC_ORG}" = "y" ]; then
-        uClibc_name="uClibc"
-    fi
-
     CT_DoStep INFO "Building for multilib ${multi_index}/${multi_count}: '${multi_flags}'"
 
     multilib_dir="lib/${multi_os_dir}"
@@ -86,7 +79,7 @@ uClibc_backend_once()
 
     # Simply copy files until uClibc has the ability to build out-of-tree
     CT_DoLog EXTRA "Copying sources to build dir"
-    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc/." .
+    CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/uClibc-ng/." .
 
     # Force the date of the pregen locale data, as the
     # newer ones that are referenced are not available
@@ -94,7 +87,7 @@ uClibc_backend_once()
 
     # Use the default config if the user did not provide one.
     if [ -z "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
-        CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/packages/${uClibc_name}/config"
+        CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/packages/uClibc-ng/config"
     fi
 
     manage_uClibc_config "${CT_LIBC_UCLIBC_CONFIG_FILE}" .config "${multi_flags}"
@@ -350,28 +343,19 @@ manage_uClibc_config()
     CT_KconfigDisableOption "LINUXTHREADS_OLD" "${dst}"
     CT_KconfigDisableOption "LINUXTHREADS_NEW" "${dst}"
     CT_KconfigDisableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
-    case "${CT_THREADS}:${CT_LIBC_UCLIBC_LNXTHRD}" in
+    case "${CT_THREADS}" in
-        none:)
+        none)
             ;;
-        linuxthreads:)
+        linuxthreads)
-            # Newer version of uClibc-ng, no old/new dichotomy
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
             CT_KconfigEnableOption "UCLIBC_HAS_LINUXTHREADS" "${dst}"
             ;;
-        linuxthreads:old)
+        nptl)
-            CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
-            CT_KconfigEnableOption "LINUXTHREADS_OLD" "${dst}"
-            ;;
-        linuxthreads:new)
-            CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
-            CT_KconfigEnableOption "LINUXTHREADS_NEW" "${dst}"
-            ;;
-        nptl:)
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS_NATIVE" "${dst}"
             ;;
         *)
-            CT_Abort "Incorrect thread settings: CT_THREADS='${CT_THREAD}' CT_LIBC_UCLIBC_LNXTHRD='${CT_LIBC_UCLIBC_LNXTHRD}'"
+            CT_Abort "Incorrect thread settings: CT_THREADS='${CT_THREADS}'"
             ;;
     esac
 
@@ -420,7 +404,7 @@ manage_uClibc_config()
     CT_DoExecLog ALL cp "${dst}" "${dst}.created-by-ct-ng"
 }
 
-uClibc_post_cc()
+uClibc_ng_post_cc()
 {
     # uClibc and GCC disagree where the dynamic linker lives. uClibc always
     # places it in the MULTILIB_DIR, while gcc does that for *some* variants

scripts/functions

@@ -1132,7 +1132,7 @@ CT_DoBuildTargetTuple()
     # values.
     case "${CT_LIBC}" in
         glibc)       CT_TARGET_SYS=gnu;;
-        uClibc)      CT_TARGET_SYS=uclibc;;
+        uClibc-ng)   CT_TARGET_SYS=uclibc;;
         musl)        CT_TARGET_SYS=musl;;
         bionic)      CT_TARGET_SYS=android;;
         none|newlib|picolibc) CT_TARGET_SYS=elf;;