diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in.cpu | 5 | ||||
| -rw-r--r-- | target/config/Config.in.libc.choice | 27 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 17 | ||||
| -rw-r--r-- | target/config/Config.in.toolchain | 4 |
4 files changed, 10 insertions, 43 deletions
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index 2ae22f386..9f2771145 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -488,28 +488,24 @@ config ADK_CPU_LOONGSON2F config ADK_CPU_M68K bool - select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC config ADK_CPU_68020 bool - select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC config ADK_CPU_68030 bool - select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC config ADK_CPU_68040 bool - select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC @@ -517,7 +513,6 @@ config ADK_CPU_68040 config ADK_CPU_68060 bool - select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index b89ff1b56..da195a593 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -47,22 +47,6 @@ config ADK_TARGET_LIB_GLIBC help http://www.gnu.org/libc -config ADK_TARGET_LIB_UCLIBC - bool "uClibc embedded C library" - depends on ADK_BROKEN - depends on \ - !ADK_TARGET_ARCH_AARCH64 && \ - !ADK_TARGET_ARCH_ALPHA && \ - !ADK_TARGET_ARCH_CRIS && \ - !ADK_TARGET_ARCH_HPPA && \ - !ADK_TARGET_ARCH_MICROBLAZE && \ - !ADK_TARGET_ARCH_NIOS2 && \ - !ADK_TARGET_ARCH_SPARC64 && \ - !ADK_TARGET_ARCH_PPC64 && \ - !ADK_TARGET_ARCH_TILE - help - http://uclibc.org - endchoice choice @@ -96,14 +80,6 @@ config ADK_TARGET_LIB_GLIBC_GIT bool "git" depends on ADK_TARGET_LIB_GLIBC -config ADK_TARGET_LIB_UCLIBC_GIT - bool "git" - depends on ADK_TARGET_LIB_UCLIBC - -config ADK_TARGET_LIB_UCLIBC_0_9_33_2 - bool "0.9.33.2" - depends on ADK_TARGET_LIB_UCLIBC - config ADK_TARGET_LIB_MUSL_1_1_11 bool "1.1.11" depends on ADK_TARGET_LIB_MUSL @@ -116,8 +92,7 @@ endchoice choice prompt "Threading" -depends on (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) \ - && !ADK_TARGET_WITHOUT_THREADS +depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_TARGET_WITHOUT_THREADS config ADK_TARGET_LIB_WITH_THREADS bool "enable threads" diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 3c07fa6a9..12c36451b 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -16,7 +16,6 @@ config ADK_TARGET_WITHOUT_CXX config ADK_TARGET_LIBC string default "uclibc-ng" if ADK_TARGET_LIB_UCLIBC_NG - default "uclibc" if ADK_TARGET_LIB_UCLIBC default "glibc" if ADK_TARGET_LIB_GLIBC default "musl" if ADK_TARGET_LIB_MUSL @@ -24,13 +23,11 @@ config ADK_LIBC_VERSION string default "1.0.6" if ADK_TARGET_LIB_UCLIBC_NG_1_0_6 default "1.1.11" if ADK_TARGET_LIB_MUSL_1_1_11 - default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2 default "2.19" if ADK_TARGET_LIB_GLIBC_2_19 default "2.20" if ADK_TARGET_LIB_GLIBC_2_20 default "2.21" if ADK_TARGET_LIB_GLIBC_2_21 default "2.22" if ADK_TARGET_LIB_GLIBC_2_22 default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \ - ADK_TARGET_LIB_UCLIBC_GIT || \ ADK_TARGET_LIB_MUSL_GIT || \ ADK_TARGET_LIB_GLIBC_GIT @@ -48,13 +45,13 @@ config ADK_TARGET_SUFFIX default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_32 && ADK_LINUX_64 default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_X32 && ADK_LINUX_64 default "gnu" if ADK_TARGET_LIB_GLIBC - default "uclibceabihf" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT - default "uclibceabi" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_TARGET_ARCH_ARM - default "uclibcabi64" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_TARGET_ABI_N64 - default "uclibcabin32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_TARGET_ABI_N32 - default "uclibcabi32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_TARGET_ABI_O32 - default "uclibc32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_TARGET_ABI_32 && ADK_LINUX_64 - default "uclibc" if ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG + default "uclibceabihf" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT + default "uclibceabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM + default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N64 + default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N32 + default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_O32 + default "uclibc32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_32 && ADK_LINUX_64 + default "uclibc" if ADK_TARGET_LIB_UCLIBC_NG default "musleabihf" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT default "musleabi" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_N64 diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index f955dcf14..48cbfb9cc 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -125,7 +125,7 @@ config ADK_STATIC_TOOLCHAIN config ADK_UCLIBC_TEST bool "Build testsuite for C library" - depends on ADK_TARGET_LIB_UCLIBC_NG || ADK_TARGET_LIB_UCLIBC + depends on ADK_TARGET_LIB_UCLIBC_NG help - Build uClibc/uClibc-ng test suite. + Build uClibc-ng test suite. endmenu |