summaryrefslogtreecommitdiff
path: root/config/libc
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-05-20 20:13:13 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2009-05-20 20:13:13 (GMT)
commit45747a64532234fc700eca0712b5a81393ee9565 (patch)
tree6f639b60d370bb75e71bec560299d156ec81c643 /config/libc
parent5a32a8b8e823c3286bc2bc764a0b134cc27ca762 (diff)
Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel - add ARCH_USE_MMU and acquainted config options that architectures can auto-select - make binutils and elf2flt two "Binary utilities" that go in a single common sub-{menu,directory} structure -------- diffstat follows -------- /trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 - /trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++ /trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ---------------------------- /trunk/scripts/build/binutils.sh | 232 0 232 0 -------------------------------- /trunk/scripts/build/elf2flt.sh | 150 0 150 0 --------------------- /trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 + /trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++ /trunk/config/kernel/linux.in-common | 252 0 252 0 ----------------------------------- /trunk/config/kernel/uclinux.in | 21 0 21 0 --- /trunk/config/target.in | 23 22 1 0 +++ /trunk/config/elf2flt.in | 49 0 49 0 ------- /trunk/config/libc/glibc.in | 2 1 1 0 /trunk/config/libc/eglibc.in | 2 1 1 0 /trunk/config/config.in | 1 0 1 0 - /trunk/config/arch/sh.in | 1 1 0 0 + /trunk/config/arch/arm.in | 2 1 1 0 /trunk/config/arch/powerpc.in | 1 1 0 0 + /trunk/config/arch/ia64.in | 1 1 0 0 + /trunk/config/arch/alpha.in | 1 1 0 0 + /trunk/config/arch/x86.in | 1 1 0 0 + /trunk/config/arch/mips.in | 1 1 0 0 + /trunk/config/arch/powerpc64.in | 1 1 0 0 + 22 files changed, 489 insertions(+), 913 deletions(-)
Diffstat (limited to 'config/libc')
-rw-r--r--config/libc/eglibc.in2
-rw-r--r--config/libc/glibc.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index f8490c9..81cdb1d 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -1,5 +1,5 @@
# eglibc options
-# depends on ! BARE_METAL && ! KERNEL_uclinux
+# depends on ! BARE_METAL && ARCH_USE_MMU
config LIBC_eglibc
select LIBC_SUPPORT_NPTL
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 92f9e40..b9ef99f 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -1,5 +1,5 @@
# glibc options
-# depends on ! BARE_METAL && ! KERNEL_uclinux
+# depends on ! BARE_METAL && ARCH_USE_MMU
config LIBC_glibc
select LIBC_SUPPORT_NPTL