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>

8 files changed, 32 insertions, 85 deletions

diff --git a/scripts/build/arch/arm.sh b/scripts/build/arch/arm.sh
index 9a53bc44..01a40bdd 100644
--- a/scripts/build/arch/arm.sh
+++ b/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;;
diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh
index 85c64d16..245adbe3 100644
--- a/scripts/build/arch/powerpc.sh
+++ b/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
diff --git a/scripts/build/companion_libs/100-gmp.sh b/scripts/build/companion_libs/100-gmp.sh
index 36557870..a17eda9a 100644
--- a/scripts/build/companion_libs/100-gmp.sh
+++ b/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
diff --git a/scripts/build/companion_libs/121-isl.sh b/scripts/build/companion_libs/121-isl.sh
index 8b1b7203..3577b756 100644
--- a/scripts/build/companion_libs/121-isl.sh
+++ b/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}"                          \
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 3f08226f..9c9052ae 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/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_DoExecLog CFG        \
+    ${CONFIG_SHELL}         \
+    ./configure             \
+        --build=${CT_BUILD} \
+        --host=${CT_TARGET} \
+        --prefix=/usr
 
     CT_DoLog EXTRA "Building ltrace"
     CT_DoExecLog ALL make
diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh
index 683f8be9..60f514af 100644
--- a/scripts/build/libc/mingw-w64.sh
+++ b/scripts/build/libc/mingw-w64.sh
@@ -56,15 +56,13 @@ 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."
-       else
-           CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
-       fi
-       CT_EndStep
-    fi
+   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."
+   else
+       CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
+   fi
+   CT_EndStep
 }
 
 do_mingw_tools()
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc-ng.sh
index 43285426..16ebc2c9 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/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
-        none:)
+    case "${CT_THREADS}" in
+        none)
             ;;
-        linuxthreads:)
-            # Newer version of uClibc-ng, no old/new dichotomy
+        linuxthreads)
             CT_KconfigEnableOption "UCLIBC_HAS_THREADS" "${dst}"
             CT_KconfigEnableOption "UCLIBC_HAS_LINUXTHREADS" "${dst}"
             ;;
-        linuxthreads:old)
-            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:)
+        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
diff --git a/scripts/functions b/scripts/functions
index da909800..24463428 100644
--- a/scripts/functions
+++ b/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;;