summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/arch/xtensa.in2
-rw-r--r--config/cc/gcc.in23
-rw-r--r--config/cc/gcc.in.211
-rw-r--r--config/companion_libs/gettext.in6
-rw-r--r--config/companion_tools.in42
-rw-r--r--config/companion_tools/autoconf.in26
-rw-r--r--config/companion_tools/automake.in36
-rw-r--r--config/companion_tools/libtool.in21
-rw-r--r--config/companion_tools/m4.in26
-rw-r--r--config/companion_tools/make.in41
-rw-r--r--config/config.mk19
-rw-r--r--config/debug/dmalloc.in1
-rw-r--r--config/debug/duma.in4
-rw-r--r--config/kernel/linux.in54
-rw-r--r--config/libc.in14
-rw-r--r--config/libc/avr-libc.in5
-rw-r--r--config/libc/glibc.in6
-rw-r--r--config/libc/mingw.in4
-rw-r--r--config/libc/uClibc.in35
-rw-r--r--config/libc/uClibc.in.24
20 files changed, 292 insertions, 88 deletions
diff --git a/config/arch/xtensa.in b/config/arch/xtensa.in
index e08b842..3ffa4e8 100644
--- a/config/arch/xtensa.in
+++ b/config/arch/xtensa.in
@@ -1,6 +1,8 @@
# xtensa specific configuration file
## select ARCH_SUPPORTS_32
+## select ARCH_SUPPORTS_BOTH_ENDIAN
+## select ARCH_DEFAULT_LE
## select ARCH_SUPPORTS_BOTH_MMU
## select ARCH_DEFAULT_HAS_MMU
##
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 101f2b2..691355a 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -54,15 +54,15 @@ config CC_GCC_SHOW_LINARO
help
Linaro is maintaining some advanced/more stable/experimental versions
of gcc, especially for the ARM architecture.
-
+
Those versions have not been blessed by the gcc comunity (nor have they
been cursed either!), but they look to be pretty much stable, and even
more stable than the upstream versions. YMMV...
-
+
If you do not know what this Linaro stuff is, then simply say 'n' here,
and rest in peace. OTOH, if you know what you are doing, you will be
able to use and enjoy :-) the Linaro versions by saying 'y' here.
-
+
Linaro: http://www.linaro.org/
choice
@@ -71,9 +71,9 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
-config CC_GCC_V_6_1_0
+config CC_GCC_V_6_2_0
bool
- prompt "6.1.0"
+ prompt "6.2.0"
select CC_GCC_6
config CC_GCC_V_5_4_0
@@ -93,9 +93,9 @@ config CC_GCC_V_linaro_4_9
depends on CC_GCC_SHOW_LINARO
select CC_GCC_4_9
-config CC_GCC_V_4_9_3
+config CC_GCC_V_4_9_4
bool
- prompt "4.9.3"
+ prompt "4.9.4"
select CC_GCC_4_9
config CC_GCC_V_linaro_4_8
@@ -160,6 +160,7 @@ config CC_GCC_5
select CC_GCC_HAS_LNK_HASH_STYLE
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
+ select CC_GCC_HAS_LIBMPX
select CC_SUPPORT_GOLANG
config CC_GCC_5_or_later
@@ -178,6 +179,7 @@ config CC_GCC_6
select CC_GCC_HAS_LNK_HASH_STYLE
select CC_GCC_HAS_LIBQUADMATH
select CC_GCC_HAS_LIBSANITIZER
+ select CC_GCC_HAS_LIBMPX
select CC_SUPPORT_GOLANG
config CC_GCC_6_or_later
@@ -276,17 +278,20 @@ config CC_GCC_HAS_LIBQUADMATH
config CC_GCC_HAS_LIBSANITIZER
bool
+config CC_GCC_HAS_LIBMPX
+ bool
+
if ! CC_GCC_CUSTOM
config CC_GCC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "6.1.0" if CC_GCC_V_6_1_0
+ default "6.2.0" if CC_GCC_V_6_2_0
default "5.4.0" if CC_GCC_V_5_4_0
default "linaro-5.2-2015.11-2" if CC_GCC_V_linaro_5_2
default "linaro-4.9-2015.06" if CC_GCC_V_linaro_4_9
- default "4.9.3" if CC_GCC_V_4_9_3
+ default "4.9.4" if CC_GCC_V_4_9_4
default "linaro-4.8-2015.06" if CC_GCC_V_linaro_4_8
default "4.8.5" if CC_GCC_V_4_8_5
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index c200d22..2c5d45e 100644
--- a/config/cc/gcc.in.2
+++ b/config/cc/gcc.in.2
@@ -182,6 +182,17 @@ config CC_GCC_LIBSANITIZER
The default is 'N'. Say 'Y' if you need it, and report success/failure.
+config CC_GCC_LIBMPX
+ bool
+ default y
+ prompt "Compile libmpx"
+ depends on CC_GCC_HAS_LIBMPX
+ depends on ARCH_x86
+ # MUSL does not define libc types that GCC requires. Mingw lacks certain headers.
+ depends on !LIBC_musl && ! LIBC_mingw
+ help
+ Enable GCC support for Intel Memory Protection Extensions (MPX).
+
#-----------------------------------------------------------------------------
comment "Misc. obscure options."
diff --git a/config/companion_libs/gettext.in b/config/companion_libs/gettext.in
index ef5e5a5..3a46b58 100644
--- a/config/companion_libs/gettext.in
+++ b/config/companion_libs/gettext.in
@@ -6,9 +6,9 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
-config GETTEXT_V_0_19_6
+config GETTEXT_V_0_19_7
bool
- prompt "0.19.6"
+ prompt "0.19.7"
endchoice
@@ -16,4 +16,4 @@ config GETTEXT_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "0.19.6" if GETTEXT_V_0_19_6
+ default "0.19.7" if GETTEXT_V_0_19_7
diff --git a/config/companion_tools.in b/config/companion_tools.in
index f922388..1df9802 100644
--- a/config/companion_tools.in
+++ b/config/companion_tools.in
@@ -2,14 +2,9 @@
menu "Companion tools"
-# Tools that require make-3.81 to build should select this:
-config COMP_TOOLS_make_3_81_NEEDED
- bool
-
config COMP_TOOLS_FORCE_make_3_81
def_bool y
- depends on COMP_TOOLS_make_3_81_NEEDED
- depends on ! CONFIGURE_has_make381
+ depends on ! CONFIGURE_has_make_3_81_or_newer
select COMP_TOOLS
select COMP_TOOLS_make
@@ -20,7 +15,7 @@ config COMP_TOOLS
prompt "Build some companion tools"
help
Crosstool-NG relies on some external tools to be recent enough, namely:
- make = 3.81 (in some cases)
+ make >= 3.81
m4 >= 1.4.12
autoconf >= 2.63
automake >= 1.10.2
@@ -29,33 +24,16 @@ config COMP_TOOLS
If your system has older versions, we can build them for you,
but you are strongly encouraged to update your system instead!
-if COMP_TOOLS
-
-config COMP_TOOLS_make
- bool
- prompt "make"
-
-config COMP_TOOLS_make_gmake
- bool
- prompt "Add gmake symlink to companion gnu/make"
- depends on COMP_TOOLS_make
-
-config COMP_TOOLS_m4
+config COMP_TOOLS_FOR_HOST
bool
- prompt "m4"
-
-config COMP_TOOLS_autoconf
- bool
- prompt "autoconf"
-
-config COMP_TOOLS_automake
- bool
- prompt "automake"
-
-config COMP_TOOLS_libtool
- bool
- prompt "libtool"
+ prompt "Install companion tools for host"
+ help
+ Enable this option if you want to include the selected companion
+ tools into the final toolchain (rather than just using them
+ to build it).
+if COMP_TOOLS || COMP_TOOLS_FOR_HOST
+source "config.gen/companion_tools.in"
endif
endmenu
diff --git a/config/companion_tools/autoconf.in b/config/companion_tools/autoconf.in
new file mode 100644
index 0000000..3b33df6
--- /dev/null
+++ b/config/companion_tools/autoconf.in
@@ -0,0 +1,26 @@
+# Autoconf
+
+## help Autoconf
+
+choice
+ bool
+ prompt "Autoconf version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config AUTOCONF_V_2_69
+ bool
+ prompt "2.69"
+
+config AUTOCONF_V_2_65
+ bool
+ prompt "2.65"
+
+endchoice
+
+config AUTOCONF_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "2.69" if AUTOCONF_V_2_69
+ default "2.65" if AUTOCONF_V_2_65
diff --git a/config/companion_tools/automake.in b/config/companion_tools/automake.in
new file mode 100644
index 0000000..500ae14
--- /dev/null
+++ b/config/companion_tools/automake.in
@@ -0,0 +1,36 @@
+# Automake
+
+## help Automake
+
+choice
+ bool
+ prompt "Automake version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config AUTOMAKE_V_1_15
+ bool
+ prompt "1.15"
+
+config AUTOMAKE_V_1_14
+ bool
+ prompt "1.14"
+
+config AUTOMAKE_V_1_11_6
+ bool
+ prompt "1.11.6"
+
+config AUTOMAKE_V_1_11_1
+ bool
+ prompt "1.11.1"
+
+endchoice
+
+config AUTOMAKE_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "1.15" if AUTOMAKE_V_1_15
+ default "1.14" if AUTOMAKE_V_1_14
+ default "1.11.6" if AUTOMAKE_V_1_11_6
+ default "1.11.1" if AUTOMAKE_V_1_11_1
diff --git a/config/companion_tools/libtool.in b/config/companion_tools/libtool.in
new file mode 100644
index 0000000..62e6ee1
--- /dev/null
+++ b/config/companion_tools/libtool.in
@@ -0,0 +1,21 @@
+# Libtool
+
+## help Libtool
+
+choice
+ bool
+ prompt "Libtool version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config LIBTOOL_V_2_4_6
+ bool
+ prompt "2.4.6"
+
+endchoice
+
+config LIBTOOL_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "2.4.6" if LIBTOOL_V_2_4_6
diff --git a/config/companion_tools/m4.in b/config/companion_tools/m4.in
new file mode 100644
index 0000000..b99a466
--- /dev/null
+++ b/config/companion_tools/m4.in
@@ -0,0 +1,26 @@
+# GNU m4
+
+## help GNU m4
+
+choice
+ bool
+ prompt "m4 version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config M4_V_1_4_17
+ bool
+ prompt "1.4.17"
+
+config M4_V_1_4_13
+ bool
+ prompt "1.4.13"
+
+endchoice
+
+config M4_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "1.4.17" if M4_V_1_4_17
+ default "1.4.13" if M4_V_1_4_13
diff --git a/config/companion_tools/make.in b/config/companion_tools/make.in
new file mode 100644
index 0000000..0935cd8
--- /dev/null
+++ b/config/companion_tools/make.in
@@ -0,0 +1,41 @@
+# GNU make
+
+## help GNU make
+
+choice
+ bool
+ prompt "make version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
+
+config MAKE_V_4_2_1
+ bool
+ prompt "4.2.1"
+
+config MAKE_V_4_1
+ bool
+ prompt "4.1"
+
+config MAKE_V_4_0
+ bool
+ prompt "4.0"
+
+config MAKE_V_3_81
+ bool
+ prompt "3.81"
+
+endchoice
+
+config MAKE_GMAKE_SYMLINK
+ bool
+ prompt "Add gmake symlink to companion gnu/make"
+ depends on COMP_TOOLS_make
+
+config MAKE_VERSION
+ string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
+ default "4.2.1" if MAKE_V_4_2_1
+ default "4.1" if MAKE_V_4_1
+ default "4.0" if MAKE_V_4_0
+ default "3.81" if MAKE_V_3_81
diff --git a/config/config.mk b/config/config.mk
index 669e157..670ecba 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -26,14 +26,16 @@ BINUTILS_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LI
LIBC_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/libc/*.in)))
LIBC_CONFIG_FILES_2 = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/libc/*.in.2)))
DEBUG_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/debug/*.in)))
+COMP_TOOLS_CONFIG_FILES = $(patsubst $(CT_LIB_DIR)/%,%,$(sort $(wildcard $(CT_LIB_DIR)/config/companion_tools/*.in)))
# Build the list of generated config files
-GEN_CONFIG_FILES = config.gen/arch.in \
- config.gen/kernel.in \
- config.gen/cc.in \
- config.gen/binutils.in \
- config.gen/libc.in \
- config.gen/debug.in
+GEN_CONFIG_FILES = config.gen/arch.in \
+ config.gen/kernel.in \
+ config.gen/cc.in \
+ config.gen/binutils.in \
+ config.gen/libc.in \
+ config.gen/debug.in \
+ config.gen/companion_tools.in
# ... and how to access them:
# Generated files depends on the gen_in_frags script because it has the
# functions needed to build the genrated files, and thus they might need
@@ -67,6 +69,7 @@ CCS = $(patsubst config/cc/%.in,%,$(CC_CONFIG_FILES))
BINUTILSS = $(patsubst config/binutils/%.in,%,$(BINUTILS_CONFIG_FILES))
LIBCS = $(patsubst config/libc/%.in,%,$(LIBC_CONFIG_FILES))
DEBUGS = $(patsubst config/debug/%.in,%,$(DEBUG_CONFIG_FILES))
+COMP_TOOLS= $(patsubst config/companion_tools/%.in,%,$(COMP_TOOLS_CONFIG_FILES))
#-----------------------------------------------------------
# The rules for the generated config files
@@ -97,6 +100,10 @@ config.gen/debug.in: $(DEBUG_CONFIG_FILES)
@$(CT_ECHO) ' IN $(@)'
$(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh menu "$@" "Debug facilities" "DEBUG" "config/debug" $(DEBUGS)
+config.gen/companion_tools.in: $(COMP_TOOLS_CONFIG_FILES)
+ @$(CT_ECHO) ' IN $(@)'
+ $(SILENT)$(CT_LIB_DIR)/scripts/gen_in_frags.sh menu "$@" "Companion tools" "COMP_TOOLS" "config/companion_tools" $(COMP_TOOLS)
+
#-----------------------------------------------------------
# Cleaning up the mess...
diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in
index fd3b49a..aae0e6e 100644
--- a/config/debug/dmalloc.in
+++ b/config/debug/dmalloc.in
@@ -1,6 +1,7 @@
# dmalloc debug facility
## depends on ! BACKEND
+## depends on ! BARE_METAL
##
## help dmalloc helps tracking memory allocation mis-usage
## help such as double-free, use-after-free...
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 374339d..5f08087 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -1,6 +1,7 @@
# D.U.M.A. - Detect Unintended Memory Access - Memory checker
## depends on ! BACKEND
+## depends on ! BARE_METAL
## help D.U.M.A. - Detect Unintended Memory Access
## help A memory bound checker, with additional features.
@@ -14,7 +15,8 @@ config DUMA_A
config DUMA_SO
bool
prompt "Build a shared library"
- default y if SHARED_LIBS
+ depends on SHARED_LIBS
+ default y
choice
bool
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index e0dfd53..829e7b0 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -44,62 +44,62 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
-config KERNEL_V_4_4
+config KERNEL_V_4_8
+ bool
+ prompt "4.8.8"
+
+config KERNEL_V_4_7
bool
- prompt "4.4.3 (stable)"
+ prompt "4.7.10 (EOL)"
+ depends on OBSOLETE
-config KERNEL_V_4_3
+config KERNEL_V_4_4
bool
- prompt "4.3.6 (EOL)"
+ prompt "4.4.32"
config KERNEL_V_4_1
bool
- prompt "4.1.18"
+ prompt "4.1.35"
config KERNEL_V_3_18
bool
- prompt "3.18.27"
+ prompt "3.18.44"
-config KERNEL_V_3_14
+config KERNEL_V_3_16
bool
- prompt "3.14.62"
+ prompt "3.16.38"
config KERNEL_V_3_12
bool
- prompt "3.12.55"
+ prompt "3.12.67"
config KERNEL_V_3_10
bool
- prompt "3.10.98"
+ prompt "3.10.104"
config KERNEL_V_3_4
bool
- prompt "3.4.110"
+ prompt "3.4.113"
config KERNEL_V_3_2
bool
- prompt "3.2.77"
+ prompt "3.2.83"
-config KERNEL_V_2_6_32
- bool
- prompt "2.6.32.70"
- help
-
endchoice
config KERNEL_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "4.4.3" if KERNEL_V_4_4
- default "4.3.6" if KERNEL_V_4_3
- default "4.1.18" if KERNEL_V_4_1
- default "3.18.27" if KERNEL_V_3_18
- default "3.14.62" if KERNEL_V_3_14
- default "3.12.55" if KERNEL_V_3_12
- default "3.10.98" if KERNEL_V_3_10
- default "3.4.110" if KERNEL_V_3_4
- default "3.2.77" if KERNEL_V_3_2
- default "2.6.32.70" if KERNEL_V_2_6_32
+ default "4.8.8" if KERNEL_V_4_8
+ default "4.7.10" if KERNEL_V_4_7
+ default "4.4.32" if KERNEL_V_4_4
+ default "4.1.35" if KERNEL_V_4_1
+ default "3.18.44" if KERNEL_V_3_18
+ default "3.16.38" if KERNEL_V_3_16
+ default "3.12.67" if KERNEL_V_3_12
+ default "3.10.104" if KERNEL_V_3_10
+ default "3.4.113" if KERNEL_V_3_4
+ default "3.2.83" if KERNEL_V_3_2
endif # ! KERNEL_LINUX_CUSTOM
diff --git a/config/libc.in b/config/libc.in
index 4cc7530..e1eabd2 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -32,6 +32,10 @@ config LIBC_SUPPORT_THREADS_LT
bool
select LIBC_SUPPORT_THREADS_ANY
+config LIBC_SUPPORT_THREADS_POSIX
+ bool
+ select LIBC_SUPPORT_THREADS_ANY
+
config LIBC_SUPPORT_THREADS_NONE
bool
@@ -51,8 +55,9 @@ choice
bool
prompt "Threading implementation to use:"
default THREADS_NATIVE if LIBC_SUPPORT_THREADS_NATIVE
- default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT && ! LIBC_SUPPORT_THREADS_NATIVE
- default THREADS_NONE if ! LIBC_SUPPORT_THREADS_ANY
+ default THREADS_THREADS_LT if LIBC_SUPPORT_THREADS_LT
+ default THREADS_THREADS_POSIX if LIBC_SUPPORT_THREADS_POSIX
+ default THREADS_NONE
config THREADS_NATIVE
bool
@@ -70,6 +75,11 @@ config THREADS_LT
prompt "linuxthreads"
depends on LIBC_SUPPORT_THREADS_LT
+config THREADS_POSIX
+ bool
+ prompt "posix"
+ depends on LIBC_SUPPORT_THREADS_POSIX
+
config THREADS_NONE
bool
prompt "none"
diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in
index f08acb3..2b8d891 100644
--- a/config/libc/avr-libc.in
+++ b/config/libc/avr-libc.in
@@ -49,6 +49,10 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config LIBC_AVR_LIBC_V_2_0_0
+ bool
+ prompt "2.0.0"
+
config LIBC_AVR_LIBC_V_1_8_1
bool
prompt "1.8.1"
@@ -63,6 +67,7 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "2.0.0" if LIBC_AVR_LIBC_V_2_0_0
default "1.8.1" if LIBC_AVR_LIBC_V_1_8_1
default "1.8.0" if LIBC_AVR_LIBC_V_1_8_0
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 96879cc..3ab88e9 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -71,6 +71,11 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config LIBC_GLIBC_V_2_24
+ bool
+ prompt "2.24"
+ select LIBC_GLIBC_2_23_or_later
+
config LIBC_GLIBC_V_2_23
bool
prompt "2.23"
@@ -125,6 +130,7 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "2.24" if LIBC_GLIBC_V_2_24
default "2.23" if LIBC_GLIBC_V_2_23
default "2.22" if LIBC_GLIBC_V_2_22
default "2.21" if LIBC_GLIBC_V_2_21
diff --git a/config/libc/mingw.in b/config/libc/mingw.in
index 88088e9..45b6971 100644
--- a/config/libc/mingw.in
+++ b/config/libc/mingw.in
@@ -3,12 +3,14 @@
## depends on WINDOWS
##
## select LIBC_SUPPORT_THREADS_NATIVE
+## select LIBC_SUPPORT_THREADS_POSIX
## select CC_CORE_PASS_2_NEEDED
##
## help The de-facto standard for Mingw distributions.
config THREADS
- default "win32"
+ default "win32" if THREADS_NATIVE
+ default "posix" if THREADS_POSIX
choice
bool
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index a99ff73..a359fe6 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -39,7 +39,11 @@ config LIBC_UCLIBC_CUSTOM_UCLIBC
select LIBC_UCLIBC_0_9_33_2_or_later
config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
- bool "uClibc-ng"
+ bool "uClibc-ng (1.0.15 or later)"
+ select LIBC_UCLIBC_NG_1_0_15_or_later
+
+config LIBC_UCLIBC_CUSTOM_UCLIBC_NG_OLD
+ bool "uClibc-ng (older than 1.0.15)"
select LIBC_UCLIBC_NG_1_0_0_or_later
endchoice
@@ -60,6 +64,8 @@ config LIBC_UCLIBC_CUSTOM_VERSION
prompt "Custom uClibc Version"
help
Enter the version number for your custom uClibc.
+ Version 1.0.18 is only enabled in EXPERIMENTAL builds due to issues
+ with static libraries.
config LIBC_VERSION
string
@@ -75,10 +81,25 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
-config LIBC_UCLIBC_NG_V_1_0_12
+# List 1.0.17 first to make it default:
+# - 1.0.18 has issues with static libs.
+# - 1.0.19 fails to build native GDB (unresolved references to libdl functions)
+config LIBC_UCLIBC_NG_V_1_0_17
+ bool
+ prompt "1.0.17"
+ select LIBC_UCLIBC_NG_1_0_15_or_later
+
+config LIBC_UCLIBC_NG_V_1_0_19
bool
- prompt "1.0.12"
- select LIBC_UCLIBC_NG_1_0_12_or_later
+ prompt "1.0.19"
+ depends on EXPERIMENTAL
+ select LIBC_UCLIBC_NG_1_0_15_or_later
+
+config LIBC_UCLIBC_NG_V_1_0_18
+ bool
+ prompt "1.0.18"
+ depends on EXPERIMENTAL
+ select LIBC_UCLIBC_NG_1_0_15_or_later
config LIBC_UCLIBC_V_0_9_33_2
bool
@@ -91,12 +112,14 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "1.0.12" if LIBC_UCLIBC_NG_V_1_0_12
+ default "1.0.19" if LIBC_UCLIBC_NG_V_1_0_19
+ default "1.0.18" if LIBC_UCLIBC_NG_V_1_0_18
+ default "1.0.17" if LIBC_UCLIBC_NG_V_1_0_17
default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
endif # ! LIBC_UCLIBC_CUSTOM
-config LIBC_UCLIBC_NG_1_0_12_or_later
+config LIBC_UCLIBC_NG_1_0_15_or_later
bool
select LIBC_UCLIBC_NG_1_0_0_or_later
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 3a5fe34..dc02420 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -1,6 +1,6 @@
# uClibc second-part option
-if THREADS_LT
+if THREADS_LT && !LIBC_UCLIBC_NG_1_0_15_or_later
choice
bool
@@ -30,10 +30,12 @@ endchoice
endif # THREADS_LT
+# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
config LIBC_UCLIBC_LNXTHRD
string
default "" if THREADS_NONE
default "" if THREADS_NATIVE
+ default "" if LIBC_UCLIBC_NG_1_0_15_or_later
default "old" if LIBC_UCLIBC_LNXTHRD_OLD
default "new" if LIBC_UCLIBC_LNXTHRD_NEW
generated by cgit v0.10.2-6-g49f6 at 2024-07-08 23:59:23 (GMT)