diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-12-11 19:24:49 -0800 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-12-22 19:11:50 +0100 |
| commit | 2207917acc7cd93db5b3bc9c6c5b898c38ec39aa (patch) | |
| tree | 24f51874c67143cfe259041f998860c58a340949 | |
| parent | 57fe7d5401e3ef8390a66c907b9e688c74318ded (diff) | |
| download | upstream-2207917acc7cd93db5b3bc9c6c5b898c38ec39aa.tar.gz upstream-2207917acc7cd93db5b3bc9c6c5b898c38ec39aa.tar.bz2 upstream-2207917acc7cd93db5b3bc9c6c5b898c38ec39aa.zip | |
toolchain: remove uClibc-ng config stuff
This is in preparation for removing it.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | toolchain/Config.in | 19 | ||||
| -rw-r--r-- | toolchain/Makefile | 3 |
2 files changed, 0 insertions, 22 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in index 29de30d7e9..bb8729d805 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -110,11 +110,6 @@ menuconfig EXTERNAL_TOOLCHAIN bool "glibc" select USE_GLIBC - config EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC - bool "uClibc" - select USE_UCLIBC - depends on !(aarch64 || aarch64_be) - config EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL bool "musl" select USE_MUSL @@ -125,7 +120,6 @@ menuconfig EXTERNAL_TOOLCHAIN string depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "glibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC - default "uclibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC default "musl" if EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL config TOOLCHAIN_BIN_PATH @@ -246,11 +240,6 @@ choice bool "Use glibc" select USE_GLIBC - config LIBC_USE_UCLIBC - select USE_UCLIBC - bool "Use uClibc" - depends on BROKEN || arc - config LIBC_USE_MUSL select USE_MUSL bool "Use musl" @@ -258,7 +247,6 @@ choice endchoice -source "toolchain/uClibc/Config.in" source "toolchain/musl/Config.in" comment "Debuggers" @@ -274,10 +262,6 @@ config GDB config USE_GLIBC bool -config USE_UCLIBC - default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc) - bool - config USE_MUSL default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc) bool @@ -296,15 +280,12 @@ source "toolchain/gcc/Config.version" config LIBC string default "glibc" if USE_GLIBC - default "uClibc" if USE_UCLIBC default "musl" if USE_MUSL config TARGET_SUFFIX string default "gnueabi" if USE_GLIBC && (arm || armeb) default "gnu" if USE_GLIBC && !(arm || armeb) - default "uclibcgnueabi" if USE_UCLIBC && (arm || armeb) - default "uclibc" if USE_UCLIBC && !(arm || armeb) default "muslgnueabi" if USE_MUSL && (arm || armeb) default "musl" if USE_MUSL && !(arm || armeb) diff --git a/toolchain/Makefile b/toolchain/Makefile index 23a5529eed..5dccf8f829 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -30,9 +30,6 @@ curdir:=toolchain # subdirectories to descend into $(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/initial gcc/final $(LIBC) fortify-headers) $(if $(CONFIG_NASM),nasm) -ifdef CONFIG_USE_UCLIBC - $(curdir)/builddirs += $(LIBC)/utils -endif # builddir dependencies ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) |