Merge.

1 files changed, 162 insertions, 137 deletions

diff --git a/samples/i686-nptl-linux-gnu/crosstool.config b/samples/i686-nptl-linux-gnu/crosstool.config
index 60bf678..517c46d 100644
--- a/samples/i686-nptl-linux-gnu/crosstool.config
+++ b/samples/i686-nptl-linux-gnu/crosstool.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# crosstool-NG version: svn_trunk@1474
-# Sun Apr 19 19:02:06 2009
+# crosstool-NG version: hg_default@1552_6ee673ab382e
+# Sat Oct  3 16:22:40 2009
 #
 
 #
@@ -23,7 +23,6 @@ CT_SAVE_TARBALLS=y
 CT_WORK_DIR="${CT_TOP_DIR}/targets"
 CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}"
 CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-# CT_CUSTOM_PATCH is not set
 CT_REMOVE_DOCS=y
 CT_INSTALL_DIR_RO=y
 
@@ -44,6 +43,15 @@ CT_CONNECT_TIMEOUT=10
 # CT_FORCE_EXTRACT is not set
 CT_OVERIDE_CONFIG_GUESS_SUB=y
 # CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
+# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+CT_PATCH_ORDER="bundled"
+# CT_PATCH_SINGLE is not set
+# CT_PATCH_USE_LOCAL is not set
 
 #
 # Build behavior
@@ -52,7 +60,11 @@ CT_PARALLEL_JOBS=1
 CT_LOAD=0
 CT_NICE=0
 CT_USE_PIPES=y
+# CT_CONFIG_SHELL_SH is not set
 # CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="bash"
 
 #
 # Logging
@@ -74,12 +86,14 @@ CT_LOG_FILE_COMPRESS=y
 #
 CT_ARCH="x86"
 # CT_ARCH_64 is not set
+# CT_ARCH_SUPPORTS_BOTH_MMU is not set
+# CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
 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 is not set
-# CT_ARCH_SUPPORTS_BOTH_ENDIAN is not set
+# CT_ARCH_DEFAULT_HAS_MMU is not set
 # CT_ARCH_DEFAULT_BE is not set
 # CT_ARCH_DEFAULT_LE is not set
 CT_ARCH_ARCH="i686"
@@ -95,6 +109,7 @@ CT_TARGET_LDFLAGS=""
 #
 # CT_ARCH_alpha is not set
 # CT_ARCH_arm is not set
+# CT_ARCH_avr32 is not set
 # CT_ARCH_ia64 is not set
 # CT_ARCH_mips is not set
 # CT_ARCH_powerpc is not set
@@ -102,6 +117,7 @@ CT_TARGET_LDFLAGS=""
 # CT_ARCH_sh is not set
 CT_ARCH_x86=y
 # CT_ARCH_x86_64 is not set
+CT_ARCH_USE_MMU=y
 
 #
 # Target optimisations
@@ -116,7 +132,6 @@ CT_ARCH_x86=y
 #
 CT_USE_SYSROOT=y
 CT_SYSROOT_DIR_PREFIX=""
-CT_SHARED_LIBS=y
 
 #
 # Tuple completion and aliasing
@@ -145,55 +160,36 @@ CT_BUILD_SUFFIX=""
 # Operating System
 #
 # CT_BARE_METAL is not set
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="2.6.29"
+CT_KERNEL_VERSION="2.6.31.1"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 CT_KERNEL_LINUX_INSTALL=y
 CT_KERNEL_LINUX_INSTALL_CHECK=y
