diff -r a9130ff13b19 -r 1c68438f44f7 scripts/crosstool-NG.sh.in
--- a/scripts/crosstool-NG.sh.in	Tue Nov 13 15:06:18 2012 +0000
+++ b/scripts/crosstool-NG.sh.in	Fri Nov 16 14:59:27 2012 +0100
@@ -126,12 +126,7 @@
 . "${CT_LIB_DIR}/scripts/build/arch/${CT_ARCH}.sh"
 . "${CT_LIB_DIR}/scripts/build/companion_tools.sh"
 . "${CT_LIB_DIR}/scripts/build/kernel/${CT_KERNEL}.sh"
-. "${CT_LIB_DIR}/scripts/build/companion_libs/gmp.sh"
-. "${CT_LIB_DIR}/scripts/build/companion_libs/mpfr.sh"
-. "${CT_LIB_DIR}/scripts/build/companion_libs/ppl.sh"
-. "${CT_LIB_DIR}/scripts/build/companion_libs/cloog.sh"
-. "${CT_LIB_DIR}/scripts/build/companion_libs/mpc.sh"
-. "${CT_LIB_DIR}/scripts/build/companion_libs/libelf.sh"
+. "${CT_LIB_DIR}/scripts/build/companion_libs.sh"
 . "${CT_LIB_DIR}/scripts/build/binutils/binutils.sh"
 . "${CT_LIB_DIR}/scripts/build/binutils/elf2flt.sh"
 . "${CT_LIB_DIR}/scripts/build/binutils/sstrip.sh"
@@ -539,12 +534,7 @@
     CT_DoStep INFO "Retrieving needed toolchain components' tarballs"
     do_companion_tools_get
     do_kernel_get
-    do_gmp_get
-    do_mpfr_get
-    do_ppl_get
-    do_cloog_get
-    do_mpc_get
-    do_libelf_get
+    do_companion_libs_get
     do_binutils_get
     do_elf2flt_get
     do_sstrip_get
@@ -569,12 +559,7 @@
 
         CT_DoStep INFO "Extracting and patching toolchain components"
         do_kernel_extract
-        do_gmp_extract
-        do_mpfr_extract
-        do_ppl_extract
-        do_cloog_extract
-        do_mpc_extract
-        do_libelf_extract
+        do_companion_libs_extract
         do_binutils_extract
         do_elf2flt_extract
         do_sstrip_extract