From 9ce20533526a29a950df2a41c31eccbe611d655d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 6 Sep 2009 16:49:20 +0200
Subject: log functions: fix CT_DoLog and CT_DoExecLog

$@ and $* are different when in double quotes; use $* to print the message.
---
 scripts/functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index ae584c4c..62a2f993 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -79,7 +79,7 @@ CT_DoLog() {
     if [ $# -eq 0 ]; then
         cat -
     else
-        printf "${@}\n"
+        printf "${*}\n"
     fi |( IFS="${CR}" # We want the full lines, even leading spaces
           _prog_bar_cpt=0
           _prog_bar[0]='/'
@@ -116,7 +116,7 @@ CT_DoLog() {
 CT_DoExecLog() {
     local level="$1"
     shift
-    CT_DoLog DEBUG "==> Executing: '${@}'"
+    CT_DoLog DEBUG "==> Executing: '${*}'"
     "${@}" 2>&1 |CT_DoLog "${level}"
 }
 
-- 
cgit v1.2.3


From 4a1d73f20921fe4b4dc5ee5f71bdcc94fd996cfe Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 6 Sep 2009 16:49:54 +0200
Subject: crosstool.sh.in: better mesage when creating script-overrides

---
 scripts/crosstool-NG.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index ba30c4f9..f1e38fc9 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -83,7 +83,7 @@ CT_DoExecLog DEBUG mkdir -p "${CT_BIN_OVERIDE_DIR}"
 cat "${CT_LIB_DIR}/paths.mk" |while read trash line; do
     tool="${line%%=*}"
     path="${line#*=}"
-    CT_DoLog DEBUG "  '${tool}' -> '${path}'"
+    CT_DoLog DEBUG "Creating script-override for '${tool}' -> '${path}'"
     printf "#${BANG}${CT_SHELL}\nexec '${path}' \"\${@}\"\n" >"${CT_BIN_OVERIDE_DIR}/${tool}"
     CT_DoExecLog ALL chmod 700 "${CT_BIN_OVERIDE_DIR}/${tool}"
 done
-- 
cgit v1.2.3


From 3136ecb066a9f51bcdc795b0b940851c851f5d27 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 6 Sep 2009 17:58:05 +0200
Subject: tools wrapper: fix building

Remove the build tools only after the wrapper is built.
Use the corect C compiler to build the tools wrapper.
Use the correct log level.
---
 scripts/build/internals.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 093636ae..144cb873 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -8,9 +8,6 @@ do_finish() {
 
     CT_DoStep INFO "Cleaning-up the toolchain's directory"
 
-    CT_DoLog EXTRA "Removing access to the build system tools"
-    CT_DoExecLog DEBUG rm -rf "${CT_PREFIX_DIR}/buildtools"
-
     if [ "${CT_BARE_METAL}" != "y" ]; then
         CT_DoLog EXTRA "Installing the populate helper"
         sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \
@@ -58,11 +55,11 @@ do_finish() {
                 if [ "${CT_DEBUG_CT}" = "y" ]; then
                   _t="" # If debugging crosstool-NG, don't strip the wrapper
                 fi
-                CT_DoExecLog "${HOST_CC}"                               \
-                             -Wall -Wextra -Wunreachable-code -Werror   \
-                             -O3 -static ${_t}                          \
-                             "${CT_LIB_DIR}/scripts/wrapper.c"          \
-                             -o ".${CT_TARGET}-wrapper"
+                CT_DoExecLog DEBUG "${CT_HOST}-gcc"                           \
+                                   -Wall -Wextra -Wunreachable-code -Werror   \
+                                   -O3 -static ${_t}                          \
+                                   "${CT_LIB_DIR}/scripts/wrapper.c"          \
+                                   -o ".${CT_TARGET}-wrapper"
                 ;;
         esac
 
@@ -82,6 +79,9 @@ do_finish() {
         CT_Popd
     fi
 
+    CT_DoLog EXTRA "Removing access to the build system tools"
+    CT_DoExecLog DEBUG rm -rf "${CT_PREFIX_DIR}/buildtools"
+
     # Remove the generated documentation files
     if [ "${CT_REMOVE_DOCS}" = "y" ]; then
         CT_DoLog EXTRA "Removing installed documentation"
-- 
cgit v1.2.3


From 0d434aabb659db66d801aecd20c62e2ae498fb5e Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 7 Sep 2009 18:40:30 +0200
Subject: samples: replace usage of echo with printf

Using printf instead of echo allows easier and better formatting.
---
 scripts/showSamples.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh
index e952d644..946b7117 100755
--- a/scripts/showSamples.sh
+++ b/scripts/showSamples.sh
@@ -29,6 +29,7 @@ dump_single_sample() {
     fi
     . "${sample_top}/samples/${sample}/crosstool.config"
     if [ -z "${wiki}" ]; then
+        t_width=10
         printf "    %-*s  [%s" ${width} "${sample}" "${sample_type}"
         [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " "
         [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " "
@@ -37,15 +38,15 @@ dump_single_sample() {
             case "${CT_TOOLCHAIN_TYPE}" in
                 cross)  ;;
                 canadian)
-                    printf "    Host      : ${CT_HOST}\n"
+                    printf "    %-*s : %s\n" ${t_width} "Host" "${CT_HOST}"
                     ;;
             esac
-            echo    "    OS        : ${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}"
+            printf "    %-*s : %s\n" ${t_width} "OS" "${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}"
             if [ "${CT_GMP_MPFR}" = "y" ]; then
-                echo    "    GMP/MPFR  : gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}"
+                printf    "    %-*s : %s\n" ${t_width} "GMP/MPFR" "gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}"
             fi
-            echo    "    binutils  : binutils-${CT_BINUTILS_VERSION}"
-            printf  "    C compiler: ${CT_CC}-${CT_CC_VERSION} (C"
+            printf  "    %-*s : %s\n" ${t_width} "binutils" "binutils-${CT_BINUTILS_VERSION}"
+            printf  "    %-*s : %s" ${t_width} "C compiler" "${CT_CC}-${CT_CC_VERSION} (C"
             [ "${CT_CC_LANG_CXX}" = "y"     ] && printf ",C++"
             [ "${CT_CC_LANG_FORTRAN}" = "y" ] && printf ",Fortran"
             [ "${CT_CC_LANG_JAVA}" = "y"    ] && printf ",Java"
@@ -53,9 +54,9 @@ dump_single_sample() {
             [ "${CT_CC_LANG_OBJC}" = "y"    ] && printf ",Objective-C"
             [ "${CT_CC_LANG_OBJCXX}" = "y"  ] && printf ",Objective-C++"
             [ -n "${CT_CC_LANG_OTHERS}"     ] && printf ",${CT_CC_LANG_OTHERS}"
-            echo    ")"
-            echo    "    C library : ${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}"
-            printf  "    Tools     :"
+            printf ")\n"
+            printf  "    %-*s : %s\n" ${t_width} "C library" "${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}"
+            printf  "    %-*s :" ${t_width} "Tools"
             [ "${CT_LIBELF}"  ] && printf " libelf-${CT_LIBELF_VERSION}"
             [ "${CT_SSTRIP}"  ] && printf " sstrip"
             [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}"
@@ -63,7 +64,7 @@ dump_single_sample() {
             [ "${CT_GDB}"     ] && printf " gdb-${CT_GDB_VERSION}"
             [ "${CT_LTRACE}"  ] && printf " ltrace-${CT_LTRACE_VERSION}"
             [ "${CT_STRACE}"  ] && printf " strace-${CT_STRACE_VERSION}"
-            echo
+            printf "\n"
         fi
     else
         printf "| ''${sample}''  "
-- 
cgit v1.2.3


From 565378d2b9eb33224b7acca314007f9bcdc284e6 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 7 Sep 2009 18:55:11 +0200
Subject: samples: fix displaying selected tools

Do display selected tools / debug facilities when displaying a sample.
---
 scripts/showSamples.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh
index 946b7117..3c44bd76 100755
--- a/scripts/showSamples.sh
+++ b/scripts/showSamples.sh
@@ -57,13 +57,13 @@ dump_single_sample() {
             printf ")\n"
             printf  "    %-*s : %s\n" ${t_width} "C library" "${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}"
             printf  "    %-*s :" ${t_width} "Tools"
-            [ "${CT_LIBELF}"  ] && printf " libelf-${CT_LIBELF_VERSION}"
-            [ "${CT_SSTRIP}"  ] && printf " sstrip"
-            [ "${CT_DMALLOC}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}"
-            [ "${CT_DUMA}"    ] && printf " duma-${CT_DUMA_VERSION}"
-            [ "${CT_GDB}"     ] && printf " gdb-${CT_GDB_VERSION}"
-            [ "${CT_LTRACE}"  ] && printf " ltrace-${CT_LTRACE_VERSION}"
-            [ "${CT_STRACE}"  ] && printf " strace-${CT_STRACE_VERSION}"
+            [ "${CT_TOOL_libelf}"   ] && printf " libelf-${CT_LIBELF_VERSION}"
+            [ "${CT_TOOL_sstrip}"   ] && printf " sstrip"
+            [ "${CT_DEBUG_dmalloc}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}"
+            [ "${CT_DEBUG_duma}"    ] && printf " duma-${CT_DUMA_VERSION}"
+            [ "${CT_DEBUG_gdb}"     ] && printf " gdb-${CT_GDB_VERSION}"
+            [ "${CT_DEBUG_ltrace}"  ] && printf " ltrace-${CT_LTRACE_VERSION}"
+            [ "${CT_DEBUG_strace}"  ] && printf " strace-${CT_STRACE_VERSION}"
             printf "\n"
         fi
     else
-- 
cgit v1.2.3


From ea352a96a3ed308c87351b9ced72b27848546765 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 7 Sep 2009 19:03:09 +0200
Subject: samples: show the PPL, GLoog/ppl and MPC versions

When displaying a sample, do show the PPL, CLoog/ppl and MPC versions
---
 scripts/showSamples.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh
index 3c44bd76..13e5a3f2 100755
--- a/scripts/showSamples.sh
+++ b/scripts/showSamples.sh
@@ -29,7 +29,7 @@ dump_single_sample() {
     fi
     . "${sample_top}/samples/${sample}/crosstool.config"
     if [ -z "${wiki}" ]; then
-        t_width=10
+        t_width=13
         printf "    %-*s  [%s" ${width} "${sample}" "${sample_type}"
         [ -f "${sample_top}/samples/${sample}/broken" ] && printf "B" || printf " "
         [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " "
@@ -45,6 +45,9 @@ dump_single_sample() {
             if [ "${CT_GMP_MPFR}" = "y" ]; then
                 printf    "    %-*s : %s\n" ${t_width} "GMP/MPFR" "gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}"
             fi
+            if [ "${CT_PPL_CLOOG_MPC}" = "y" ]; then
+                printf    "    %-*s : %s\n" ${t_width} "PPL/CLOOG/MPC" "ppl-${CT_PPL_VERSION} / cloog-${CT_CLOOG_VERSION} / mpc-${CT_MPC_VERSION}"
+            fi
             printf  "    %-*s : %s\n" ${t_width} "binutils" "binutils-${CT_BINUTILS_VERSION}"
             printf  "    %-*s : %s" ${t_width} "C compiler" "${CT_CC}-${CT_CC_VERSION} (C"
             [ "${CT_CC_LANG_CXX}" = "y"     ] && printf ",C++"
-- 
cgit v1.2.3


From 26b3a17f58e9af55a36d1455c2a61ca4f22225b3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 12 Sep 2009 00:11:12 +0200
Subject: libc/eglibc: fix download

Fix the test to check if download is forced.
---
 scripts/build/libc/eglibc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index 245cda86..340a02f2 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -54,7 +54,7 @@ do_libc_get() {
          -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}"    \
          -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}"       \
          -a -f "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}"           \
-         "${CT_FORCE_DOWNLOAD}" != "y"                              \
+         -a "${CT_FORCE_DOWNLOAD}" != "y"                           \
        ]; then
         CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage"
         for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do
-- 
cgit v1.2.3


From 6b37673b6477be9c3796ce8f398f9f823471d21f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 12 Sep 2009 00:10:38 +0200
Subject: samples: fix saving samples

Use a correct sed pattern when setting CT_PREFIX_DIR
---
 scripts/saveSample.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in
index 4ef71ce2..9e4e3584 100644
--- a/scripts/saveSample.sh.in
+++ b/scripts/saveSample.sh.in
@@ -69,7 +69,7 @@ samp_dir="samples/${samp_name}"
 mkdir -p "${samp_dir}"
 
 # Save the crosstool-NG config file
-"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${samp_name}"|;'      \
+"${sed}" -r -e 's|^(CT_PREFIX_DIR)=.*|\1="${HOME}/x-tools/${CT_TARGET}"|;'      \
             -e 's|^# CT_LOG_TO_FILE is not set$|CT_LOG_TO_FILE=y|;'             \
             -e 's|^# CT_LOG_FILE_COMPRESS is not set$|CT_LOG_FILE_COMPRESS=y|;' \
             -e 's|^(CT_LOCAL_TARBALLS_DIR)=.*|\1="${HOME}/src"|;'               \
-- 
cgit v1.2.3


From 414f639105293d3df3ec5cfc6f32edcd0f0b558f Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 12 Sep 2009 10:16:28 +0200
Subject: comp-libs/cloog: new versions have the version number in the dir name

For CLooG/PPL 0.15.3, the directory name was simply cloog-ppl.
For any later versions, the driectory name does have the version, such as
cloog-ppl-0.15.4.
---
 scripts/build/companion_libs/cloog.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index 0e6d74fb..fae3f72d 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -18,8 +18,17 @@ do_cloog_get() {
 
 # Extract CLooG
 do_cloog_extract() {
+    local _t
+
     CT_Extract "cloog-ppl-${CT_CLOOG_VERSION}"
-    CT_Pushd "${CT_SRC_DIR}/cloog-ppl"
+
+    # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
+    # while versions 0.15.4 onward do have the version in the dirname.
+    case "${CT_CLOOG_VERSION}" in
+        0.15.3) _t="";;
+        *)      _t="-${CT_CLOOG_VERSION}";;
+    esac
+    CT_Pushd "${CT_SRC_DIR}/cloog-ppl${_t}"
     CT_Patch "cloog-ppl-${CT_CLOOG_VERSION}" nochdir
     CT_Popd
 }
-- 
cgit v1.2.3


From 028b9d1c98e2c96745f5c2ae5089076a17b96667 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Sep 2009 12:25:33 +0200
Subject: comp-libs/cloog: fix building

For CLooG/PPL 0.15.3, the directory name was simply cloog-ppl.
For any later versions, the driectory name does have the version, such as
cloog-ppl-0.15.4.
---
 scripts/build/companion_libs/cloog.sh | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/companion_libs/cloog.sh b/scripts/build/companion_libs/cloog.sh
index fae3f72d..f6eb68a3 100644
--- a/scripts/build/companion_libs/cloog.sh
+++ b/scripts/build/companion_libs/cloog.sh
@@ -34,22 +34,31 @@ do_cloog_extract() {
 }
 
 do_cloog() {
+    local _t
+
+    # Version 0.15.3 has a dirname 'cloog-ppl' (with no version in it!)
+    # while versions 0.15.4 onward do have the version in the dirname.
+    case "${CT_CLOOG_VERSION}" in
+        0.15.3) _t="";;
+        *)      _t="-${CT_CLOOG_VERSION}";;
+    esac
+
     mkdir -p "${CT_BUILD_DIR}/build-cloog-ppl"
     cd "${CT_BUILD_DIR}/build-cloog-ppl"
 
     CT_DoStep INFO "Installing CLooG/ppl"
 
     CT_DoLog EXTRA "Configuring CLooG/ppl"
-    CFLAGS="${CT_CFLAGS_FOR_HOST}"      \
-    CT_DoExecLog ALL                    \
-    "${CT_SRC_DIR}/cloog-ppl/configure" \
-        --build=${CT_BUILD}             \
-        --host=${CT_HOST}               \
-        --prefix="${CT_PREFIX_DIR}"     \
-        --with-gmp="${CT_PREFIX_DIR}"   \
-        --with-ppl="${CT_PREFIX_DIR}"   \
-        --enable-shared                 \
-        --disable-static                \
+    CFLAGS="${CT_CFLAGS_FOR_HOST}"              \
+    CT_DoExecLog ALL                            \
+    "${CT_SRC_DIR}/cloog-ppl${_t}/configure"    \
+        --build=${CT_BUILD}                     \
+        --host=${CT_HOST}                       \
+        --prefix="${CT_PREFIX_DIR}"             \
+        --with-gmp="${CT_PREFIX_DIR}"           \
+        --with-ppl="${CT_PREFIX_DIR}"           \
+        --enable-shared                         \
+        --disable-static                        \
         --with-bits=gmp
 
     CT_DoLog EXTRA "Building CLooG/ppl"
-- 
cgit v1.2.3


From 2d6a221babda79345734688ffd9f36261121cae0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Sep 2009 17:14:28 +0200
Subject: samples: correclty fix saving samples with a C library config file

---
 scripts/saveSample.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in
index 9e4e3584..e91dc9e0 100644
--- a/scripts/saveSample.sh.in
+++ b/scripts/saveSample.sh.in
@@ -99,7 +99,7 @@ fi
 if [ -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" ]; then
     # We save the file, and then point the saved sample to this file
     CT_DoAddFileToSample "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"
-    "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/${samp_dir}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
+    "${sed}" -r -i -e 's|^(CT_LIBC_UCLIBC_CONFIG_FILE)=.+$|\1="'"${samp_top_dir}"'/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config"|;' \
              "${samp_dir}/crosstool.config"
 else
     # remove any dangling files
-- 
cgit v1.2.3


From 0c6375595702e370b3e5784eabdc87f0f5282fed Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Sep 2009 18:38:06 +0200
Subject: scripts: add new version at top of choice

Add new versions at the top of the choice menu, not at the bottom.
---
 config/binutils/binutils.in    |  8 ++++----
 config/binutils/elf2flt.in     |  8 ++++----
 config/cc/gcc.in               |  8 ++++----
 config/companion_libs/cloog.in |  8 ++++----
 config/companion_libs/gmp.in   |  8 ++++----
 config/companion_libs/mpc.in   |  8 ++++----
 config/companion_libs/mpfr.in  |  8 ++++----
 config/companion_libs/ppl.in   |  8 ++++----
 config/debug/dmalloc.in        |  8 ++++----
 config/debug/duma.in           |  8 ++++----
 config/debug/gdb.in            | 21 ++++++++++-----------
 config/debug/ltrace.in         |  8 ++++----
 config/debug/strace.in         |  8 ++++----
 config/kernel/linux.in         |  9 ++++-----
 config/libc/eglibc.in          | 11 +++++------
 config/libc/glibc.in           | 11 +++++------
 config/libc/newlib.in          | 10 ++++------
 config/libc/uClibc.in          | 11 +++++------
 config/tools/libelf.in         |  8 ++++----
 scripts/addToolVersion.sh      | 18 +++++++++---------
 20 files changed, 94 insertions(+), 101 deletions(-)

(limited to 'scripts')

diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index c39e5181..904dad2e 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -8,6 +8,8 @@ config BINUTILS_VERSION
 choice
     bool
     prompt "binutils version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config BINUTILS_V_2_19_51_0_2
     bool
@@ -99,12 +101,12 @@ config BINUTILS_V_2_14
     prompt "2.14 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config BINUTILS_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.19.51.0.2" if BINUTILS_V_2_19_51_0_2
     default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1
     default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1
@@ -124,8 +126,6 @@ config BINUTILS_VERSION
     default "2.16.1" if BINUTILS_V_2_16_1
     default "2.15" if BINUTILS_V_2_15
     default "2.14" if BINUTILS_V_2_14
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
 
 config BINUTILS_EXTRA_CONFIG
     string
diff --git a/config/binutils/elf2flt.in b/config/binutils/elf2flt.in
index 0b1ef726..c46e599a 100644
--- a/config/binutils/elf2flt.in
+++ b/config/binutils/elf2flt.in
@@ -10,6 +10,8 @@ config ELF2FLT_VERSION
 choice
     bool
     prompt "elf2flt version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config ELF2FLT_CVSHEAD
     bool
@@ -21,8 +23,6 @@ config ELF2FLT_CVS_SNAPSHOT
     bool
     prompt "CVS Snapshot"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config ELF2FLT_CVS_SNAPSHOT_SPEC
@@ -37,8 +37,8 @@ config ELF2FLT_CVS_SNAPSHOT_SPEC
 config ELF2FLT_VERSION
     string
     default "head" if ELF2FLT_CVSHEAD
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
 
 config ELF2FLT_EXTRA_CONFIG
     string
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 39043a7a..d0ff4ab7 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -16,6 +16,8 @@ config CC_gcc
 choice
     bool
     prompt "gcc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config CC_V_4_4_1
     bool
@@ -130,8 +132,6 @@ config CC_V_3_2_3
     prompt "3.2.3 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config CC_GCC_4_3_or_later
@@ -146,6 +146,8 @@ config CC_GCC_4_4_or_later
 
 config CC_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "4.4.1" if CC_V_4_4_1
     default "4.4.0" if CC_V_4_4_0
     default "4.3.4" if CC_V_4_3_4
@@ -169,8 +171,6 @@ config CC_VERSION
     default "3.4.6" if CC_V_3_4_6
     default "3.3.6" if CC_V_3_3_6
     default "3.2.3" if CC_V_3_2_3
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
 
 config CC_CXA_ATEXIT
     bool
diff --git a/config/companion_libs/cloog.in b/config/companion_libs/cloog.in
index 7ae6f875..75ddb149 100644
--- a/config/companion_libs/cloog.in
+++ b/config/companion_libs/cloog.in
@@ -3,6 +3,8 @@
 choice
     bool
     prompt "CLooG/ppl version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config CLOOG_V_0_15_7
     bool
@@ -24,16 +26,14 @@ config CLOOG_V_0_15_3
     bool
     prompt "0.15.3"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config CLOOG_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.15.7" if CLOOG_V_0_15_7
     default "0.15.6" if CLOOG_V_0_15_6
     default "0.15.5" if CLOOG_V_0_15_5
     default "0.15.4" if CLOOG_V_0_15_4
     default "0.15.3" if CLOOG_V_0_15_3
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/companion_libs/gmp.in b/config/companion_libs/gmp.in
index 5a8c78c5..75628d9a 100644
--- a/config/companion_libs/gmp.in
+++ b/config/companion_libs/gmp.in
@@ -3,6 +3,8 @@
 choice
     bool
     prompt "GMP version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config GMP_V_4_3_1
     bool
@@ -20,15 +22,13 @@ config GMP_V_4_2_2
     bool
     prompt "4.2.2"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config GMP_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "4.3.1" if GMP_V_4_3_1
     default "4.3.0" if GMP_V_4_3_0
     default "4.2.4" if GMP_V_4_2_4
     default "4.2.2" if GMP_V_4_2_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/companion_libs/mpc.in b/config/companion_libs/mpc.in
index 42d5a6f1..27e9b906 100644
--- a/config/companion_libs/mpc.in
+++ b/config/companion_libs/mpc.in
@@ -3,6 +3,8 @@
 choice
     bool
     prompt "MPC version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config MPC_V_0_7
     bool
@@ -12,13 +14,11 @@ config MPC_V_0_6
     bool
     prompt "0.6"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config MPC_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.7" if MPC_V_0_7
     default "0.6" if MPC_V_0_6
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/companion_libs/mpfr.in b/config/companion_libs/mpfr.in
index 365cd4f1..61f057a1 100644
--- a/config/companion_libs/mpfr.in
+++ b/config/companion_libs/mpfr.in
@@ -3,6 +3,8 @@
 choice
     bool
     prompt "MPFR version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config MPFR_V_2_4_1
     bool
@@ -20,15 +22,13 @@ config MPFR_V_2_3_1
     bool
     prompt "2.3.1"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config MPFR_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.4.1" if MPFR_V_2_4_1
     default "2.4.0" if MPFR_V_2_4_0
     default "2.3.2" if MPFR_V_2_3_2
     default "2.3.1" if MPFR_V_2_3_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/companion_libs/ppl.in b/config/companion_libs/ppl.in
index efdeabfa..8f32570b 100644
--- a/config/companion_libs/ppl.in
+++ b/config/companion_libs/ppl.in
@@ -3,17 +3,17 @@
 choice
     bool
     prompt "PPL version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config PPL_V_0_10_2
     bool
     prompt "0.10.2"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config PPL_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.10.2" if PPL_V_0_10_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in
index b643d60d..7e026d03 100644
--- a/config/debug/dmalloc.in
+++ b/config/debug/dmalloc.in
@@ -6,6 +6,8 @@ config DEBUG_dmalloc
 choice
     bool
     prompt "dmalloc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config DMALLOC_V_5_5_2
     bool
@@ -16,13 +18,11 @@ config DMALLOC_V_5_4_3
     prompt "5.4.3 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config DMALLOC_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "5.5.2" if DMALLOC_V_5_5_2
     default "5.4.3" if DMALLOC_V_5_4_3
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/debug/duma.in b/config/debug/duma.in
index 7530489a..0afb5b8e 100644
--- a/config/debug/duma.in
+++ b/config/debug/duma.in
@@ -20,6 +20,8 @@ config DUMA_SO
 choice
     bool
     prompt "D.U.M.A. version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config DUMA_V_2_5_15
     bool
@@ -41,16 +43,14 @@ config DUMA_V_2_5_1
     bool
     prompt "2_5_1"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config DUMA_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2_5_15" if DUMA_V_2_5_15
     default "2_5_14" if DUMA_V_2_5_14
     default "2_5_12" if DUMA_V_2_5_12
     default "2_5_8" if DUMA_V_2_5_8
     default "2_5_1" if DUMA_V_2_5_1
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 79c9cd87..b5673352 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -96,12 +96,8 @@ choice
     bool
     prompt "gdb version"
     depends on GDB_CROSS || GDB_NATIVE || GDB_GDBSERVER
-
-config GDB_V_snapshot
-    bool
-    prompt "snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    depends on ! GDB_CROSS_INSIGHT
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config GDB_V_6_8
     bool
@@ -131,22 +127,25 @@ config GDB_V_6_4
     prompt "6.4 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
+config GDB_V_snapshot
+    bool
+    prompt "snapshot (EXPERIMENTAL)"
+    depends on EXPERIMENTAL
+    depends on ! GDB_CROSS_INSIGHT
 
 endchoice
 
 config GDB_VERSION
     string
-    default "snapshot" if GDB_V_snapshot
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "6.8" if GDB_V_6_8
     default "6.7.1" if GDB_V_6_7_1
     default "6.7" if GDB_V_6_7
     default "6.6" if GDB_V_6_6
     default "6.5" if GDB_V_6_5
     default "6.4" if GDB_V_6_4
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "snapshot" if GDB_V_snapshot
 
 if GDB_NATIVE
 
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 7fd6baff..58579c3b 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -11,6 +11,8 @@ config DEBUG_ltrace
 choice
     bool
     prompt "ltrace version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config LTRACE_V_0_5_2
     bool
@@ -29,15 +31,13 @@ config LTRACE_V_0_4
     bool
     prompt "0.4"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config LTRACE_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.5.2" if LTRACE_V_0_5_2
     default "0.5.1" if LTRACE_V_0_5_1
     default "0.5" if LTRACE_V_0_5
     default "0.4" if LTRACE_V_0_4
-# CT_INSERT_VERSION_STRING_ABOVE
-# # Don't remove above line!
diff --git a/config/debug/strace.in b/config/debug/strace.in
index c46d540b..4fcaa735 100644
--- a/config/debug/strace.in
+++ b/config/debug/strace.in
@@ -5,6 +5,8 @@ config DEBUG_strace
 choice
     bool
     prompt "strace version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config STRACE_V_4_5_18
     bool
@@ -33,17 +35,15 @@ config STRACE_V_4_5
     prompt "4.5 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config STRACE_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "4.5.18" if STRACE_V_4_5_18
     default "4.5.17" if STRACE_V_4_5_17
     default "4.5.16" if STRACE_V_4_5_16
     default "4.5.15" if STRACE_V_4_5_15
     default "4.5.14" if STRACE_V_4_5_14
     default "4.5" if STRACE_V_4_5
-# CT_INSERT_VERSION_STRING_ABOVE
-# # Don't remove above line!
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index f96f5893..717c1de4 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -31,6 +31,8 @@ config KERNEL_LINUX_INSTALL_CHECK
 choice
     bool
     prompt "Linux kernel version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config KERNEL_V_2_6_31
     bool
@@ -145,9 +147,6 @@ config KERNEL_V_2_6_18_8
     prompt "2.6.18.8 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-
 config KERNEL_V_select
     bool
     prompt "Other version (EXPERIMENTAL)"
@@ -158,6 +157,8 @@ endchoice
 config KERNEL_VERSION
     string
     prompt "Kernel version" if KERNEL_V_select
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.6.31" if KERNEL_V_2_6_31
     default "2.6.30.6" if KERNEL_V_2_6_30_6
     default "2.6.30.5" if KERNEL_V_2_6_30_5
@@ -184,8 +185,6 @@ config KERNEL_VERSION
     default "2.6.20.21" if KERNEL_V_2_6_20_21
     default "2.6.19.7" if KERNEL_V_2_6_19_7
     default "2.6.18.8" if KERNEL_V_2_6_18_8
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
     help
       Enter here the kernel version you want to use, if it is
       not listed above. Something like V.P.S or V.P.S.E, where:
diff --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index c98ebd52..c507a47e 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -15,6 +15,8 @@ config LIBC_eglibc
 choice
     bool
     prompt "eglibc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config LIBC_V_2_10
     bool
@@ -40,9 +42,6 @@ config EGLIBC_V_2_5
     bool
     prompt "2_5"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-
 config EGLIBC_V_TRUNK
     bool
     prompt "'trunk'"
@@ -53,15 +52,15 @@ endchoice
 
 config LIBC_VERSION
     string
-    default "trunk" if EGLIBC_V_TRUNK
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2_10" if LIBC_V_2_10
     default "2_9" if EGLIBC_V_2_9
     default "2_8" if EGLIBC_V_2_8
     default "2_7" if EGLIBC_V_2_7
     default "2_6" if EGLIBC_V_2_6
     default "2_5" if EGLIBC_V_2_5
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "trunk" if EGLIBC_V_TRUNK
 
 config EGLIBC_REVISION
     string
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 310cc8f9..97d21c3e 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -11,6 +11,8 @@ config LIBC_glibc
 choice
     bool
     prompt "glibc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config LIBC_V_2_9
     bool
@@ -47,9 +49,6 @@ config LIBC_V_2_3_6
     prompt "2.3.6 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-
 config LIBC_V_LATEST
     bool
     prompt "'latest' snapshot (EXPERIMENTAL)"
@@ -65,7 +64,8 @@ endchoice
 config LIBC_VERSION
     string
     prompt "Enter date (YYYYMMDD)" if LIBC_V_date
-    default "latest" if LIBC_V_LATEST
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "2.9" if LIBC_V_2_9
     default "2.8" if LIBC_V_2_8
     default "2.7" if LIBC_V_2_7
@@ -74,8 +74,7 @@ config LIBC_VERSION
     default "2.5.1" if LIBC_V_2_5_1
     default "2.5" if LIBC_V_2_5
     default "2.3.6" if LIBC_V_2_3_6
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "latest" if LIBC_V_LATEST
 
 config LIBC_GLIBC_2_8_or_later
     bool
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index c4b9e088..e9522783 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -13,23 +13,21 @@ config LIBC_newlib
 choice
     bool
     prompt "newlib version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config NEWLIB_V_1_17_0
     bool
     prompt "1.17.0"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-
 endchoice
 
 config LIBC_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "1.17.0" if NEWLIB_V_1_17_0
 
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
-
 config ATMEL_AVR32_HEADERS
     bool
     prompt "Install Atmel AVR32 headers"
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index e583b765..81c3b28f 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -11,6 +11,8 @@ config LIBC_uClibc
 choice
     bool
     prompt "uClibc version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config LIBC_V_0_9_30_1
     bool
@@ -45,9 +47,6 @@ config LIBC_V_0_9_28
     prompt "0.9.28 (OBSOLETE)"
     depends on OBSOLETE
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
-
 config LIBC_V_snapshot
     bool
     prompt "latest snapshot (EXPERIMENTAL)"
@@ -63,7 +62,8 @@ endchoice
 config LIBC_VERSION
     string
     prompt "Enter date (YYYYMMDD)" if LIBC_V_specific_date
-    default "snapshot" if LIBC_V_snapshot
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.9.30.1" if LIBC_V_0_9_30_1
     default "0.9.30" if LIBC_V_0_9_30
     default "0.9.29" if LIBC_V_0_9_29
@@ -71,8 +71,7 @@ config LIBC_VERSION
     default "0.9.28.2" if LIBC_V_0_9_28_2
     default "0.9.28.1" if LIBC_V_0_9_28_1
     default "0.9.28" if LIBC_V_0_9_28
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
+    default "snapshot" if LIBC_V_snapshot
 
 config LIBC_UCLIBC_0_9_30_or_later
     bool
diff --git a/config/tools/libelf.in b/config/tools/libelf.in
index 1513fb09..0165a394 100644
--- a/config/tools/libelf.in
+++ b/config/tools/libelf.in
@@ -8,6 +8,8 @@ config TOOL_libelf
 choice
     bool
     prompt "libelf version"
+# Don't remove next line
+# CT_INSERT_VERSION_BELOW
 
 config LIBELF_V_0_8_11
     bool
@@ -17,13 +19,11 @@ config LIBELF_V_0_8_10
     bool
     prompt "0.8.10"
 
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
 config LIBELF_VERSION
     string
+# Don't remove next line
+# CT_INSERT_VERSION_STRING_BELOW
     default "0.8.11" if LIBELF_V_0_8_11
     default "0.8.10" if LIBELF_V_0_8_10
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index 255b8fe5..c2265218 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -78,34 +78,34 @@ addToolVersion() {
     case "${EXP},${OBS}" in
         ,)  ;;
         ,*) exp_obs_prompt="  (OBSOLETE)"
-            deps="    depends on OBSOLETE\n"
+            deps="    depends on OBSOLETE"
             ;;
         *,) exp_obs_prompt="  (EXPERIMENTAL)"
-            deps="    depends on EXPERIMENTAL\n"
+            deps="    depends on EXPERIMENTAL"
             ;;
         *)  exp_obs_prompt="  (EXPERIMENTAL, OBSOLETE)"
-            deps="    depends on EXPERIMENTAL && OBSOLETE\n"
+            deps="    depends on EXPERIMENTAL \\&\\& OBSOLETE"
             ;;
     esac
     [ -n "${exp_obs_prompt}" ] && SedExpr1="${SedExpr1}${exp_obs_prompt}"
-    SedExpr1="${SedExpr1}\"\n"
-    [ -n "${deps}" ] && SedExpr1="${SedExpr1}${deps}"
+    SedExpr1="${SedExpr1}\""
+    [ -n "${deps}" ] && SedExpr1="${SedExpr1}\n${deps}"
     if [ "${tool}" = "gcc" ]; then
         # Extract 'M'ajor and 'm'inor from version string
         ver_M=$(echo "${version}...." |cut -d . -f 1)
         ver_m=$(echo "${version}...." |cut -d . -f 2)
         if [    ${ver_M} -gt 4                          \
              -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \)  ]; then
-            SedExpr1="${SedExpr1}    select CC_GCC_4_3_or_later\n"
+            SedExpr1="${SedExpr1}\n    select CC_GCC_4_3_or_later"
         fi
         if [    ${ver_M} -gt 4                          \
              -o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \)  ]; then
-            SedExpr1="${SedExpr1}    select CC_GCC_4_4_or_later\n"
+            SedExpr1="${SedExpr1}\n    select CC_GCC_4_4_or_later"
         fi
     fi
     SedExpr2="    default \"${version}\" if ${cat}_V_${v}"
-    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_ABOVE)$/'"${SedExpr1}"'\n\1/;' "${file}"
-    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_ABOVE)$/'"${SedExpr2}"'\n\1/;' "${file}"
+    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n'"${SedExpr1}"'/;' "${file}"
+    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}"
 }
 
 cat=
-- 
cgit v1.2.3


From b6568d675b4da948cc9b965d88203f8f52bd05c9 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 13 Sep 2009 18:44:17 +0200
Subject: config: fix indentation for options marked EXPERIMENTAL or OBSOLETE

Change the 2-space separation into a 1-space separation, for the sake
of homogeneity.
---
 config/binutils/binutils.in | 4 ++--
 config/cc/gcc.in            | 2 +-
 config/debug/ltrace.in      | 2 +-
 scripts/addToolVersion.sh   | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 904dad2e..9d506b5d 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -13,12 +13,12 @@ choice
 
 config BINUTILS_V_2_19_51_0_2
     bool
-    prompt "2.19.51.0.2  (EXPERIMENTAL)"
+    prompt "2.19.51.0.2 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
 config BINUTILS_V_2_19_51_0_1
     bool
-    prompt "2.19.51.0.1  (EXPERIMENTAL)"
+    prompt "2.19.51.0.1 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
 config BINUTILS_V_2_19_50_0_1
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index d0ff4ab7..d4792723 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -21,7 +21,7 @@ choice
 
 config CC_V_4_4_1
     bool
-    prompt "4.4.1  (EXPERIMENTAL)"
+    prompt "4.4.1 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
     select CC_GCC_4_3_or_later
     select CC_GCC_4_4_or_later
diff --git a/config/debug/ltrace.in b/config/debug/ltrace.in
index 58579c3b..50d365d1 100644
--- a/config/debug/ltrace.in
+++ b/config/debug/ltrace.in
@@ -20,7 +20,7 @@ config LTRACE_V_0_5_2
 
 config LTRACE_V_0_5_1
     bool
-    prompt "0.5.1  (EXPERIMENTAL)"
+    prompt "0.5.1 (EXPERIMENTAL)"
     depends on EXPERIMENTAL
 
 config LTRACE_V_0_5
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index c2265218..a4d7343a 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -77,13 +77,13 @@ addToolVersion() {
     SedExpr1="${SedExpr1}    prompt \"${version}"
     case "${EXP},${OBS}" in
         ,)  ;;
-        ,*) exp_obs_prompt="  (OBSOLETE)"
+        ,*) exp_obs_prompt=" (OBSOLETE)"
             deps="    depends on OBSOLETE"
             ;;
-        *,) exp_obs_prompt="  (EXPERIMENTAL)"
+        *,) exp_obs_prompt=" (EXPERIMENTAL)"
             deps="    depends on EXPERIMENTAL"
             ;;
-        *)  exp_obs_prompt="  (EXPERIMENTAL, OBSOLETE)"
+        *)  exp_obs_prompt=" (EXPERIMENTAL, OBSOLETE)"
             deps="    depends on EXPERIMENTAL \\&\\& OBSOLETE"
             ;;
     esac
