diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-05-13 20:55:15 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-05-13 20:55:15 (GMT) |
commit | df07dda46dd4265f8e2f8f0bdfca462c0719a838 (patch) | |
tree | 8c9c7a728d1cc07ee7deceb551096cd12cbd5582 /config/libc | |
parent | e89072b5a5922a08bcf3f1f10f3bd12806918f23 (diff) |
Merge the /deve/uclinux branch back to /trunk:
- add support for uClinux, the MMU-less ports of Linux.
-------- diffstat follows --------
/trunk/scripts/build/kernel/linux.sh | 100 1 99 0 ---------------
/trunk/steps.mk | 1 1 0 0 +
/trunk/config/kernel/linux.in | 247 0 247 0 -------------------------------------
/trunk/config/kernel.in | 2 1 1 0
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/libc/glibc-eglibc.in-common | 5 5 0 0 +
/trunk/config/config.in | 1 1 0 0 +
8 files changed, 11 insertions(+), 349 deletions(-)
Diffstat (limited to 'config/libc')
-rw-r--r-- | config/libc/eglibc.in | 2 | ||||
-rw-r--r-- | config/libc/glibc-eglibc.in-common | 5 | ||||
-rw-r--r-- | config/libc/glibc.in | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in index de335d5..f8490c9 100644 --- a/config/libc/eglibc.in +++ b/config/libc/eglibc.in @@ -1,5 +1,5 @@ # eglibc options -# depends on ! BARE_METAL +# depends on ! BARE_METAL && ! KERNEL_uclinux config LIBC_eglibc select LIBC_SUPPORT_NPTL diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common index be8ac88..5a066a7 100644 --- a/config/libc/glibc-eglibc.in-common +++ b/config/libc/glibc-eglibc.in-common @@ -4,12 +4,17 @@ if LIBC_glibc || LIBC_eglibc # Some architectures require the ports addon. List them one by one here: +# This list must be carefully in sync with the architectures names +# we can find in config/arch/* + config ARCH_arm select LIBC_GLIBC_USE_PORTS config ARCH_mips select LIBC_GLIBC_USE_PORTS +# End of arch-specific ports auto-select + comment "glibc/eglibc common options" config LIBC_GLIBC_EXTRA_CONFIG diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 204b65e..92f9e40 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -1,5 +1,5 @@ # glibc options -# depends on ! BARE_METAL +# depends on ! BARE_METAL && ! KERNEL_uclinux config LIBC_glibc select LIBC_SUPPORT_NPTL |