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(-)

4 files changed, 176 insertions, 99 deletions

diff --git a/scripts/build/elf2flt.sh b/scripts/build/elf2flt.sh
new file mode 100644
index 0000000..53b625f
--- /dev/null
+++ b/scripts/build/elf2flt.sh
@@ -0,0 +1,75 @@
+# This file adds functions to build elf2flt
+# Copyright 2009 John Williams
+# Copyright 2007 Yann E. MORIN
+# Licensed under the GPL v2. See COPYING in the root of this package
+
+# Download elf2flt
+do_elf2flt_get() {
+    CT_GetCVS "elf2flt-cvs-${CT_ELF2FLT_VERSION}"                    \
+              ":pserver:anonymous@cvs.uclinux.org:/var/cvs"  \
+              "elf2flt"                                            \
+              "" \
+              "elf2flt-cvs-${CT_ELF2FLT_VERSION}"
+}
+
+# Extract elf2flt
+do_elf2flt_extract() {
+    CT_Extract "elf2flt-cvs-${CT_ELF2FLT_VERSION}"
+    CT_Patch "elf2flt-cvs-${CT_ELF2FLT_VERSION}"
+}
+
+# Build elf2flt
+do_elf2flt() {
+    [ -z ${CT_KERNEL_UCLINUX_BINFMT_FLAT} ] && return 0
+    mkdir -p "${CT_BUILD_DIR}/build-elf2flt"
+    cd "${CT_BUILD_DIR}/build-elf2flt"
+
+    CT_DoStep INFO "Installing elf2flt"
+
+    elf2flt_opts=
+    binutils_bld=${CT_BUILD_DIR}/build-binutils
+    binutils_src=${CT_SRC_DIR}/binutils-${CT_BINUTILS_VERSION}
+
+    CT_DoLog EXTRA "Configuring elf2flt"
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"                              \
+    CT_DoExecLog ALL                                            \
+    "${CT_SRC_DIR}/elf2flt-cvs-${CT_ELF2FLT_VERSION}/configure" \
+        --build=${CT_BUILD}                                     \
+        --host=${CT_HOST}                                       \
+        --target=${CT_TARGET}                                   \
+        --prefix=${CT_PREFIX_DIR}                               \
+        --with-bfd-include-dir=${binutils_bld}/bfd              \
+        --with-binutils-include-dir=${binutils_src}/include     \
+        --with-libbfd=${binutils_bld}/bfd/libbfd.a              \
+        --with-libiberty=${binutils_bld}/libiberty/libiberty.a  \
+        ${elf2flt_opts}                                         \
+        ${CT_ELF2FLT_EXTRA_CONFIG}			
+
+    CT_DoLog EXTRA "Building elf2flt"
+    CT_DoExecLog ALL make ${PARALLELMFLAGS}
+
+    CT_DoLog EXTRA "Installing elf2flt"
+    CT_DoExecLog ALL make install
+
+    # Make those new tools available to the core C compilers to come.
+    # Note: some components want the ${TARGET}-{ar,as,ld,strip} commands as
+    # well. Create that.
+    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin"
+    mkdir -p "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin"
+    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin"
+    mkdir -p "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin"
+    for t in elf2flt flthdr; do
+        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
+        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_STATIC_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
+        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/${CT_TARGET}/bin/${t}"
+        ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}-${t}" "${CT_CC_CORE_SHARED_PREFIX_DIR}/bin/${CT_TARGET}-${t}"
+    done 2>&1 |CT_DoLog ALL
+
+    CT_EndStep
+}
+
+# Now on for the target libraries
+do_elf2flt_target() {
+    exit -1
+}
+
diff --git a/scripts/build/kernel/linux-common.sh b/scripts/build/kernel/linux-common.sh
new file mode 100644
index 0000000..fa6a9dd
--- /dev/null
+++ b/scripts/build/kernel/linux-common.sh
@@ -0,0 +1,99 @@
+# This file declares functions to install the kernel headers for linux
+# Copyright 2007 Yann E. MORIN
+# Licensed under the GPL v2. See COPYING in the root of this package
+
+CT_DoKernelTupleValues() {
+    # Nothing to do, keep the default value
+    :
+}
+
+# Download the kernel
+do_kernel_get() {
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
+        CT_GetFile "linux-${CT_KERNEL_VERSION}" \
+                   {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
+    fi
+    return 0
+}
+
+# Extract kernel
+do_kernel_extract() {
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
+        CT_Extract "linux-${CT_KERNEL_VERSION}"
+        CT_Patch "linux-${CT_KERNEL_VERSION}"
+    fi
+    return 0
+}
+
+# Wrapper to the actual headers install method
+do_kernel_headers() {
+    CT_DoStep INFO "Installing kernel headers"
+
+    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
+        do_kernel_custom
+    else
+        do_kernel_install
+    fi
+
+    CT_EndStep
+}
+
+# Install kernel headers using headers_install from kernel sources.
+do_kernel_install() {
+    CT_DoLog DEBUG "Using kernel's headers_install"
+
+    mkdir -p "${CT_BUILD_DIR}/build-kernel-headers"
+    cd "${CT_BUILD_DIR}/build-kernel-headers"
+
+    # Only starting with 2.6.18 does headers_install is usable. We only
+    # have 2.6 version available, so only test for sublevel.
+    k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
+    [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
+
+    V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
+
+    CT_DoLog EXTRA "Installing kernel headers"
+    CT_DoExecLog ALL                                    \
+    make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"  \
+         O=$(pwd)                                       \
+         ARCH=${CT_KERNEL_ARCH}                         \
+         INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
+         ${V_OPT}                                       \
+         headers_install
+
+    if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then
+        CT_DoLog EXTRA "Checking installed headers"
+        CT_DoExecLog ALL                                    \
+        make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"  \
+             O=$(pwd)                                       \
+             ARCH=${CT_KERNEL_ARCH}                         \
+             INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
+             ${V_OPT}                                       \
+             headers_check
+        find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \;
+    fi
+}
+
+# Use custom headers (most probably by using make headers_install in a
+# modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
+# as 2.4). In this case, simply copy the headers in place
+do_kernel_custom() {
+    local tar_opt
+
+    CT_DoLog EXTRA "Installing custom kernel headers"
+
+    mkdir -p "${CT_SYSROOT_DIR}/usr"
+    cd "${CT_SYSROOT_DIR}/usr"
+    if [ "${CT_KERNEL_LINUX_CUSTOM_IS_TARBALL}" = "y" ]; then
+        case "${CT_KERNEL_LINUX_CUSTOM_PATH}" in
+            *.tar)      ;;
+            *.tgz)      tar_opt=--gzip;;
+            *.tar.gz)   tar_opt=--gzip;;
+            *.tar.bz2)  tar_opt=--bzip2;;
+            *.tar.lzma) tar_opt=--lzma;;
+        esac
+        CT_DoExecLog ALL tar x ${tar_opt} -vf ${CT_KERNEL_LINUX_CUSTOM_PATH}
+    else
+        CT_DoExecLog ALL cp -rv "${CT_KERNEL_LINUX_CUSTOM_PATH}/include" .
+    fi
+}
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index fa6a9dd..0401c9f 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -1,99 +1 @@
-# This file declares functions to install the kernel headers for linux
-# Copyright 2007 Yann E. MORIN
-# Licensed under the GPL v2. See COPYING in the root of this package
-
-CT_DoKernelTupleValues() {
-    # Nothing to do, keep the default value
-    :
-}
-
-# Download the kernel
-do_kernel_get() {
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
-        CT_GetFile "linux-${CT_KERNEL_VERSION}" \
-                   {ftp,http}://ftp.{de.,eu.,}kernel.org/pub/linux/kernel/v2.{6{,/testing},4,2}
-    fi
-    return 0
-}
-
-# Extract kernel
-do_kernel_extract() {
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" != "y" ]; then
-        CT_Extract "linux-${CT_KERNEL_VERSION}"
-        CT_Patch "linux-${CT_KERNEL_VERSION}"
-    fi
-    return 0
-}
-
-# Wrapper to the actual headers install method
-do_kernel_headers() {
-    CT_DoStep INFO "Installing kernel headers"
-
-    if [ "${CT_KERNEL_LINUX_USE_CUSTOM_HEADERS}" = "y" ]; then
-        do_kernel_custom
-    else
-        do_kernel_install
-    fi
-
-    CT_EndStep
-}
-
-# Install kernel headers using headers_install from kernel sources.
-do_kernel_install() {
-    CT_DoLog DEBUG "Using kernel's headers_install"
-
-    mkdir -p "${CT_BUILD_DIR}/build-kernel-headers"
-    cd "${CT_BUILD_DIR}/build-kernel-headers"
-
-    # Only starting with 2.6.18 does headers_install is usable. We only
-    # have 2.6 version available, so only test for sublevel.
-    k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
-    [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
-
-    V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
-
-    CT_DoLog EXTRA "Installing kernel headers"
-    CT_DoExecLog ALL                                    \
-    make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"  \
-         O=$(pwd)                                       \
-         ARCH=${CT_KERNEL_ARCH}                         \
-         INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
-         ${V_OPT}                                       \
-         headers_install
-
-    if [ "${CT_KERNEL_LINUX_INSTALL_CHECK}" = "y" ]; then
-        CT_DoLog EXTRA "Checking installed headers"
-        CT_DoExecLog ALL                                    \
-        make -C "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}"  \
-             O=$(pwd)                                       \
-             ARCH=${CT_KERNEL_ARCH}                         \
-             INSTALL_HDR_PATH="${CT_SYSROOT_DIR}/usr"       \
-             ${V_OPT}                                       \
-             headers_check
-        find "${CT_SYSROOT_DIR}" -type f -name '.check*' -exec rm {} \;
-    fi
-}
-
-# Use custom headers (most probably by using make headers_install in a
-# modified (read: customised) kernel tree, or using pre-2.6.18 headers, such
-# as 2.4). In this case, simply copy the headers in place
-do_kernel_custom() {
-    local tar_opt
-
-    CT_DoLog EXTRA "Installing custom kernel headers"
-
-    mkdir -p "${CT_SYSROOT_DIR}/usr"
-    cd "${CT_SYSROOT_DIR}/usr"
-    if [ "${CT_KERNEL_LINUX_CUSTOM_IS_TARBALL}" = "y" ]; then
-        case "${CT_KERNEL_LINUX_CUSTOM_PATH}" in
-            *.tar)      ;;
-            *.tgz)      tar_opt=--gzip;;
-            *.tar.gz)   tar_opt=--gzip;;
-            *.tar.bz2)  tar_opt=--bzip2;;
-            *.tar.lzma) tar_opt=--lzma;;
-        esac
-        CT_DoExecLog ALL tar x ${tar_opt} -vf ${CT_KERNEL_LINUX_CUSTOM_PATH}
-    else
-        CT_DoExecLog ALL cp -rv "${CT_KERNEL_LINUX_CUSTOM_PATH}/include" .
-    fi
-}
+. ${CT_LIB_DIR}/scripts/build/kernel/linux-common.sh
diff --git a/scripts/build/kernel/uclinux.sh b/scripts/build/kernel/uclinux.sh
new file mode 100644
index 0000000..0401c9f
--- /dev/null
+++ b/scripts/build/kernel/uclinux.sh
@@ -0,0 +1 @@
+. ${CT_LIB_DIR}/scripts/build/kernel/linux-common.sh