-# CT_KERNEL_V_2_6_18_8 is not set
-# CT_KERNEL_V_2_6_19_7 is not set
-# CT_KERNEL_V_2_6_20_21 is not set
-# CT_KERNEL_V_2_6_21_7 is not set
-# CT_KERNEL_V_2_6_22_19 is not set
-# CT_KERNEL_V_2_6_23_17 is not set
-# CT_KERNEL_V_2_6_24_7 is not set
-# CT_KERNEL_V_2_6_25_20 is not set
+CT_KERNEL_V_2_6_31_1=y
+# CT_KERNEL_V_2_6_31 is not set
+# CT_KERNEL_V_3_6_30_8 is not set
+# CT_KERNEL_V_3_6_30_7 is not set
+# CT_KERNEL_V_2_6_30_6 is not set
+# CT_KERNEL_V_2_6_30_5 is not set
+# CT_KERNEL_V_2_6_30_4 is not set
+# CT_KERNEL_V_2_6_30_3 is not set
+# CT_KERNEL_V_2_6_30_2 is not set
+# CT_KERNEL_V_2_6_30_1 is not set
+# CT_KERNEL_V_2_6_30 is not set
+# CT_KERNEL_V_2_6_29_6 is not set
+# CT_KERNEL_V_2_6_28_10 is not set
+# CT_KERNEL_V_2_6_27_35 is not set
 # CT_KERNEL_V_2_6_26_8 is not set
-# CT_KERNEL_V_2_6_27 is not set
-# CT_KERNEL_V_2_6_27_1 is not set
-# CT_KERNEL_V_2_6_27_2 is not set
-# CT_KERNEL_V_2_6_27_3 is not set
-# CT_KERNEL_V_2_6_27_4 is not set
-# CT_KERNEL_V_2_6_27_5 is not set
-# CT_KERNEL_V_2_6_27_6 is not set
-# CT_KERNEL_V_2_6_27_7 is not set
-# CT_KERNEL_V_2_6_27_8 is not set
-# CT_KERNEL_V_2_6_27_9 is not set
-# CT_KERNEL_V_2_6_27_10 is not set
-# CT_KERNEL_V_2_6_27_11 is not set
-# CT_KERNEL_V_2_6_27_12 is not set
-# CT_KERNEL_V_2_6_27_13 is not set
-# CT_KERNEL_V_2_6_27_14 is not set
-# CT_KERNEL_V_2_6_27_15 is not set
-# CT_KERNEL_V_2_6_27_16 is not set
-# CT_KERNEL_V_2_6_27_17 is not set
-# CT_KERNEL_V_2_6_27_18 is not set
-# CT_KERNEL_V_2_6_27_19 is not set
-# CT_KERNEL_V_2_6_27_20 is not set
-# CT_KERNEL_V_2_6_27_21 is not set
-# CT_KERNEL_V_2_6_28 is not set
-# CT_KERNEL_V_2_6_28_1 is not set
-# CT_KERNEL_V_2_6_28_2 is not set
-# CT_KERNEL_V_2_6_28_3 is not set
-# CT_KERNEL_V_2_6_28_4 is not set
-# CT_KERNEL_V_2_6_28_5 is not set
-# CT_KERNEL_V_2_6_28_6 is not set
-# CT_KERNEL_V_2_6_28_7 is not set
-# CT_KERNEL_V_2_6_28_8 is not set
-# CT_KERNEL_V_2_6_28_9 is not set
-CT_KERNEL_V_2_6_29=y
-# CT_KERNEL_V_2_6_29_1 is not set
+# CT_KERNEL_V_2_6_25_20 is not set
+# CT_KERNEL_V_2_6_24_7 is not set
+# CT_KERNEL_V_2_6_23_17 is not set
+# CT_KERNEL_V_2_6_22_19 is not set
+# CT_KERNEL_V_2_6_21_7 is not set
+# CT_KERNEL_V_2_6_20_21 is not set
+# CT_KERNEL_V_2_6_19_7 is not set
+# CT_KERNEL_V_2_6_18_8 is not set
 # CT_KERNEL_V_select is not set
 CT_KERNEL_LINUX_VERBOSITY_0=y
 # CT_KERNEL_LINUX_VERBOSITY_1 is not set
@@ -202,44 +198,39 @@ CT_KERNEL_LINUX_VERBOSE_LEVEL=0
 # CT_KERNEL_LINUX_USE_CUSTOM_HEADERS is not set
 
 #
