summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2022-01-05 08:37:45 (GMT)
committerAlexey Neyman <stilor@att.net>2022-02-11 08:47:50 (GMT)
commitcc6b7fad46f5cb3d84cf87ae47c5f723803a67a3 (patch)
treebc5ebd566bc39ffe8a8600bbaf66c91d1316aec1 /config
parent4c6604e730ee786709e8c39ab9e54eec06990e49 (diff)
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>
Diffstat (limited to 'config')
-rw-r--r--config/cc/gcc.in9
-rw-r--r--config/comp_libs/gmp.in4
-rw-r--r--config/comp_libs/isl.in12
-rw-r--r--config/comp_libs/mpc.in3
-rw-r--r--config/comp_libs/newlib-nano.in18
-rw-r--r--config/debug/gdb.in.native8
-rw-r--r--config/debug/ltrace.in7
-rw-r--r--config/libc/glibc.in1
-rw-r--r--config/libc/mingw-w64.in4
-rw-r--r--config/libc/newlib.in18
-rw-r--r--config/libc/uClibc-ng.in (renamed from config/libc/uClibc.in)75
11 files changed, 11 insertions, 148 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index e068afd..742d563 100644
--- a/config/cc/gcc.in
+++ b/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:
diff --git a/config/comp_libs/gmp.in b/config/comp_libs/gmp.in
index 7270244..f49d1a7 100644
--- a/config/comp_libs/gmp.in
+++ b/config/comp_libs/gmp.in
@@ -1,5 +1 @@
# GMP options
-
-config GMP_HAS_MPBSD
- bool
- default y if !GMP_5_1_0_or_later
diff --git a/config/comp_libs/isl.in b/config/comp_libs/isl.in
index fe6fa8d..22b0cad 100644
--- a/config/comp_libs/isl.in
+++ b/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
diff --git a/config/comp_libs/mpc.in b/config/comp_libs/mpc.in
index 2ea3c0c..422935f 100644
--- a/config/comp_libs/mpc.in
+++ b/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
diff --git a/config/comp_libs/newlib-nano.in b/config/comp_libs/newlib-nano.in
index 5a81fde..e7ef6f7 100644
--- a/config/comp_libs/newlib-nano.in
+++ b/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
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index 7ac8ec2..b4721c8 100644
--- a/config/debug/gdb.in.native
+++ b/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_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later
+ select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_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_IPV6 if LIBC_UCLIBC && GDB_8_3_or_later
+ select LIBC_UCLIBC_WCHAR if LIBC_UCLIBC_NG && GDB_8_0_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.
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 1cdd157..75bdf4f 100644
--- a/config/debug/ltrace.in
+++ b/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
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 63c31f6..39c2c20 100644
--- a/config/libc/glibc.in
+++ b/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
diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
index d176e47..1880f08 100644
--- a/config/libc/mingw-w64.in
+++ b/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
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index ce426da..83ae4b1 100644
--- a/config/libc/newlib.in
+++ b/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
diff --git a/config/libc/uClibc.in b/config/libc/uClibc-ng.in
index c88bbc8..705c0d4 100644
--- a/config/libc/uClibc.in
+++ b/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=1" if LIBC_UCLIBC_VERBOSITY_1
- default "V=1" if LIBC_UCLIBC_VERBOSITY_2 && LIBC_UCLIBC_NG
- default "V=2" if LIBC_UCLIBC_VERBOSITY_2
+ default "V=2" if LIBC_UCLIBC_VERBOSITY_1
+ default "V=1" 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)"