Re: [pushed/v2 1/9] gdb/configure: Add --with-libgmp-prefix option

[Bernd Edlinger <bernd.edlinger@hotmail.de>]

[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]

Hi Joel,

On 11/15/20 9:35 AM, Joel Brobecker wrote:
> This patch allows a user to tell gdb's configure script where
> his GMP library is installed.
> 
> gdb/ChangeLog:
> 
>         * configure.ac: Add support for --with-libgmp-prefix.
>         * Makefile.in (LIBGMP): New variable.
>         (CLIBS): Include $(LIBGMP).
>         * configure, config.in: Regenerate
> ---
>  gdb/ChangeLog    |   7 +
>  gdb/Makefile.in  |   5 +-
>  gdb/config.in    |   3 +
>  gdb/configure    | 488 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  gdb/configure.ac |   5 +
>  5 files changed, 507 insertions(+), 1 deletion(-)
> 

I noticed that this does not allow to build gmp in-tree like it is
possible for gcc.  I tried to overcome this by the attached patch.

While doing so, I also noticed an incompatibility with the top level
configure stript, which advertises, and passes -with-gmp-include
and -with-gmp-lib if in-tree gmp is found.

So the --with-libgmp-prefix is not that the top level configure
script suggests:

$ ./configure --help | grep gmp
  --with-gmp-dir=PATH     this option has been REMOVED
  --with-gmp=PATH         specify prefix directory for the installed GMP
                          --with-gmp-include=PATH/include plus
                          --with-gmp-lib=PATH/lib
  --with-gmp-include=PATH specify directory for installed GMP include files
  --with-gmp-lib=PATH     specify directory for the installed GMP library

What do you think, can we allow these traditional configure options
additional to the new --with-libgmp-prefix?

Can we the top level Makefile.def change in binutils-gdb or has this
be checked-in first in gcc?


Thanks
Bernd.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Enable-GDB-build-with-in-tree-GMP.patch --]
[-- Type: text/x-patch; name="0001-Enable-GDB-build-with-in-tree-GMP.patch", Size: 5336 bytes --]

From ec85565bb963df25bdd46db19e1aeadc596c8424 Mon Sep 17 00:00:00 2001
From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Sun, 15 Nov 2020 15:37:22 +0100
Subject: [PATCH] Enable GDB build with in-tree GMP

Add --with-gmp= --with-gmp-include and --with-gmp-lib=
for compatibility with top level configure script.

2020-11-15  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* Makefile.def: Prepare for GDB build with intree GMP.
	* Makefile.in: Regenerate.

gdb:
2020-11-15  Bernd Edlinger  <bernd.edlinger@hotmail.de>

	* configure.ac: Add --with-gmp= --with-gmp-include= and --with-gmp-lib=
	for compatibility with top level configure script.
	* configure: Regenerate.
---
 Makefile.def     |  4 +++-
 Makefile.in      |  3 ++-
 gdb/configure    | 35 +++++++++++++++++++++++++++++++++++
 gdb/configure.ac | 16 ++++++++++++++++
 4 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/Makefile.def b/Makefile.def
index 089e70a..89aaef5 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -115,7 +115,8 @@ host_modules= { module= zlib; no_install=true; no_check=true;
 host_modules= { module= gnulib; };
 host_modules= { module= gdbsupport; };
 host_modules= { module= gdbserver; };
-host_modules= { module= gdb; };
+host_modules= { module= gdb;
+		extra_configure_flags='@extra_mpfr_configure_flags@';};
 host_modules= { module= expect; };
 host_modules= { module= guile; };
 host_modules= { module= tk; };
@@ -391,6 +392,7 @@ dependencies = { module=all-intl; on=all-libiconv; };
 
 // Host modules specific to gdb.
 dependencies = { module=configure-gdb; on=all-intl; };
+dependencies = { module=configure-gdb; on=all-gmp; };
 dependencies = { module=configure-gdb; on=configure-sim; };
 dependencies = { module=configure-gdb; on=all-bfd; };
 dependencies = { module=configure-gdb; on=all-gnulib; };
diff --git a/Makefile.in b/Makefile.in
index fe34132..93780b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29491,7 +29491,7 @@ configure-gdb:
 	  $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias}  \
