From 9736a99ee9fd0465aea0c1d6c0b475a0ecdc6b95 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 23 Aug 2010 20:21:43 +0200
Subject: binutils/binutils: companion libraries are not used

GNU binutils does not use the companion libraries, although
./configure advertises switches for them. This is because the
configure file is shared between different packages, and is
a bit 'lax' about what it checks. See:
  http://sourceware.org/ml/crossgcc/2010-08/msg00160.html
  http://sourceware.org/ml/crossgcc/2010-08/msg00161.html

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 9f5f53a..d751c15 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -81,16 +81,4 @@ config BINUTILS_FOR_TARGET_BFD
     prompt "libbfd"
     default y
 
-config BINUTILS_TARGET_USE_GMP_MPFR
-    bool
-    prompt "Use GMP and MPFR"
-    default n
-    select GMP_TARGET
-    select MPFR_TARGET
-    help
-      binutils can be configured to use GMP and MPFR.
-      While this is automatically handled for the cross-binutils,
-      You have to explicitly state so for the native libraries that
-      will run on the target.
-
 endif # BINUTILS_FOR_TARGET
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 0ef5861..0459893 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -24,11 +24,6 @@ do_binutils() {
 
     CT_DoStep INFO "Installing binutils"
 
-    # If GMP and MPFR were configured, then use that,
-    # otherwise let binutils find the system-wide libraries, if they exist.
-    [ -z "${CT_GMP}"    ] || extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
-    [ -z "${CT_MPFR}"   ] || extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
-
     CT_DoLog EXTRA "Configuring binutils"
     CFLAGS="${CT_CFLAGS_FOR_HOST}"                              \
     CT_DoExecLog ALL                                            \
@@ -83,12 +78,6 @@ do_binutils_target() {
         install_targets+=("install-${t}")
     done
 
-    # If GMP and MPFR were configured, then use that
-    if [ "${CT_BINUTILS_TARGET_USE_GMP_MPFR}" = "y" ]; then
-        extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr")
-        extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr")
-    fi
-
     if [ "${#targets[@]}" -ne 0 ]; then
         CT_DoStep INFO "Installing binutils for target"
         mkdir -p "${CT_BUILD_DIR}/build-binutils-for-target"
-- 
cgit v0.10.2-6-g49f6