-- 
cgit v1.2.3


From 5fea8b3826022e14828c27d67b20918e452c03f0 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 26 Sep 2009 12:45:07 +0200
Subject: Insert an empty line bwetween added new versions.

---
 scripts/addToolVersion.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index a4d7343a..c9102ca3 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -104,7 +104,7 @@ addToolVersion() {
         fi
     fi
     SedExpr2="    default \"${version}\" if ${cat}_V_${v}"
-    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n'"${SedExpr1}"'/;' "${file}"
+    "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_BELOW)$/\1\n\n'"${SedExpr1}"'/;' "${file}"
     "${sed}" -r -i -e 's/^(# CT_INSERT_VERSION_STRING_BELOW)$/\1\n'"${SedExpr2}"'/;' "${file}"
 }
 
-- 
cgit v1.2.3


From 9d743adb55f97aa22bfa33577c76d68b6a61cb7b Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sun, 27 Sep 2009 12:12:21 +0200
Subject: scripts: update config.guess and config.sub

---
 scripts/config.guess | 111 +++++++++++++++++----------------------------------
 scripts/config.sub   |   7 ++--
 2 files changed, 40 insertions(+), 78 deletions(-)

(limited to 'scripts')

diff --git a/scripts/config.guess b/scripts/config.guess
index bb0b03ea..e792aac6 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-08-19'
+timestamp='2009-09-18'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -854,6 +854,20 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -876,6 +890,9 @@ EOF
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -911,29 +928,12 @@ EOF
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -942,8 +942,11 @@ EOF
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -966,58 +969,6 @@ EOF
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1247,6 +1198,16 @@ EOF
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff --git a/scripts/config.sub b/scripts/config.sub
index 8ca084bf..0a55da1b 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-08-19'
+timestamp='2009-09-25'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -287,6 +287,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +301,7 @@ case $basic_machine in
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -371,7 +372,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-- 
cgit v1.2.3


