[Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend

All of lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend
@ 2011-08-07 19:19 Yann E. MORIN
  2011-08-07 19:19 ` [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version Yann E. MORIN
  2011-08-07 19:19 ` [Buildroot] [PATCH 2/2] toolchain/crosstool-NG: update bundled config files Yann E. MORIN
  0 siblings, 2 replies; 6+ messages in thread
From: Yann E. MORIN @ 2011-08-07 19:19 UTC (permalink / raw)
  To: buildroot

Hello All!

This patchset updates the crosstool-NG backend to the newly released 1.12.0.
Existing patches were applied upstream, and are no longer needed. A new patch
is added because it works around a limitation specific to buildroot; it will
not go upstream as-is, a better fix will have to be found.

    [PATCH 1/2] toochain/crosstool-NG: bump version
    [PATCH 2/2] toolchain/crosstool-NG: update bundled config files

 .../crosstool-ng-000-makefile-recursion.patch      |   30 +++
 package/crosstool-ng/crosstool-ng-001-no-cvs.patch |   15 --
 ...-break-on-existing-symlinks-and-build.log.patch |   76 -------
 .../crosstool-ng-003-autostuf-compat.patch         |   10 -
 package/crosstool-ng/crosstool-ng.mk               |    2 +-
 .../crosstool-ng.config-eglibc                     |  227 ++++++-------------
 .../crosstool-ng.config-glibc                      |  234 ++++++--------------
 .../crosstool-ng.config-uClibc                     |  192 ++++------------
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk   |    2 +-
 9 files changed, 212 insertions(+), 576 deletions(-)

Regards,
Yann E. MORIN.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version
  2011-08-07 19:19 [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend Yann E. MORIN
@ 2011-08-07 19:19 ` Yann E. MORIN
  2011-08-07 19:27   ` Peter Korsgaard
  2011-08-07 19:19 ` [Buildroot] [PATCH 2/2] toolchain/crosstool-NG: update bundled config files Yann E. MORIN
  1 sibling, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2011-08-07 19:19 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 .../crosstool-ng-000-makefile-recursion.patch      |   30 ++++++++
 package/crosstool-ng/crosstool-ng-001-no-cvs.patch |   15 ----
 ...-break-on-existing-symlinks-and-build.log.patch |   76 --------------------
 .../crosstool-ng-003-autostuf-compat.patch         |   10 ---
 package/crosstool-ng/crosstool-ng.mk               |    2 +-
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk   |    2 +-
 6 files changed, 32 insertions(+), 103 deletions(-)

diff --git a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
new file mode 100644
index 0000000..2d67394
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
@@ -0,0 +1,30 @@
+Makefile: allow recursion
+
+When crosstool-NG is used standalone, we completely avoid recursion,
+because the Makefile calls itself only once.
+
+But when used as the buildroot toolchain backend, there is already
+one level of make recursion when we first call the crosstool-NG
+Makefile. And when buildroot is used out-of-tree, we are already
+at the second level of recursion when calling the crosstool-NG
+Makefile.
+
+So, to cope with the situation, only bail out at the 2nd level of
+recursion, not the 0-th level.
+
+This probably won't go upstream.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+
+diff -durN crosstool-ng-1.12.0.orig//Makefile.in crosstool-ng-1.12.0/Makefile.in
+--- crosstool-ng-1.12.0.orig//Makefile.in	2011-08-01 01:21:34.000000000 +0200
++++ crosstool-ng-1.12.0/Makefile.in	2011-08-07 14:37:02.678715954 +0200
+@@ -95,7 +95,7 @@
+ # level.
+ # This has the side effect of only showing the real targets, and hiding our
+ # internal ones. :-)
+-ifneq ($(MAKELEVEL),0)
++ifneq ($(MAKELEVEL),2)
+ $(error Recursion detected, bailing out...)
+ endif
+ 
diff --git a/package/crosstool-ng/crosstool-ng-001-no-cvs.patch b/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
deleted file mode 100644
index c82d359..0000000
--- a/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Remove dependency on cvs.
-
-cvs is used to retrieve newlib, which is not supported
-under Buildroot, so cvs is not required.
-
---- crosstool-ng-1.8.0/configure.orig	2010-11-27 15:43:52.000000000 +0000
-+++ crosstool-ng-1.8.0/configure	2010-11-27 15:44:10.000000000 +0000
-@@ -359,7 +359,6 @@
-              err="'libtool' 1.5.26 or above was not found"
- has_or_abort prog=stat
- has_or_abort prog="curl wget"
--has_or_abort prog=cvs
- has_or_abort prog=patch
- has_or_abort prog=tar
- has_or_abort prog=gzip
diff --git a/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch b/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
deleted file mode 100644
index 2bb613f..0000000
--- a/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-
-# HG changeset patch
-# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-# Date 1310507544 -7200
-# Node ID 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3
-# Parent  f1c730da41f3b22ca1a1e1b14592da4b7c078797
-scripts, cc/gcc: do not fail on existing symlinks or build.log
-
-If the user builds a toolchain over an existing one, so, without removing
-CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
-build.log.
-
-This can also happen (for build.log) if the user first ran in download-
-or extract-only.
-
-Patch (with no SoB) originally from:
-  Phil Wilshire <phil.wilshire@overturenetworks.com>
-
-Modified by me as it did not apply cleanly.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/cc/gcc.sh
---- a/scripts/build/cc/gcc.sh	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/build/cc/gcc.sh	Tue Jul 12 23:52:24 2011 +0200
-@@ -386,7 +386,7 @@
-     # check whether compiler has an extension
-     file="$( ls -1 "${core_prefix_dir}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
-     [ -z "${file}" ] || ext=".${file##*.}"
--    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
-+    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
- 
-     CT_EndStep
- }
-@@ -630,7 +630,7 @@
-     # check whether compiler has an extension
-     file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
-     [ -z "${file}" ] || ext=".${file##*.}"
--    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
-+    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
- 
-     CT_EndStep
- }
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/internals.sh
---- a/scripts/build/internals.sh	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/build/internals.sh	Tue Jul 12 23:52:24 2011 +0200
-@@ -86,14 +86,14 @@
-     for t in "${CT_TARGET}-"*; do
-         if [ -n "${CT_TARGET_ALIAS}" ]; then
-             _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
--            CT_DoExecLog ALL ln -sv "${t}" "${_t}"
-+            CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
-         fi
-         if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
-             _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
-             if [ "${_t}" = "${t}" ]; then
-                 CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
-             else
--                CT_DoExecLog ALL ln -sv "${t}" "${_t}"
-+                CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
-             fi
-         fi
-     done
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/crosstool-NG.sh.in
---- a/scripts/crosstool-NG.sh.in	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/crosstool-NG.sh.in	Tue Jul 12 23:52:24 2011 +0200
-@@ -604,7 +604,7 @@
- # moment... Consign all ouptut to oblivion...
- CT_DoLog INFO "Finishing installation (may take a few seconds)..."
- exec >/dev/null 2>&1
--
-+rm -f ${CT_PREFIX_DIR}/build.log.bz2
- if [ "${CT_LOG_TO_FILE}" = "y" ]; then
-     cp "${tmp_log_file}" "${CT_PREFIX_DIR}/build.log"
-     if [ "${CT_LOG_FILE_COMPRESS}" = y ]; then
-
diff --git a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch b/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
deleted file mode 100644
index d79e62b..0000000
--- a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- crosstool-ng-1.11.3/configure	2011-05-21 01:10:10.000000000 +0200
-+++ host-crosstool-ng-1.11.3/configure	2011-07-14 17:35:25.830403914 +0200
-@@ -260,6 +260,7 @@
-         # Skip, auto-stuff compatibility
-         --build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
-         --build|--host|--infodir|--datadir|--sysconfdir|--localstatedir)             shift 2;;
-+        --enable-shared|--disable-shared|--enable-static|--disable-static)           shift;;
-         *)          printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
-     esac
- done
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index b40cf35..2bbf631 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.11.3
+CROSSTOOL_NG_VERSION           = 1.12.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 912bb06..3a205dd 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -203,7 +203,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="unknown":;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(GNU_TARGET_NAME)":;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_CC_PKGVERSION)="(.*)":\1="crosstool-NG $(CTNG_VERSION) - buildroot $(BR2_VERSION_FULL)":;
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
 ifneq ($(call qstrip,$(BR2_USE_MMU)),)
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
 else
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version
  2011-08-07 19:19 ` [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version Yann E. MORIN
@ 2011-08-07 19:27   ` Peter Korsgaard
  2011-08-07 19:36     ` Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2011-08-07 19:27 UTC (permalink / raw)
  To: buildroot

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@anciens.enib.fr> writes:

Hi,

 Yann> +Makefile: allow recursion
 Yann> +
 Yann> +When crosstool-NG is used standalone, we completely avoid recursion,
 Yann> +because the Makefile calls itself only once.
 Yann> +
 Yann> +But when used as the buildroot toolchain backend, there is already
 Yann> +one level of make recursion when we first call the crosstool-NG
 Yann> +Makefile. And when buildroot is used out-of-tree, we are already
 Yann> +at the second level of recursion when calling the crosstool-NG
 Yann> +Makefile.
 Yann> +
 Yann> +So, to cope with the situation, only bail out at the 2nd level of
 Yann> +recursion, not the 0-th level.
 Yann> +
 Yann> +This probably won't go upstream.
 Yann> +
 Yann> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
 Yann> +
 Yann> +diff -durN crosstool-ng-1.12.0.orig//Makefile.in crosstool-ng-1.12.0/Makefile.in
 Yann> +--- crosstool-ng-1.12.0.orig//Makefile.in	2011-08-01 01:21:34.000000000 +0200
 Yann> ++++ crosstool-ng-1.12.0/Makefile.in	2011-08-07 14:37:02.678715954 +0200
 Yann> +@@ -95,7 +95,7 @@
 Yann> + # level.
 Yann> + # This has the side effect of only showing the real targets, and hiding our
 Yann> + # internal ones. :-)
 Yann> +-ifneq ($(MAKELEVEL),0)
 Yann> ++ifneq ($(MAKELEVEL),2)

Doesn't this then break for in-tree builds? How about just removing
these 3 lines instead?

 Yann> + $(error Recursion detected, bailing out...)
 Yann> + endif

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version
  2011-08-07 19:27   ` Peter Korsgaard
@ 2011-08-07 19:36     ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2011-08-07 19:36 UTC (permalink / raw)
  To: buildroot

Peter, All,

On Sunday 07 August 2011 21:27:37 Peter Korsgaard wrote:
>  Yann> +-ifneq ($(MAKELEVEL),0)
>  Yann> ++ifneq ($(MAKELEVEL),2)
> 
> Doesn't this then break for in-tree builds? 

D'oh...
/me slaps own cheek

> How about just removing these 3 lines instead?

Well, the installation of crosstool-NG as the toolchain backend never
requires manualy running, hence autocompletion should never ever be
attempted, so we should not have to protect ourselves against this, indeed.

I'll repush shortly...

Thanks for pointing this out.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] toolchain/crosstool-NG: update bundled config files
  2011-08-07 19:19 [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend Yann E. MORIN
  2011-08-07 19:19 ` [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version Yann E. MORIN
@ 2011-08-07 19:19 ` Yann E. MORIN
  1 sibling, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2011-08-07 19:19 UTC (permalink / raw)
  To: buildroot

Update the crosstool-NG libc-specific config files to match the
new set of options coming with the updated crosstool-NG.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 .../crosstool-ng.config-eglibc                     |  227 ++++++-------------
 .../crosstool-ng.config-glibc                      |  234 ++++++--------------
 .../crosstool-ng.config-uClibc                     |  192 ++++------------
 3 files changed, 180 insertions(+), 473 deletions(-)

diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
index 5902d40..3b6a2e2 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-eglibc
@@ -1,8 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.11.3
-# Sat May 21 22:35:30 2011
-#
+# The crosstool-NG configuration menu
+# Sun Aug  7 15:40:17 2011
+#
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_static_link_ok=y
+CT_CONFIGURE_has_static_libstdcxx=y
+CT_CONFIGURE_has_expat=y
+CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -51,8 +57,6 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
 # CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
-# CT_PATCH_SINGLE is not set
-# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -84,55 +88,24 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH="x86"
 CT_ARCH_SUPPORTS_32=y
-# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
-# CT_ARCH_SUPPORT_ABI is not set
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-# CT_ARCH_DEFAULT_BE is not set
-CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
-# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
+CT_ARCH_TUNE="generic"
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_BITNESS=64
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86=y
 CT_ARCH_x86_AVAILABLE=y
 
 #
@@ -145,14 +118,6 @@ CT_ARCH_USE_MMU=y
 #
 
 #
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-# CT_ARCH_ARM_MODE_THUMB is not set
-CT_ARCH_ARM_EABI=y
-
-#
 # Toolchain options
 #
 
@@ -163,6 +128,9 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
+CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
 
 #
 # Tuple completion and aliasing
@@ -174,10 +142,7 @@ CT_TARGET_ALIAS=""
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
-# CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
 #
@@ -190,17 +155,28 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-# CT_BARE_METAL is not set
-# CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.4"
-# CT_KERNEL_bare_metal is not set
+CT_KERNEL_VERSION="2.6.38.8"
 CT_KERNEL_linux=y
-# CT_KERNEL_mingw32 is not set
-# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_mingw32_AVAILABLE is not set
+CT_KERNEL_LINUX_INSTALL=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39_3 is not set
+# CT_KERNEL_V_2_6_39_2 is not set
+# CT_KERNEL_V_2_6_39_1 is not set
+# CT_KERNEL_V_2_6_39 is not set
+CT_KERNEL_V_2_6_38_8=y
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_10 is not set
+# CT_KERNEL_V_2_6_33_16 is not set
+# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
 
 #
 # Common kernel options
@@ -210,22 +186,6 @@ CT_SHARED_LIBS=y
 #
 # linux other options
 #
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_2_6_38_4=y
-# CT_KERNEL_V_2_6_38_3 is not set
-# CT_KERNEL_V_2_6_38_2 is not set
-# CT_KERNEL_V_2_6_38_1 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_9 is not set
-# CT_KERNEL_V_2_6_33_12 is not set
-# CT_KERNEL_V_2_6_32_39 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_58 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
@@ -236,30 +196,26 @@ CT_KERNEL_LINUX_INSTALL_CHECK=y
 # Binary utilities
 #
 CT_ARCH_BINFMT_ELF=y
-# CT_ARCH_BINFMT_FLAT is not set
-# CT_ARCH_BINFMT_FDPIC is not set
 
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_21 is not set
 # CT_BINUTILS_V_2_20_1 is not set
 CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_19_1 is not set
 # CT_BINUTILS_V_2_19 is not set
 # CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_FORCE_LD_BFD=y
 CT_BINUTILS_LINKER_LD=y
-# CT_BINUTILS_LINKER_GOLD is not set
-# CT_BINUTILS_LINKER_LD_GOLD is not set
-# CT_BINUTILS_LINKER_GOLD_LD is not set
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 
 #
 # C compiler
@@ -267,13 +223,6 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
-# CT_CC_V_linaro_4_6_2011_04_0 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_linaro_4_5_2011_04_0 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_linaro_4_4_2011_02_0 is not set
 # CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -281,35 +230,23 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
 # CT_CC_V_4_3_5 is not set
 # CT_CC_V_4_3_4 is not set
 # CT_CC_V_4_3_3 is not set
 # CT_CC_V_4_3_2 is not set
 # CT_CC_V_4_3_1 is not set
 # CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_3 is not set
 # CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
-# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
 CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
-# CT_CC_GCC_4_5 is not set
-# CT_CC_GCC_4_5_or_later is not set
-# CT_CC_GCC_4_6 is not set
-# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
-# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_GCC_USE_MPC is not set
-# CT_CC_GCC_USE_LIBELF is not set
+# CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -321,17 +258,14 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
 # CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
 #
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
@@ -361,43 +295,43 @@ CT_CC_GCC_LDBL_128=m
 CT_LIBC="eglibc"
 CT_LIBC_VERSION="2_10"
 CT_LIBC_eglibc=y
-# CT_LIBC_glibc is not set
-# CT_LIBC_mingw is not set
-# CT_LIBC_newlib is not set
-# CT_LIBC_none is not set
-# CT_LIBC_uClibc is not set
 CT_LIBC_eglibc_AVAILABLE=y
-# CT_LIBC_EGLIBC_V_2_13 is not set
 # CT_LIBC_EGLIBC_V_2_12 is not set
 # CT_LIBC_EGLIBC_V_2_11 is not set
 CT_LIBC_EGLIBC_V_2_10=y
 # CT_LIBC_EGLIBC_V_2_9 is not set
-# CT_LIBC_EGLIBC_V_2_8 is not set
-# CT_LIBC_EGLIBC_V_2_7 is not set
-# CT_LIBC_EGLIBC_V_2_6 is not set
-# CT_LIBC_EGLIBC_V_2_5 is not set
 # CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_LIBC_EGLIBC_2_10_or_later=y
+CT_LIBC_EGLIBC_2_9_or_later=y
+CT_LIBC_EGLIBC_HAS_PKGVERSION_BUGURL=y
 CT_EGLIBC_REVISION="HEAD"
+# CT_EGLIBC_HTTP is not set
 # CT_EGLIBC_CHECKOUT is not set
 # CT_EGLIBC_OPT_SIZE is not set
 # CT_EGLIBC_CUSTOM_CONFIG is not set
-# CT_LIBC_glibc_AVAILABLE is not set
-# CT_LIBC_mingw_AVAILABLE is not set
-# CT_LIBC_newlib_AVAILABLE is not set
-# CT_LIBC_none_AVAILABLE is not set
-# CT_LIBC_uClibc_AVAILABLE is not set
-CT_LIBC_glibc_familly=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
 
 #
-# glibc/eglibc common options
+# Common C library options
 #
-CT_LIBC_GLIBC_EXTRA_CONFIG=""
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
+CT_LIBC_XLDD=y
+
+#
+# eglibc other options
+#
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_LIBC_GLIBC_CONFIGPARMS=""
 CT_LIBC_GLIBC_EXTRA_CFLAGS=""
 CT_LIBC_EXTRA_CC_ARGS=""
 # CT_LIBC_DISABLE_VERSIONING is not set
 CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+CT_LIBC_GLIBC_FORCE_UNWIND=y
 CT_LIBC_GLIBC_USE_PORTS=y
 CT_LIBC_ADDONS_LIST=""
 
@@ -423,22 +357,7 @@ CT_LIBC_ADDONS_LIST=""
 # CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
 CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.4"
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-# CT_LIBC_SUPPORT_WIN32THREADS is not set
-# CT_LIBC_SUPPORT_THREADS_NONE is not set
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-# CT_THREADS_WIN32THREADS is not set
-# CT_THREADS_NONE is not set
-CT_LIBC_XLDD=y
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.8"
 
 #
 # Debug facilities
@@ -453,34 +372,22 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
-# CT_MPC_NEEDED is not set
-# CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
-# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
-# CT_GMP_V_4_2_4 is not set
-# CT_GMP_V_4_2_2 is not set
 CT_GMP_VERSION="4.3.2"
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
-# CT_PPL_0_11 is not set
-# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
index f7c0de7..cadbb0b 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-glibc
@@ -1,8 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.11.3
-# Sat May 21 22:36:05 2011
-#
+# The crosstool-NG configuration menu
+# Sun Aug  7 15:49:35 2011
+#
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_static_link_ok=y
+CT_CONFIGURE_has_static_libstdcxx=y
+CT_CONFIGURE_has_expat=y
+CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -51,8 +57,6 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
 # CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
-# CT_PATCH_SINGLE is not set
-# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -84,55 +88,24 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH="x86"
 CT_ARCH_SUPPORTS_32=y
-# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
-# CT_ARCH_SUPPORT_ABI is not set
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-# CT_ARCH_DEFAULT_BE is not set
-CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
-# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
+CT_ARCH_TUNE="generic"
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_BITNESS=64
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86=y
 CT_ARCH_x86_AVAILABLE=y
 
 #
@@ -145,14 +118,6 @@ CT_ARCH_USE_MMU=y
 #
 
 #
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-# CT_ARCH_ARM_MODE_THUMB is not set
-CT_ARCH_ARM_EABI=y
-
-#
 # Toolchain options
 #
 
@@ -163,21 +128,21 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
+CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
 
 #
 # Tuple completion and aliasing
 #
 CT_TARGET_VENDOR="unknown"
 CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
+CT_TARGET_ALIAS="x86_64-linux"
 
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
-# CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
 #
@@ -190,17 +155,28 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-# CT_BARE_METAL is not set
-# CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.4"
-# CT_KERNEL_bare_metal is not set
+CT_KERNEL_VERSION="3.0"
 CT_KERNEL_linux=y
-# CT_KERNEL_mingw32 is not set
-# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_mingw32_AVAILABLE is not set
+CT_KERNEL_LINUX_INSTALL=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+CT_KERNEL_V_3_0=y
+# CT_KERNEL_V_2_6_39_3 is not set
+# CT_KERNEL_V_2_6_39_2 is not set
+# CT_KERNEL_V_2_6_39_1 is not set
+# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_2_6_38_8 is not set
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_10 is not set
+# CT_KERNEL_V_2_6_33_16 is not set
+# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
 
 #
 # Common kernel options
@@ -210,22 +186,6 @@ CT_SHARED_LIBS=y
 #
 # linux other options
 #
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_2_6_38_4=y
-# CT_KERNEL_V_2_6_38_3 is not set
-# CT_KERNEL_V_2_6_38_2 is not set
-# CT_KERNEL_V_2_6_38_1 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_9 is not set
-# CT_KERNEL_V_2_6_33_12 is not set
-# CT_KERNEL_V_2_6_32_39 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_58 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
@@ -236,30 +196,26 @@ CT_KERNEL_LINUX_INSTALL_CHECK=y
 # Binary utilities
 #
 CT_ARCH_BINFMT_ELF=y
-# CT_ARCH_BINFMT_FLAT is not set
-# CT_ARCH_BINFMT_FDPIC is not set
 
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_21 is not set
 # CT_BINUTILS_V_2_20_1 is not set
 CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_19_1 is not set
 # CT_BINUTILS_V_2_19 is not set
 # CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_FORCE_LD_BFD=y
 CT_BINUTILS_LINKER_LD=y
-# CT_BINUTILS_LINKER_GOLD is not set
-# CT_BINUTILS_LINKER_LD_GOLD is not set
-# CT_BINUTILS_LINKER_GOLD_LD is not set
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 
 #
 # C compiler
@@ -267,13 +223,6 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
-# CT_CC_V_linaro_4_6_2011_04_0 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_linaro_4_5_2011_04_0 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_linaro_4_4_2011_02_0 is not set
 # CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -281,35 +230,23 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
 # CT_CC_V_4_3_5 is not set
 # CT_CC_V_4_3_4 is not set
 # CT_CC_V_4_3_3 is not set
 # CT_CC_V_4_3_2 is not set
 # CT_CC_V_4_3_1 is not set
 # CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_3 is not set
 # CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
-# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
 CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
-# CT_CC_GCC_4_5 is not set
-# CT_CC_GCC_4_5_or_later is not set
-# CT_CC_GCC_4_6 is not set
-# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
-# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_GCC_USE_MPC is not set
-# CT_CC_GCC_USE_LIBELF is not set
+# CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -321,17 +258,14 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
 # CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
 #
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
@@ -360,45 +294,38 @@ CT_CC_GCC_LDBL_128=m
 #
 CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
-# CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
-# CT_LIBC_mingw is not set
-# CT_LIBC_newlib is not set
-# CT_LIBC_none is not set
-# CT_LIBC_uClibc is not set
-# CT_LIBC_eglibc_AVAILABLE is not set
 CT_LIBC_glibc_AVAILABLE=y
 CT_LIBC_GLIBC_TARBALL=y
-# CT_LIBC_GLIBC_V_2_12_2 is not set
-# CT_LIBC_GLIBC_V_2_12_1 is not set
-# CT_LIBC_GLIBC_V_2_11_1 is not set
-# CT_LIBC_GLIBC_V_2_11 is not set
-# CT_LIBC_GLIBC_V_2_10_1 is not set
 CT_LIBC_GLIBC_V_2_9=y
 # CT_LIBC_GLIBC_V_2_8 is not set
-# CT_LIBC_GLIBC_V_2_7 is not set
-# CT_LIBC_GLIBC_V_2_6_1 is not set
-# CT_LIBC_GLIBC_V_2_6 is not set
-# CT_LIBC_GLIBC_V_2_5_1 is not set
-# CT_LIBC_GLIBC_V_2_5 is not set
-# CT_LIBC_mingw_AVAILABLE is not set
-# CT_LIBC_newlib_AVAILABLE is not set
-# CT_LIBC_none_AVAILABLE is not set
-# CT_LIBC_uClibc_AVAILABLE is not set
-CT_LIBC_glibc_familly=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_THREADS="nptl"
 
 #
-# glibc/eglibc common options
+# Common C library options
 #
-CT_LIBC_GLIBC_EXTRA_CONFIG=""
+CT_THREADS_NPTL=y
+CT_LIBC_XLDD=y
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
 CT_LIBC_GLIBC_CONFIGPARMS=""
 CT_LIBC_GLIBC_EXTRA_CFLAGS=""
 CT_LIBC_EXTRA_CC_ARGS=""
 # CT_LIBC_DISABLE_VERSIONING is not set
 CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+CT_LIBC_GLIBC_FORCE_UNWIND=y
 CT_LIBC_GLIBC_USE_PORTS=y
 CT_LIBC_ADDONS_LIST=""
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
+# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
+CT_LIBC_GLIBC_MIN_KERNEL="3.0"
+
+#
+# glibc other options
+#
 
 #
 # WARNING !!!                                            
@@ -419,25 +346,6 @@ CT_LIBC_ADDONS_LIST=""
 #
 #   or try again later... :-(                            
 #
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS=y
-# CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN is not set
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.38.4"
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-# CT_LIBC_SUPPORT_LINUXTHREADS is not set
-# CT_LIBC_SUPPORT_WIN32THREADS is not set
-# CT_LIBC_SUPPORT_THREADS_NONE is not set
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-# CT_THREADS_WIN32THREADS is not set
-# CT_THREADS_NONE is not set
-CT_LIBC_XLDD=y
 
 #
 # Debug facilities
@@ -452,34 +360,22 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
-# CT_MPC_NEEDED is not set
-# CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
-# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
-# CT_GMP_V_4_2_4 is not set
-# CT_GMP_V_4_2_2 is not set
 CT_GMP_VERSION="4.3.2"
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
-# CT_PPL_0_11 is not set
-# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
index 5728e08..7d90e40 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.config-uClibc
@@ -1,8 +1,14 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: 1.11.3
-# Sat May 21 22:36:24 2011
-#
+# The crosstool-NG configuration menu
+# Sun Aug  7 15:06:46 2011
+#
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_CONFIGURE_static_link_ok=y
+CT_CONFIGURE_has_static_libstdcxx=y
+CT_CONFIGURE_has_expat=y
+CT_CONFIGURE_has_static_expat=y
 CT_BACKEND=y
 CT_MODULES=y
 
@@ -51,8 +57,6 @@ CT_PATCH_BUNDLED=y
 # CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
 # CT_PATCH_NONE is not set
 CT_PATCH_ORDER="bundled"
-# CT_PATCH_SINGLE is not set
-# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -84,55 +88,24 @@ CT_LOG_FILE_COMPRESS=y
 #
 # Target options
 #
-CT_ARCH="arm"
-CT_ARCH_SUPPORTS_BOTH_MMU=y
-CT_ARCH_SUPPORTS_BOTH_ENDIAN=y
+CT_ARCH="x86"
 CT_ARCH_SUPPORTS_32=y
-# CT_ARCH_SUPPORTS_64 is not set
+CT_ARCH_SUPPORTS_64=y
 CT_ARCH_SUPPORT_ARCH=y
-# CT_ARCH_SUPPORT_ABI is not set
 CT_ARCH_SUPPORT_CPU=y
 CT_ARCH_SUPPORT_TUNE=y
-CT_ARCH_SUPPORT_FPU=y
-CT_ARCH_DEFAULT_HAS_MMU=y
-# CT_ARCH_DEFAULT_BE is not set
-CT_ARCH_DEFAULT_LE=y
 CT_ARCH_DEFAULT_32=y
-# CT_ARCH_DEFAULT_64 is not set
 CT_ARCH_ARCH=""
 CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_FPU=""
-# CT_ARCH_BE is not set
-CT_ARCH_LE=y
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
+CT_ARCH_TUNE="generic"
+# CT_ARCH_32 is not set
+CT_ARCH_64=y
+CT_ARCH_BITNESS=64
 CT_ARCH_FLOAT_HW=y
 # CT_ARCH_FLOAT_SW is not set
 CT_TARGET_CFLAGS=""
 CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-CT_ARCH_arm=y
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-# CT_ARCH_x86 is not set
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86=y
 CT_ARCH_x86_AVAILABLE=y
 
 #
@@ -145,14 +118,6 @@ CT_ARCH_USE_MMU=y
 #
 
 #
-# arm other options
-#
-CT_ARCH_ARM_MODE="arm"
-CT_ARCH_ARM_MODE_ARM=y
-# CT_ARCH_ARM_MODE_THUMB is not set
-CT_ARCH_ARM_EABI=y
-
-#
 # Toolchain options
 #
 
@@ -163,6 +128,9 @@ CT_FORCE_SYSROOT=y
 CT_USE_SYSROOT=y
 CT_SYSROOT_NAME="sysroot"
 CT_SYSROOT_DIR_PREFIX=""
+CT_STATIC_TOOLCHAIN_POSSIBLE=y
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
 
 #
 # Tuple completion and aliasing
@@ -174,10 +142,7 @@ CT_TARGET_ALIAS=""
 #
 # Toolchain type
 #
-# CT_NATIVE is not set
 CT_CROSS=y
-# CT_CROSS_NATIVE is not set
-# CT_CANADIAN is not set
 CT_TOOLCHAIN_TYPE="cross"
 
 #
@@ -190,17 +155,28 @@ CT_BUILD_SUFFIX=""
 #
 # Operating System
 #
-# CT_BARE_METAL is not set
-# CT_MINGW32 is not set
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.38.4"
-# CT_KERNEL_bare_metal is not set
+CT_KERNEL_VERSION="2.6.38.8"
 CT_KERNEL_linux=y
-# CT_KERNEL_mingw32 is not set
-# CT_KERNEL_bare_metal_AVAILABLE is not set
 CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_mingw32_AVAILABLE is not set
+CT_KERNEL_LINUX_INSTALL=y
+# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39_3 is not set
+# CT_KERNEL_V_2_6_39_2 is not set
+# CT_KERNEL_V_2_6_39_1 is not set
+# CT_KERNEL_V_2_6_39 is not set
+CT_KERNEL_V_2_6_38_8=y
+# CT_KERNEL_V_2_6_37_6 is not set
+# CT_KERNEL_V_2_6_36_4 is not set
+# CT_KERNEL_V_2_6_35_13 is not set
+# CT_KERNEL_V_2_6_34_10 is not set
+# CT_KERNEL_V_2_6_33_16 is not set
+# CT_KERNEL_V_2_6_32_43 is not set
+# CT_KERNEL_V_2_6_31_14 is not set
+# CT_KERNEL_V_2_6_27_59 is not set
+# CT_KERNEL_LINUX_CUSTOM is not set
 
 #
 # Common kernel options
@@ -210,22 +186,6 @@ CT_SHARED_LIBS=y
 #
 # linux other options
 #
-CT_KERNEL_LINUX_INSTALL=y
-# CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
-CT_KERNEL_V_2_6_38_4=y
-# CT_KERNEL_V_2_6_38_3 is not set
-# CT_KERNEL_V_2_6_38_2 is not set
-# CT_KERNEL_V_2_6_38_1 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37_6 is not set
-# CT_KERNEL_V_2_6_36_4 is not set
-# CT_KERNEL_V_2_6_35_13 is not set
-# CT_KERNEL_V_2_6_34_9 is not set
-# CT_KERNEL_V_2_6_33_12 is not set
-# CT_KERNEL_V_2_6_32_39 is not set
-# CT_KERNEL_V_2_6_31_14 is not set
-# CT_KERNEL_V_2_6_27_58 is not set
-# CT_KERNEL_LINUX_CUSTOM is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
 # CT_KERNEL_LINUX_VERBOSITY_2 is not set
@@ -236,29 +196,25 @@ CT_KERNEL_LINUX_INSTALL_CHECK=y
 # Binary utilities
 #
 CT_ARCH_BINFMT_ELF=y
-# CT_ARCH_BINFMT_FLAT is not set
-# CT_ARCH_BINFMT_FDPIC is not set
 
 #
 # GNU binutils
 #
-# CT_BINUTILS_V_2_21 is not set
 # CT_BINUTILS_V_2_20_1 is not set
 CT_BINUTILS_V_2_20=y
 # CT_BINUTILS_V_2_19_1 is not set
 # CT_BINUTILS_V_2_19 is not set
 # CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_16_1 is not set
 CT_BINUTILS_VERSION="2.20"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
 CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
 CT_BINUTILS_LINKER_LD=y
-# CT_BINUTILS_LINKER_GOLD is not set
-# CT_BINUTILS_LINKER_LD_GOLD is not set
-# CT_BINUTILS_LINKER_GOLD_LD is not set
 CT_BINUTILS_LINKERS_LIST="ld"
 CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG=""
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 
 #
 # C compiler
@@ -266,13 +222,6 @@ CT_BINUTILS_EXTRA_CONFIG=""
 CT_CC="gcc"
 CT_CC_VERSION="4.4.3"
 CT_CC_gcc=y
-# CT_CC_V_linaro_4_6_2011_04_0 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_linaro_4_5_2011_04_0 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-# CT_CC_V_linaro_4_4_2011_02_0 is not set
 # CT_CC_V_4_4_6 is not set
 # CT_CC_V_4_4_5 is not set
 # CT_CC_V_4_4_4 is not set
@@ -280,35 +229,23 @@ CT_CC_V_4_4_3=y
 # CT_CC_V_4_4_2 is not set
 # CT_CC_V_4_4_1 is not set
 # CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
 # CT_CC_V_4_3_5 is not set
 # CT_CC_V_4_3_4 is not set
 # CT_CC_V_4_3_3 is not set
 # CT_CC_V_4_3_2 is not set
 # CT_CC_V_4_3_1 is not set
 # CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_3 is not set
 # CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_GCC_4_2 is not set
 CT_CC_GCC_4_2_or_later=y
-# CT_CC_GCC_4_3 is not set
 CT_CC_GCC_4_3_or_later=y
 CT_CC_GCC_4_4=y
 CT_CC_GCC_4_4_or_later=y
-# CT_CC_GCC_4_5 is not set
-# CT_CC_GCC_4_5_or_later is not set
-# CT_CC_GCC_4_6 is not set
-# CT_CC_GCC_4_6_or_later is not set
 CT_CC_GCC_HAS_GRAPHITE=y
-# CT_CC_GCC_HAS_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
 CT_CC_GCC_USE_GMP_MPFR=y
 CT_CC_GCC_USE_PPL_CLOOG=y
-# CT_CC_GCC_USE_MPC is not set
-# CT_CC_GCC_USE_LIBELF is not set
+# CT_CC_LANG_FORTRAN is not set
 CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_JAVA=y
@@ -320,17 +257,14 @@ CT_CC_SUPPORT_OBJCXX=y
 # Additional supported languages:
 #
 # CT_CC_LANG_CXX is not set
-# CT_CC_LANG_FORTRAN is not set
 # CT_CC_LANG_JAVA is not set
 
 #
 # gcc other options
 #
-CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
-CT_CC_BUGURL=""
 CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG=""
-CT_CC_EXTRA_CONFIG=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
 CT_CC_STATIC_LIBSTDCXX=y
 
 #
@@ -359,27 +293,13 @@ CT_CC_GCC_LDBL_128=m
 #
 CT_LIBC="uClibc"
 CT_LIBC_VERSION="0.9.30.3"
-# CT_LIBC_eglibc is not set
-# CT_LIBC_glibc is not set
-# CT_LIBC_mingw is not set
-# CT_LIBC_newlib is not set
-# CT_LIBC_none is not set
 CT_LIBC_uClibc=y
-# CT_LIBC_eglibc_AVAILABLE is not set
-# CT_LIBC_glibc_AVAILABLE is not set
-# CT_LIBC_mingw_AVAILABLE is not set
-# CT_LIBC_newlib_AVAILABLE is not set
-# CT_LIBC_none_AVAILABLE is not set
 CT_LIBC_uClibc_AVAILABLE=y
-# CT_LIBC_UCLIBC_V_0_9_31 is not set
+# CT_LIBC_UCLIBC_V_0_9_32 is not set
 CT_LIBC_UCLIBC_V_0_9_30_3=y
 # CT_LIBC_UCLIBC_V_0_9_30_2 is not set
 # CT_LIBC_UCLIBC_V_0_9_30_1 is not set
 # CT_LIBC_UCLIBC_V_0_9_30 is not set
-# CT_LIBC_UCLIBC_V_0_9_29 is not set
-# CT_LIBC_UCLIBC_V_0_9_28_3 is not set
-# CT_LIBC_UCLIBC_V_snapshot is not set
-# CT_LIBC_UCLIBC_V_specific_date is not set
 CT_LIBC_UCLIBC_0_9_30_or_later=y
 CT_LIBC_UCLIBC_PARALLEL=y
 CT_LIBC_UCLIBC_VERBOSITY_0=y
@@ -392,18 +312,14 @@ CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y
 CT_LIBC_UCLIBC_DEBUG_LEVEL=0
 CT_LIBC_UCLIBC_CONFIG_FILE=""
 CT_LIBC_SUPPORT_THREADS_ANY=y
-# CT_LIBC_SUPPORT_NPTL is not set
 CT_LIBC_SUPPORT_LINUXTHREADS=y
-# CT_LIBC_SUPPORT_WIN32THREADS is not set
 CT_LIBC_SUPPORT_THREADS_NONE=y
 CT_THREADS="linuxthreads"
 
 #
 # Common C library options
 #
-# CT_THREADS_NPTL is not set
 CT_THREADS_LINUXTHREADS=y
-# CT_THREADS_WIN32THREADS is not set
 # CT_THREADS_NONE is not set
 CT_LIBC_XLDD=y
 
@@ -429,34 +345,22 @@ CT_GMP_NEEDED=y
 CT_MPFR_NEEDED=y
 CT_PPL_NEEDED=y
 CT_CLOOG_NEEDED=y
-# CT_MPC_NEEDED is not set
-# CT_LIBELF_NEEDED is not set
 CT_COMPLIBS=y
 CT_GMP=y
 CT_MPFR=y
 CT_PPL=y
 CT_CLOOG=y
-# CT_GMP_V_5_0_1 is not set
 CT_GMP_V_4_3_2=y
 # CT_GMP_V_4_3_1 is not set
 # CT_GMP_V_4_3_0 is not set
-# CT_GMP_V_4_2_4 is not set
-# CT_GMP_V_4_2_2 is not set
 CT_GMP_VERSION="4.3.2"
 # CT_MPFR_V_3_0_0 is not set
 CT_MPFR_V_2_4_2=y
 # CT_MPFR_V_2_4_1 is not set
 # CT_MPFR_V_2_4_0 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_3_1 is not set
 CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
 CT_PPL_V_0_10_2=y
 CT_PPL_VERSION="0.10.2"
-# CT_PPL_0_11 is not set
-# CT_PPL_NEEDS_LIBPWL is not set
 # CT_CLOOG_V_0_15_10 is not set
 CT_CLOOG_V_0_15_9=y
 # CT_CLOOG_V_0_15_8 is not set
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend, v2
@ 2011-08-07 20:37 Yann E. MORIN
  2011-08-07 20:37 ` [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2011-08-07 20:37 UTC (permalink / raw)
  To: buildroot

Hello All!

This patchset updates the crosstool-NG backend to the newly released 1.12.0.
Existing patches were applied upstream, and are no longer needed. A new patch
is added because it works around a limitation specific to buildroot; it will
not go upstream as-is, a better fix will have to be found.

Changes since v1:
- simply get rid of the recursion test, it can't happen (Peter)

    [PATCH 1/2] toochain/crosstool-NG: bump version
    [PATCH 2/2] toolchain/crosstool-NG: update bundled config files

 .../crosstool-ng-000-makefile-recursion.patch      |   39 ++++
 package/crosstool-ng/crosstool-ng-001-no-cvs.patch |   15 --
 ...-break-on-existing-symlinks-and-build.log.patch |   76 -------
 .../crosstool-ng-003-autostuf-compat.patch         |   10 -
 package/crosstool-ng/crosstool-ng.mk               |    2 +-
 .../crosstool-ng.config-eglibc                     |  227 ++++++-------------
 .../crosstool-ng.config-glibc                      |  234 ++++++--------------
 .../crosstool-ng.config-uClibc                     |  192 ++++------------
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk   |    2 +-
 9 files changed, 221 insertions(+), 576 deletions(-)

Regards,
Yann E. MORIN.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version
  2011-08-07 20:37 [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend, v2 Yann E. MORIN
@ 2011-08-07 20:37 ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2011-08-07 20:37 UTC (permalink / raw)
  To: buildroot

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
---
 .../crosstool-ng-000-makefile-recursion.patch      |   39 ++++++++++
 package/crosstool-ng/crosstool-ng-001-no-cvs.patch |   15 ----
 ...-break-on-existing-symlinks-and-build.log.patch |   76 --------------------
 .../crosstool-ng-003-autostuf-compat.patch         |   10 ---
 package/crosstool-ng/crosstool-ng.mk               |    2 +-
 toolchain/toolchain-crosstool-ng/crosstool-ng.mk   |    2 +-
 6 files changed, 41 insertions(+), 103 deletions(-)

diff --git a/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
new file mode 100644
index 0000000..3fb05ad
--- /dev/null
+++ b/package/crosstool-ng/crosstool-ng-000-makefile-recursion.patch
@@ -0,0 +1,39 @@
+Makefile: allow recursion
+
+When crosstool-NG is used standalone, we completely avoid recursion,
+because the Makefile calls itself only once.
+
+But when used as the buildroot toolchain backend, there is already
+one level of make recursion when we first call the crosstool-NG
+Makefile. And when buildroot is used out-of-tree, we are already
+at the second level of recursion when calling the crosstool-NG
+Makefile.
+
+So, to cope with the situation, only bail out at the 2nd level of
+recursion, not the 0-th level.
+
+This probably won't go upstream.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
+
+diff -du crosstool-ng-1.12.0/Makefile.in host-crosstool-ng-1.12.0/Makefile.in
+--- crosstool-ng-1.12.0/Makefile.in     2011-08-01 01:21:34.000000000 +0200
++++ host-crosstool-ng-1.12.0/Makefile.in        2011-08-07 21:39:16.055958219 +0200
+@@ -95,9 +95,14 @@
+ # level.
+ # This has the side effect of only showing the real targets, and hiding our
+ # internal ones. :-)
+-ifneq ($(MAKELEVEL),0)
+-$(error Recursion detected, bailing out...)
+-endif
++#
++# NB: For buildroot, this has no importance:
++# - crosstool-NG should never ever be called manually
++# - thus auto-completion would never ever be attempted
++# - so we shouldn't have to detect it
++#ifneq ($(MAKELEVEL),0)
++#$(error Recursion detected, bailing out...)
++#endif
+ 
+ MAKEFLAGS += $(CT_MAKEFLAGS)
+ build install clean distclean uninstall:
diff --git a/package/crosstool-ng/crosstool-ng-001-no-cvs.patch b/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
deleted file mode 100644
index c82d359..0000000
--- a/package/crosstool-ng/crosstool-ng-001-no-cvs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Remove dependency on cvs.
-
-cvs is used to retrieve newlib, which is not supported
-under Buildroot, so cvs is not required.
-
---- crosstool-ng-1.8.0/configure.orig	2010-11-27 15:43:52.000000000 +0000
-+++ crosstool-ng-1.8.0/configure	2010-11-27 15:44:10.000000000 +0000
-@@ -359,7 +359,6 @@
-              err="'libtool' 1.5.26 or above was not found"
- has_or_abort prog=stat
- has_or_abort prog="curl wget"
--has_or_abort prog=cvs
- has_or_abort prog=patch
- has_or_abort prog=tar
- has_or_abort prog=gzip
diff --git a/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch b/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
deleted file mode 100644
index 2bb613f..0000000
--- a/package/crosstool-ng/crosstool-ng-002-dont-break-on-existing-symlinks-and-build.log.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-
-# HG changeset patch
-# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-# Date 1310507544 -7200
-# Node ID 1ebc2248cc60230cd53ff94ae8f8f1e3261461a3
-# Parent  f1c730da41f3b22ca1a1e1b14592da4b7c078797
-scripts, cc/gcc: do not fail on existing symlinks or build.log
-
-If the user builds a toolchain over an existing one, so, without removing
-CT_PREFIX_DIR, the build fails as the symlinks already exist, as does the
-build.log.
-
-This can also happen (for build.log) if the user first ran in download-
-or extract-only.
-
-Patch (with no SoB) originally from:
-  Phil Wilshire <phil.wilshire@overturenetworks.com>
-
-Modified by me as it did not apply cleanly.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/cc/gcc.sh
---- a/scripts/build/cc/gcc.sh	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/build/cc/gcc.sh	Tue Jul 12 23:52:24 2011 +0200
-@@ -386,7 +386,7 @@
-     # check whether compiler has an extension
-     file="$( ls -1 "${core_prefix_dir}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
-     [ -z "${file}" ] || ext=".${file##*.}"
--    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
-+    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
- 
-     CT_EndStep
- }
-@@ -630,7 +630,7 @@
-     # check whether compiler has an extension
-     file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
-     [ -z "${file}" ] || ext=".${file##*.}"
--    CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
-+    CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
- 
-     CT_EndStep
- }
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/build/internals.sh
---- a/scripts/build/internals.sh	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/build/internals.sh	Tue Jul 12 23:52:24 2011 +0200
-@@ -86,14 +86,14 @@
-     for t in "${CT_TARGET}-"*; do
-         if [ -n "${CT_TARGET_ALIAS}" ]; then
-             _t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
--            CT_DoExecLog ALL ln -sv "${t}" "${_t}"
-+            CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
-         fi
-         if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
-             _t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
-             if [ "${_t}" = "${t}" ]; then
-                 CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
-             else
--                CT_DoExecLog ALL ln -sv "${t}" "${_t}"
-+                CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
-             fi
-         fi
-     done
-diff -r f1c730da41f3 -r 1ebc2248cc60 scripts/crosstool-NG.sh.in
---- a/scripts/crosstool-NG.sh.in	Tue Jul 12 23:21:27 2011 +0200
-+++ b/scripts/crosstool-NG.sh.in	Tue Jul 12 23:52:24 2011 +0200
-@@ -604,7 +604,7 @@
- # moment... Consign all ouptut to oblivion...
- CT_DoLog INFO "Finishing installation (may take a few seconds)..."
- exec >/dev/null 2>&1
--
-+rm -f ${CT_PREFIX_DIR}/build.log.bz2
- if [ "${CT_LOG_TO_FILE}" = "y" ]; then
-     cp "${tmp_log_file}" "${CT_PREFIX_DIR}/build.log"
-     if [ "${CT_LOG_FILE_COMPRESS}" = y ]; then
-
diff --git a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch b/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
deleted file mode 100644
index d79e62b..0000000
--- a/package/crosstool-ng/crosstool-ng-003-autostuf-compat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- crosstool-ng-1.11.3/configure	2011-05-21 01:10:10.000000000 +0200
-+++ host-crosstool-ng-1.11.3/configure	2011-07-14 17:35:25.830403914 +0200
-@@ -260,6 +260,7 @@
-         # Skip, auto-stuff compatibility
-         --build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
-         --build|--host|--infodir|--datadir|--sysconfdir|--localstatedir)             shift 2;;
-+        --enable-shared|--disable-shared|--enable-static|--disable-static)           shift;;
-         *)          printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
-     esac
- done
diff --git a/package/crosstool-ng/crosstool-ng.mk b/package/crosstool-ng/crosstool-ng.mk
index b40cf35..2bbf631 100644
--- a/package/crosstool-ng/crosstool-ng.mk
+++ b/package/crosstool-ng/crosstool-ng.mk
@@ -1,4 +1,4 @@
-CROSSTOOL_NG_VERSION           = 1.11.3
+CROSSTOOL_NG_VERSION           = 1.12.0
 CROSSTOOL_NG_SOURCE            = crosstool-ng-$(CROSSTOOL_NG_VERSION).tar.bz2
 CROSSTOOL_NG_SITE              = http://crosstool-ng.org/download/crosstool-ng/
 CROSSTOOL_NG_INSTALL_STAGING   = NO
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 912bb06..3a205dd 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -203,7 +203,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(|\# )(CT_ARCH_(32|64)).*:\# \2 is not set:;
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_$(CTNG_BIT)) is not set:\1=y:;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_VENDOR)=.*:\1="unknown":;
 CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TARGET_ALIAS)=.*:\1="$(GNU_TARGET_NAME)":;
-CTNG_FIX_DOT_CONFIG_SED += s:^(CT_CC_PKGVERSION)="(.*)":\1="crosstool-NG $(CTNG_VERSION) - buildroot $(BR2_VERSION_FULL)":;
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_TOOLCHAIN_PKGVERSION)="(.*)":\1="buildroot $(BR2_VERSION_FULL)":;
 ifneq ($(call qstrip,$(BR2_USE_MMU)),)
 CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_ARCH_USE_MMU) is not set:\1=y:;
 else
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-08-07 20:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-07 19:19 [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend Yann E. MORIN
2011-08-07 19:19 ` [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version Yann E. MORIN
2011-08-07 19:27   ` Peter Korsgaard
2011-08-07 19:36     ` Yann E. MORIN
2011-08-07 19:19 ` [Buildroot] [PATCH 2/2] toolchain/crosstool-NG: update bundled config files Yann E. MORIN
  -- strict thread matches above, loose matches on Subject: below --
2011-08-07 20:37 [Buildroot] [PATCH 0/2] toolchain: update the crosstool-NG backend, v2 Yann E. MORIN
2011-08-07 20:37 ` [Buildroot] [PATCH 1/2] toochain/crosstool-NG: bump version Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.