-# GMP and MPFR
+# Common kernel options
 #
-CT_GMP_MPFR=y
-CT_GMP_MPFR_TARGET=y
-# CT_GMP_V_4_2_2 is not set
-CT_GMP_V_4_2_4=y
-CT_GMP_VERSION="4.2.4"
-CT_GMP_CHECK=y
-# CT_MPFR_V_2_3_1 is not set
-# CT_MPFR_V_2_3_2 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_V_2_4_1=y
-CT_MPFR_VERSION="2.4.1"
-CT_MPFR_CHECK=y
+CT_SHARED_LIBS=y
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+# CT_ARCH_BINFMT_FLAT is not set
 
 #
-# binutils
+# GNU binutils
 #
 CT_BINUTILS_VERSION="2.19.1"
-# CT_BINUTILS_V_2_14 is not set
-# CT_BINUTILS_V_2_15 is not set
-# CT_BINUTILS_V_2_16_1 is not set
-# CT_BINUTILS_V_2_17 is not set
-# CT_BINUTILS_V_2_18 is not set
-# CT_BINUTILS_V_2_18_50_0_4 is not set
-# CT_BINUTILS_V_2_18_50_0_6 is not set
-# CT_BINUTILS_V_2_18_50_0_7 is not set
-# CT_BINUTILS_V_2_18_50_0_8 is not set
-# CT_BINUTILS_V_2_18_50_0_9 is not set
-# CT_BINUTILS_V_2_18_90 is not set
-# CT_BINUTILS_V_2_18_91 is not set
-# CT_BINUTILS_V_2_18_92 is not set
-# CT_BINUTILS_V_2_18_93 is not set
-# CT_BINUTILS_V_2_19 is not set
-CT_BINUTILS_V_2_19_1=y
-# CT_BINUTILS_V_2_19_50_0_1 is not set
-# CT_BINUTILS_V_2_19_51_0_1 is not set
 # CT_BINUTILS_V_2_19_51_0_2 is not set
+# CT_BINUTILS_V_2_19_51_0_1 is not set
+# CT_BINUTILS_V_2_19_50_0_1 is not set
+CT_BINUTILS_V_2_19_1=y
+# CT_BINUTILS_V_2_19 is not set
+# CT_BINUTILS_V_2_18_93 is not set
+# CT_BINUTILS_V_2_18_92 is not set
+# CT_BINUTILS_V_2_18_91 is not set
+# CT_BINUTILS_V_2_18_90 is not set
+# CT_BINUTILS_V_2_18_50_0_9 is not set
+# CT_BINUTILS_V_2_18_50_0_8 is not set
+# CT_BINUTILS_V_2_18_50_0_7 is not set
+# CT_BINUTILS_V_2_18_50_0_6 is not set
+# CT_BINUTILS_V_2_18_50_0_4 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_V_2_15 is not set
+# CT_BINUTILS_V_2_14 is not set
 CT_BINUTILS_EXTRA_CONFIG=""
 CT_BINUTILS_FOR_TARGET=y
 CT_BINUTILS_FOR_TARGET_IBERTY=y
@@ -251,33 +242,36 @@ CT_BINUTILS_FOR_TARGET_BFD=y
 CT_CC="gcc"
 CT_CC_VERSION="4.3.2"
 CT_CC_gcc=y
