domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain: remove uClibc-ng config stuff

Browse Source 
This is in preparation for removing it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-12-11 19:24:49 -08:00
committed by Petr Štetiar
parent 57fe7d5401
commit 2207917acc
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
toolchain/Config.in
View File

@@ -110,11 +110,6 @@ menuconfig EXTERNAL_TOOLCHAIN
bool "glibc" bool "glibc"
select USE_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 config EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
bool "musl" bool "musl"
select USE_MUSL select USE_MUSL
@@ -125,7 +120,6 @@ menuconfig EXTERNAL_TOOLCHAIN
string string
depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
default "glibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC default "glibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC
default "uclibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_UCLIBC
default "musl" if EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL default "musl" if EXTERNAL_TOOLCHAIN_LIBC_USE_MUSL
config TOOLCHAIN_BIN_PATH config TOOLCHAIN_BIN_PATH
@@ -246,11 +240,6 @@ choice
bool "Use glibc" bool "Use glibc"
select USE_GLIBC select USE_GLIBC
config LIBC_USE_UCLIBC
select USE_UCLIBC
bool "Use uClibc"
depends on BROKEN || arc
config LIBC_USE_MUSL config LIBC_USE_MUSL
select USE_MUSL select USE_MUSL
bool "Use musl" bool "Use musl"
@@ -258,7 +247,6 @@ choice
endchoice endchoice
source "toolchain/uClibc/Config.in"
source "toolchain/musl/Config.in" source "toolchain/musl/Config.in"
comment "Debuggers" comment "Debuggers"
@@ -274,10 +262,6 @@ config GDB
config USE_GLIBC config USE_GLIBC
bool bool
config USE_UCLIBC
default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && (arc)
bool
config USE_MUSL config USE_MUSL
default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc) default y if !TOOLCHAINOPTS && !EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN && !(arc)
bool bool
@@ -296,15 +280,12 @@ source "toolchain/gcc/Config.version"
config LIBC config LIBC
string string
default "glibc" if USE_GLIBC default "glibc" if USE_GLIBC
default "uClibc" if USE_UCLIBC
default "musl" if USE_MUSL default "musl" if USE_MUSL
config TARGET_SUFFIX config TARGET_SUFFIX
string string
default "gnueabi" if USE_GLIBC && (arm || armeb) default "gnueabi" if USE_GLIBC && (arm || armeb)
default "gnu" 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 "muslgnueabi" if USE_MUSL && (arm || armeb)
default "musl" if USE_MUSL && !(arm || armeb) default "musl" if USE_MUSL && !(arm || armeb)

3
toolchain/Makefile
View File

@@ -30,9 +30,6 @@ curdir:=toolchain
# subdirectories to descend into # 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) $(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 # builddir dependencies
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)