From e81fe2c77814ba7638c6818a9dac2d1568fbad51 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 23 Aug 2010 10:38:15 +0200
Subject: debug/gdb: companion libs are not used

Although the gdb ./configure advertises for GMP and MPFR, those libraries
are not used by gdb (the ./configure is used across different packages,
hence the check for GMP/MPFR). See:
  http://sourceware.org/ml/crossgcc/2010-08/msg00168.html

The same applies to MPC.

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

diff --git a/config/debug/gdb.in.cross b/config/debug/gdb.in.cross
index f5afe09..c731bf6 100644
--- a/config/debug/gdb.in.cross
+++ b/config/debug/gdb.in.cross
@@ -21,26 +21,4 @@ config GDB_CROSS_STATIC
       That way, you can share the cross-gdb without installing a toolchain
       on every machine that will be used to debug target programs.
 
-config GDB_CROSS_USE_GMP_MPFR
-    bool
-    prompt "Use GMP/MPFR"
-    default n
-    select GMP
-    select MPFR
-    help
-      gdb can use GMP+MPFR, although it does not seem compulsory.
-      
-      Say 'Y' here if you want to use GMP+MPFR.
-
-config GDB_CROSS_USE_MPC
-    bool
-    prompt "Use MPC"
-    default n
-    select GDB_CROSS_USE_GMP_MPFR
-    select MPC
-    help
-      gdb can use MPC, although it does not seem compulsory.
-      
-      Say 'Y' here if you want to use MPC.
-
 endif # GDB_CROSS
diff --git a/config/debug/gdb.in.native b/config/debug/gdb.in.native
index c959e88..a4501d1 100644
--- a/config/debug/gdb.in.native
+++ b/config/debug/gdb.in.native
@@ -11,23 +11,6 @@ config GDB_NATIVE
 
 if GDB_NATIVE
 
-config GDB_NATIVE_USE_GMP_MPFR
-    bool
-    prompt "Use GMP and MPFR"
-    default n
-    select GMP_TARGET
-    select MPFR_TARGET
-    select GDB_NATIVE_NO_STATIC
-    help
-      gdb can make use of the GMP and MPFR libraries.
-      
-      While the cross-gdb (above) can use the libraries compiled for the
-      host, the native gdb needs the libraries for the target (where it will
-      eventually run).
-      
-      Setting this option will force building the GMP and MPFR libraries for
-      the target, and configure the native gdb to use them.
-
 config GDB_NATIVE_NO_STATIC
     bool
     default n
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index f112cdd..4eb31be 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -79,13 +79,6 @@ do_debug_gdb_build() {
         cd "${CT_BUILD_DIR}/build-gdb-cross"
 
         cross_extra_config=("${extra_config[@]}")
-        if [ "${CT_GDB_CROSS_USE_GMP_MPFR}" = "y" ]; then
-            cross_extra_config+=("--with-gmp=${CT_PREFIX_DIR}")
-            cross_extra_config+=("--with-mpfr=${CT_PREFIX_DIR}")
-        fi
-        if [ "${CT_GDB_CROSS_USE_MPC}" = "y" ]; then
-            cross_extra_config+=("--with-mpc=${CT_PREFIX_DIR}")
-        fi
         case "${CT_THREADS}" in
             none)   cross_extra_config+=("--disable-threads");;
             *)      cross_extra_config+=("--enable-threads");;
@@ -199,10 +192,6 @@ do_debug_gdb_build() {
             none)   native_extra_config+=("--disable-threads");;
             *)      native_extra_config+=("--enable-threads");;
         esac
-        if [ "${CT_GDB_NATIVE_USE_GMP_MPFR}" = "y" ]; then
-            native_extra_config+=("--with-gmp=${CT_SYSROOT_DIR}/usr")
-            native_extra_config+=("--with-mpfr=${CT_SYSROOT_DIR}/usr")
-        fi
 
         if [ "${CT_GDB_NATIVE_STATIC}" = "y" ]; then
             CC_for_gdb="${CT_TARGET}-gcc -static"
-- 
cgit v0.10.2-6-g49f6