summaryrefslogtreecommitdiff
path: root/target/config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-07-05 13:20:32 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-07-05 13:21:38 +0200
commit13987e7baab1da72f4187ef90229a8ab45f58e01 (patch)
tree22091ab06506d8f967a2c5ee635fe8ea4761f783 /target/config
parent5ce7c00aadc63e34d8629b36b8c7cf3c9ee0c380 (diff)
add support for uClibc-ng in parallel to uClibc.
This helps to find any regressions made in uClibc-ng.
Diffstat (limited to 'target/config')
-rw-r--r--target/config/Config.in.libc.choice21
-rw-r--r--target/config/Config.in.libc.default22
2 files changed, 32 insertions, 11 deletions
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
index f55a3a017..eec997789 100644
--- a/target/config/Config.in.libc.choice
+++ b/target/config/Config.in.libc.choice
@@ -11,7 +11,7 @@ config ADK_TARGET_LIB_GLIBC
select ADK_glibc
depends on !ADK_LINUX_XTENSA
help
- http://www.gnu.org/libc
+ http://www.gnu.org/libc
config ADK_TARGET_LIB_MUSL
prompt "musl C library"
@@ -26,7 +26,21 @@ config ADK_TARGET_LIB_MUSL
ADK_LINUX_X86 || \
ADK_LINUX_X86_64
help
- http://musl-libc.org
+ http://musl-libc.org
+
+config ADK_TARGET_LIB_UCLIBC_NG
+ prompt "uClibc-ng embedded C library"
+ boolean
+ select ADK_uclibc_ng
+ depends on \
+ !ADK_LINUX_AARCH64 && \
+ !ADK_LINUX_ALPHA && \
+ !ADK_LINUX_SPARC && \
+ !ADK_LINUX_SPARC64 && \
+ !ADK_LINUX_PPC64 && \
+ !ADK_x32
+ help
+ http://uclibc-ng.org
config ADK_TARGET_LIB_UCLIBC
prompt "uClibc embedded C library"
@@ -34,11 +48,12 @@ config ADK_TARGET_LIB_UCLIBC
select ADK_uclibc
depends on \
!ADK_LINUX_AARCH64 && \
+ !ADK_LINUX_ALPHA && \
!ADK_LINUX_SPARC && \
!ADK_LINUX_SPARC64 && \
!ADK_LINUX_PPC64 && \
!ADK_x32
help
- http://uclibc.org
+ http://uclibc.org
endchoice
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
index c06112891..52acc0319 100644
--- a/target/config/Config.in.libc.default
+++ b/target/config/Config.in.libc.default
@@ -4,6 +4,9 @@
config ADK_uclibc
boolean
+config ADK_uclibc_ng
+ boolean
+
config ADK_glibc
boolean
@@ -12,12 +15,16 @@ config ADK_musl
config ADK_TARGET_LIBC
string
+ default "uclibc-ng" if ADK_uclibc_ng
default "uclibc" if ADK_uclibc
default "glibc" if ADK_glibc
default "musl" if ADK_musl
config ADK_TARGET_WITH_NPTL
boolean
+ default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_ALPHA
+ default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_M68K
+ default n if ADK_TARGET_LIB_UCLIBC_NG && ADK_LINUX_MICROBLAZE
default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_ALPHA
default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_M68K
default n if ADK_TARGET_LIB_UCLIBC && ADK_LINUX_MICROBLAZE
@@ -33,14 +40,13 @@ config ADK_TARGET_SUFFIX
default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_LINUX_64
default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_LINUX_64
default "gnu" if ADK_TARGET_LIB_GLIBC
- default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf
- default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi
- default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64
- default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32
- default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32
- default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_LINUX_64
- default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_LINUX_64
- default "uclibc" if ADK_TARGET_LIB_UCLIBC
+ default "uclibcgnueabihf" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_eabihf
+ default "uclibcgnueabi" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_eabi
+ default "uclibcabi64" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_n64
+ default "uclibcabin32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_n32
+ default "uclibcabi32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_o32
+ default "uclibc32" if (ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG) && ADK_32 && ADK_LINUX_64
+ default "uclibc" if ADK_TARGET_LIB_UCLIBC || ADK_TARGET_LIB_UCLIBC_NG
default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf
default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi
default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64