-# CT_CC_V_3_2_3 is not set
-# CT_CC_V_3_3_6 is not set
-# CT_CC_V_3_4_6 is not set
-# CT_CC_V_4_0_0 is not set
-# CT_CC_V_4_0_1 is not set
-# CT_CC_V_4_0_2 is not set
-# CT_CC_V_4_0_3 is not set
-# CT_CC_V_4_0_4 is not set
-# CT_CC_V_4_1_0 is not set
-# CT_CC_V_4_1_1 is not set
-# CT_CC_V_4_1_2 is not set
-# CT_CC_V_4_2_0 is not set
-# CT_CC_V_4_2_1 is not set
-# CT_CC_V_4_2_2 is not set
-# CT_CC_V_4_2_3 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_3_0 is not set
-# CT_CC_V_4_3_1 is not set
-CT_CC_V_4_3_2=y
-# CT_CC_V_4_3_3 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_4 is not set
+# CT_CC_V_4_3_3 is not set
+CT_CC_V_4_3_2=y
+# CT_CC_V_4_3_1 is not set
+# CT_CC_V_4_3_0 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_1_1 is not set
+# CT_CC_V_4_1_0 is not set
+# CT_CC_V_4_0_4 is not set
+# CT_CC_V_4_0_3 is not set
+# CT_CC_V_4_0_2 is not set
+# CT_CC_V_4_0_1 is not set
+# CT_CC_V_4_0_0 is not set
+# CT_CC_V_3_4_6 is not set
+# CT_CC_V_3_3_6 is not set
+# CT_CC_V_3_2_3 is not set
 CT_CC_GCC_4_3_or_later=y
-# CT_CC_GCC_4_4_snapshot is not set
+# CT_CC_GCC_4_4_or_later is not set
 CT_CC_CXA_ATEXIT=y
 CT_CC_SJLJ_EXCEPTIONS_CONFIGURE=y
 # CT_CC_SJLJ_EXCEPTIONS_USE is not set
 # CT_CC_SJLJ_EXCEPTIONS_DONT_USE is not set
+CT_CC_ENABLE_CXX_FLAGS=""
 CT_CC_CORE_EXTRA_CONFIG=""
 CT_CC_EXTRA_CONFIG=""
 CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}"
@@ -304,17 +298,19 @@ CT_LIBC="glibc"
 CT_LIBC_VERSION="2.9"
 # CT_LIBC_eglibc is not set
 CT_LIBC_glibc=y
+# CT_LIBC_newlib is not set
 # CT_LIBC_uClibc is not set
-# CT_LIBC_V_2_3_6 is not set
-# CT_LIBC_V_2_5 is not set
-# CT_LIBC_V_2_5_1 is not set
-# CT_LIBC_V_2_6 is not set
-# CT_LIBC_V_2_6_1 is not set
-# CT_LIBC_V_2_7 is not set
-# CT_LIBC_V_2_8 is not set
 CT_LIBC_V_2_9=y
+# CT_LIBC_V_2_8 is not set
+# CT_LIBC_V_2_7 is not set
+# CT_LIBC_V_2_6_1 is not set
+# CT_LIBC_V_2_6 is not set
+# CT_LIBC_V_2_5_1 is not set
+# CT_LIBC_V_2_5 is not set
+# CT_LIBC_V_2_3_6 is not set
 # CT_LIBC_V_LATEST is not set
 # CT_LIBC_V_date is not set
+CT_LIBC_GLIBC_2_8_or_later=y
 CT_LIBC_GLIBC_TARBALL=y
 # CT_LIBC_GLIBC_CVS is not set
 
@@ -330,7 +326,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.29"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.31.1"
 
 #
 # Common C library options
@@ -343,30 +339,20 @@ CT_THREADS_NPTL=y
 # CT_THREADS_NONE is not set
 
 #
-# Tools facilities
-#
-CT_TOOL_libelf=y
-CT_LIBELF_V_0_8_10=y
-CT_LIBELF_VERSION="0.8.10"
-CT_TOOL_sstrip=y
-CT_SSTRIP_BUILDROOT=y
-# CT_SSTRIP_ELFKICKERS is not set
-CT_SSTRIP_FROM="buildroot"
-
-#
 # Debug facilities
 #
 CT_DEBUG_dmalloc=y
-# CT_DMALLOC_V_5_4_3 is not set
 CT_DMALLOC_V_5_5_2=y
+# CT_DMALLOC_V_5_4_3 is not set
 CT_DMALLOC_VERSION="5.5.2"
 CT_DEBUG_duma=y
 CT_DUMA_A=y
 CT_DUMA_SO=y