+	  --target=${target_alias} @extra_mpfr_configure_flags@ \
 	  || exit 1
 @endif gdb
 
@@ -52449,6 +52449,7 @@ configure-libcc1: maybe-configure-gcc
 all-libcc1: maybe-all-gcc
 all-utils: maybe-all-libiberty
 configure-gdb: maybe-all-intl
+configure-gdb: maybe-all-gmp
 configure-gdb: maybe-all-bfd
 configure-gdb: maybe-all-libiconv
 all-gdb: maybe-all-libiberty
diff --git a/gdb/configure b/gdb/configure
index a3e73b4..44bbce3 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -899,6 +899,9 @@ with_jit_reader_dir
 with_expat
 with_libexpat_prefix
 with_libexpat_type
+with_gmp_include
+with_gmp_lib
+with_gmp
 with_libgmp_prefix
 with_libgmp_type
 with_mpfr
@@ -1644,6 +1647,9 @@ Optional Packages:
   --with-libexpat-prefix[=DIR]  search for libexpat in DIR/include and DIR/lib
   --without-libexpat-prefix     don't search for libexpat in includedir and libdir
   --with-libexpat-type=TYPE     type of library to search for (auto/static/shared)
+  --with-gmp-include=DIR  GMP include directory
+  --with-gmp-lib=DIR      GMP lib directory
+  --with-gmp=DIR          GMP install directory
   --with-libgmp-prefix[=DIR]  search for libgmp in DIR/include and DIR/lib
   --without-libgmp-prefix     don't search for libgmp in includedir and libdir
   --with-libgmp-type=TYPE     type of library to search for (auto/static/shared)
@@ -9990,6 +9996,35 @@ done
   fi
 fi
 
+
+# Check whether --with-gmp_include was given.
+if test "${with_gmp_include+set}" = set; then :
+  withval=$with_gmp_include; CPPFLAGS="$CPPFLAGS -I$withval"
+fi
+
+
+# Check whether --with-gmp_lib was given.
+if test "${with_gmp_lib+set}" = set; then :
+  withval=$with_gmp_lib; LDFLAGS="$LDFLAGS -L$withval"
+fi
+
+
+# Check whether --with-gmp was given.
+if test "${with_gmp+set}" = set; then :
+  withval=$with_gmp;
+   if test -z "$with_gmp_lib" && test -z "$with_gmp_include" ; then
+      CPPFLAGS="$CPPFLAGS -I$withval/include"
+      LDFLAGS="$LDFLAGS -L$withval/lib"
+   else
+      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Do not use --with-gmp and --with-gmp-include/--with-gmp-lib options simultaneously.
+See \`config.log' for more details" "$LINENO" 5; }
+   fi
+
+fi
+
+
 # Verify that we have a usable GMP library.
 
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 32f25d9..a6a7cd3 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -683,6 +683,22 @@ else
   fi
 fi
 
+AC_ARG_WITH(gmp_include,
+   [  --with-gmp-include=DIR  GMP include directory ],
+   CPPFLAGS="$CPPFLAGS -I$withval")
+AC_ARG_WITH(gmp_lib,
+   [  --with-gmp-lib=DIR      GMP lib directory ],
+   LDFLAGS="$LDFLAGS -L$withval")
+AC_ARG_WITH(gmp,
+   [  --with-gmp=DIR          GMP install directory ], [
+   if test -z "$with_gmp_lib" && test -z "$with_gmp_include" ; then
+      CPPFLAGS="$CPPFLAGS -I$withval/include"
+      LDFLAGS="$LDFLAGS -L$withval/lib"
+   else
+      AC_MSG_FAILURE([Do not use --with-gmp and --with-gmp-include/--with-gmp-lib options simultaneously.])
+   fi
+  ])
+
 # Verify that we have a usable GMP library.
 AC_LIB_HAVE_LINKFLAGS([gmp], [], [#include <gmp.h>],
                       [mpz_t n;
-- 
1.9.1