From b586e9ce7214b85e875ca608ea4bd7db1c4fe4e2 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Fri, 2 Oct 2009 00:04:24 +0200
Subject: libc/glibc: remove dead code

The option to retrieve snapshots is already handled by
the generic 'specific date' and 'use latest' entries.
No need for a special case, as there's no code for it.
---
 config/libc/glibc.in        | 10 ----------
 scripts/build/libc/glibc.sh |  2 --
 2 files changed, 12 deletions(-)

(limited to 'scripts')

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 97d21c3e..3da40753 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -128,14 +128,4 @@ config LIBC_GLIBC_CVS_date
 
 endif #  LIBC_GLIBC_CVS
 
-#config LIBC_GLIBC_SNAPSHOT
-#    bool
-#    prompt "Use latest nightly snapshot"
-#    help
-#      See the help for the entry "Released tarball", above.
-#      
-#      If you can live with a moving code-base, say 'Y' here.
-#      If you want your toolchain to really be reproducible, look at the
-#      choice entry "Released tarball from FTP", above.
-
 endchoice
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index a83fb253..2573da68 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -47,8 +47,6 @@ do_libc_get() {
                       "glibc-${version}-branch${date:+:}${date}"        \
                       "glibc-${addon}-cvs-${CT_LIBC_VERSION}"
         done
-#    elif [ "${CT_LIBC_GLIBC_SNAPSHOT}" = "y" ]; then
-#        : # Not yet handled...
     fi
 
     return 0
-- 
cgit v1.2.3


From 443f51a2dcaec99457e5797758c65e5c6c1d3664 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Fri, 2 Oct 2009 22:10:38 +0200
Subject: libc/glibc: fix building for seemingly native toolchains

Build glibc with -O2 as a fix/workaround to building
seemingly-native toolchains.

See:
- docs/overview.txt
- docs/known-issues.txt
- http://sourceware.org/ml/crossgcc/2009-09/msg00055.html
---
 docs/known-issues.txt       |  6 ++++--
 docs/overview.txt           | 16 ++++++++++++++++
 scripts/build/libc/glibc.sh |  8 ++++----
 3 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/docs/known-issues.txt b/docs/known-issues.txt
index 3c7eaab5..757939f2 100644
--- a/docs/known-issues.txt
+++ b/docs/known-issues.txt
@@ -51,8 +51,10 @@ Fix:
   None known.
 
 Workaround:
-  If this happens for you, stick with glibc-2.6.1 for now.
-  Or investigate! :-)
+  It seems that using -O2 in the CFLAGS fixes the problem. It has been
+  confirmed in the following threads:
+    http://sourceware.org/ml/crossgcc/2009-09/msg00055.html (for glibc)
+    http://sourceware.org/ml/crossgcc/2009-10/msg00001.html (for eglibc)
 
 --------------------------------
 Symptoms:
diff --git a/docs/overview.txt b/docs/overview.txt
index 3b100a18..8d9a6f04 100644
--- a/docs/overview.txt
+++ b/docs/overview.txt
@@ -28,6 +28,7 @@ Running crosstool-NG
   Tools wrapper
 Using the toolchain
 Toolchain types
+  Seemingly-native toolchains
 Internals
   Makefile front-end
   Kconfig parser
@@ -590,6 +591,21 @@ anyway!)
     were all being hashed out, Canada had three national political parties.
     http://en.wikipedia.org/wiki/Cross_compiler
 
+Seemingly-native toolchains |
+----------------------------+
+
+Seemingly-native toolchains are toolchains that target the same architecture
+as the one it is built on, and on which it will run, but the machine tuple
+may be different (eg i686 vs. i386, or x86_64-unknown-linux-gnu vs.
+x86_64-pc-linux-gnu). This also applies if the target architecture is of the
+same kind (eg. x86 vs. x86_64, or ppc vs. ppc64).
+
+Such toolchain is tricky to build, as the configure scripts may incorrectly
+assume that files (headers and libs) from the build (or host) machine can be
+used by the cross-compiler it is going to build. The problem seems to arise
+only with glibc (and eglibc?) starting with version 2.7.
+
+
 _____________
             /
 Internals  /
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index a83fb253..0f60bd13 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -180,7 +180,7 @@ do_libc_headers() {
 
         libc_cv_ppc_machine=yes                         \
         CT_DoExecLog ALL                                \
-        make CFLAGS="-O -DBOOTSTRAP_GCC"                \
+        make CFLAGS="-O2 -DBOOTSTRAP_GCC"               \
              OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"    \
              PARALLELMFLAGS="${PARALLELMFLAGS}"         \
              sysdeps/gnu/errlist.c
@@ -197,7 +197,7 @@ do_libc_headers() {
     CT_DoExecLog ALL                                \
     make cross-compiling=yes                        \
          install_root=${CT_SYSROOT_DIR}             \
-         CFLAGS="-O -DBOOTSTRAP_GCC"                \
+         CFLAGS="-O2 -DBOOTSTRAP_GCC"               \
          ${LIBC_SYSROOT_ARG}                        \
          OBJDUMP_FOR_HOST="${CT_TARGET}-objdump"    \
          PARALLELMFLAGS="${PARALLELMFLAGS}"         \
@@ -325,7 +325,7 @@ do_libc_start_files() {
     # Please see the comment for the configure step in do_libc().
 
     BUILD_CC="${CT_BUILD}-gcc"                                      \
-    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O "  \
+    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O2"  \
     CC="${cross_cc} ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}"      \
     AR=${CT_TARGET}-ar                                              \
     RANLIB=${CT_TARGET}-ranlib                                      \
@@ -457,7 +457,7 @@ do_libc() {
     # silly messages. GNU folks again, he?
 
     BUILD_CC="${CT_BUILD}-gcc"                                      \
-    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O"   \
+    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O2"  \
     CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
     AR=${CT_TARGET}-ar                                              \
     RANLIB=${CT_TARGET}-ranlib                                      \
-- 
cgit v1.2.3


From 399a88364fc3ae6555d90a8ccb47feb6d2efaf53 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Fri, 2 Oct 2009 22:10:17 +0200
Subject: libc/eglibc: fix building for seemingly native toolchains

Build eglibc with -O2 as a fix/workaround to building
seemingly-native toolchains (see docs/overview.txt).

See:
- docs/overview.txt
- docs/known-issues.txt
- http://sourceware.org/ml/crossgcc/2009-10/msg00001.html
---
 scripts/build/libc/eglibc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index 340a02f2..e2bd37b5 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -252,7 +252,7 @@ do_libc() {
     CT_DoLog DEBUG "Extra CC args passed    : '${extra_cc_args}'"
 
     BUILD_CC="${CT_BUILD}-gcc"                                      \
-    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O"   \
+    CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O2"  \
     CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \
     AR=${CT_TARGET}-ar                                              \
     RANLIB=${CT_TARGET}-ranlib                                      \
-- 
cgit v1.2.3


From c3b2d932d8d4dd5b89de505a724f3fc42600e456 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 3 Oct 2009 17:09:18 +0200
Subject: debug/gdb: cleanup (remove) the static ncurses build

ncurses is built solely for the sake of building a native gdb.
The user should not rely on this library to build his/her userland,
but should rather build his/her own. So we remove it from the
sysroot after we successfully build the native gdb.
---
 scripts/build/debug/300-gdb.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 9207ca7b..d9f2439f 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -265,6 +265,10 @@ do_debug_gdb_build() {
 
         unset ac_cv_func_strncmp_works
 
+        CT_DoLog EXTRA "Cleaning up ncurses"
+        cd "${CT_BUILD_DIR}/build-ncurses"
+        CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" uninstall
+
         CT_EndStep # native gdb build
     fi
 
-- 
cgit v1.2.3


From d0c5d174bf933509d09656f050941bc465e25357 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 3 Oct 2009 18:19:39 +0200
Subject: libc/glibc: don't use legacy snapshots

glibc snapshots have not been updated for about the
past 5 months. Consider them to be deprecated, now.
---
 config/libc/glibc.in        | 12 ------------
 scripts/build/libc/glibc.sh | 12 ------------
 2 files changed, 24 deletions(-)

(limited to 'scripts')

diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 3da40753..777657c2 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -49,21 +49,10 @@ config LIBC_V_2_3_6
     prompt "2.3.6 (OBSOLETE)"
     depends on OBSOLETE
 
-config LIBC_V_LATEST
-    bool
-    prompt "'latest' snapshot (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config LIBC_V_date
-    bool
-    prompt "<specific date> (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
 endchoice
 
 config LIBC_VERSION
     string
-    prompt "Enter date (YYYYMMDD)" if LIBC_V_date
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
     default "2.9" if LIBC_V_2_9
@@ -74,7 +63,6 @@ config LIBC_VERSION
     default "2.5.1" if LIBC_V_2_5_1
     default "2.5" if LIBC_V_2_5
     default "2.3.6" if LIBC_V_2_3_6
-    default "latest" if LIBC_V_LATEST
 
 config LIBC_GLIBC_2_8_or_later
     bool
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 2573da68..8476bf8c 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -292,12 +292,6 @@ do_libc_start_files() {
     # Add some default CC args
     glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
     glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
-    # In case we're using a snapshot, fake a >=2.6 version.
-    if [    "${CT_LIBC_V_LATEST}" = "y" \
-         -o "${CT_LIBC_V_date}" = "y"   ]; then
-        glibc_version_major=3
-        glibc_version_minor=0
-    fi
     if [    ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6    \
          -o ${glibc_version_major} -gt 2                                    ]; then
         # Don't use -pipe: configure chokes on it for glibc >= 2.6.
@@ -407,12 +401,6 @@ do_libc() {
     # Add some default CC args
     glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([[:digit:]]+).*/\1/')
     glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[[:digit:]]+[\.-_]([[:digit:]]+).*/\1/')
-    # In case we're using a snapshot, fake a >=2.6 version.
-    if [    "${CT_LIBC_V_LATEST}" = "y" \
-         -o "${CT_LIBC_V_date}" = "y"   ]; then
-        glibc_version_major=3
-        glibc_version_minor=0
-    fi
     if [    ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6    \
          -o ${glibc_version_major} -gt 2                                    ]; then
         # Don't use -pipe: configure chokes on it for glibc >= 2.6.
-- 
cgit v1.2.3