-# CT_DUMA_V_2_5_1 is not set
-# CT_DUMA_V_2_5_8 is not set
-# CT_DUMA_V_2_5_12 is not set
+# CT_DUMA_V_2_5_15 is not set
 CT_DUMA_V_2_5_14=y
+# CT_DUMA_V_2_5_12 is not set
+# CT_DUMA_V_2_5_8 is not set
+# CT_DUMA_V_2_5_1 is not set
 CT_DUMA_VERSION="2_5_14"
 CT_DEBUG_gdb=y
 CT_GDB_CROSS=y
@@ -376,31 +362,70 @@ CT_GDB_NATIVE=y
 CT_GDB_NATIVE_USE_GMP_MPFR=y
 CT_GDB_GDBSERVER=y
 CT_GDB_GDBSERVER_STATIC=y
-# CT_GDB_V_6_4 is not set
-# CT_GDB_V_6_5 is not set
-# CT_GDB_V_6_6 is not set
-# CT_GDB_V_6_7 is not set
-# CT_GDB_V_6_7_1 is not set
 CT_GDB_V_6_8=y
+# CT_GDB_V_6_7_1 is not set
+# CT_GDB_V_6_7 is not set
+# CT_GDB_V_6_6 is not set
+# CT_GDB_V_6_5 is not set
+# CT_GDB_V_6_4 is not set
 # CT_GDB_V_snapshot is not set
 CT_GDB_VERSION="6.8"
 
 #
 # Native gdb needs a native ncurses library
 #
-# CT_NCURSES_V_5_6 is not set
 CT_NCURSES_V_5_7=y
+# CT_NCURSES_V_5_6 is not set
 CT_NCURSES_VERSION="5.7"
 CT_DEBUG_ltrace=y
-# CT_LTRACE_V_0_4 is not set
-CT_LTRACE_V_0_5=y
+# CT_LTRACE_V_0_5_2 is not set
 # CT_LTRACE_V_0_5_1 is not set
+CT_LTRACE_V_0_5=y
+# CT_LTRACE_V_0_4 is not set
 CT_LTRACE_VERSION="0.5"
 CT_DEBUG_strace=y
-# CT_STRACE_V_4_5 is not set
-# CT_STRACE_V_4_5_14 is not set
-# CT_STRACE_V_4_5_15 is not set
-# CT_STRACE_V_4_5_16 is not set
-CT_STRACE_V_4_5_17=y
 # CT_STRACE_V_4_5_18 is not set
+CT_STRACE_V_4_5_17=y
+# CT_STRACE_V_4_5_16 is not set
+# CT_STRACE_V_4_5_15 is not set
+# CT_STRACE_V_4_5_14 is not set
+# CT_STRACE_V_4_5 is not set
 CT_STRACE_VERSION="4.5.17"
+
+#
+# Tools facilities
+#
+CT_TOOL_libelf=y
+# CT_LIBELF_V_0_8_11 is not set
+CT_LIBELF_V_0_8_10=y
+CT_LIBELF_VERSION="0.8.10"
+CT_TOOL_sstrip=y
+CT_SSTRIP_BUILDROOT=y
+# CT_SSTRIP_ELFKICKERS is not set
+CT_SSTRIP_FROM="buildroot"
+
+#
+# Companion libraries
+#
+CT_WRAPPER_NEEDED=y
+CT_GMP_MPFR=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=y
+# CT_GMP_V_4_2_2 is not set
+CT_GMP_VERSION="4.2.4"
+CT_MPFR_V_2_4_1=y
+# 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.1"
+# CT_PPL_CLOOG_MPC is not set
+
+#
+# Companion libraries common options
+#
+# CT_COMP_LIBS_CHECK is not set
+CT_COMP_LIBS_TARGET=y
+CT_TOOLS_WRAPPER_SCRIPT=y
+# CT_TOOLS_WRAPPER_EXEC is not set
+CT_TOOLS_WRAPPER="script"