From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 3C564383E80F for ; Mon, 15 Jun 2020 15:15:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3C564383E80F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=ludo@gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]:38378) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkqpJ-0008ON-Fd; Mon, 15 Jun 2020 11:15:09 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39846 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jkqpI-0004KF-PL; Mon, 15 Jun 2020 11:15:09 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: gdb-patches@sourceware.org Cc: Doug Evans , =?UTF-8?q?Ludovic=20Court=C3=A8s?= Subject: [PATCH v2 2/2] guile: Add support for Guile 3.0. Date: Mon, 15 Jun 2020 17:14:53 +0200 Message-Id: <20200615151453.795-3-ludo@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200615151453.795-1-ludo@gnu.org> References: <87wo4bypk6.fsf@gnu.org> <20200615151453.795-1-ludo@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2020 15:15:15 -0000 gdb/ChangeLog 2020-06-15 Ludovic Courtès * guile/scm-math.c (vlscm_integer_fits_p): Use 'uintmax_t' and 'intmax_t' instead of 'scm_t_uintmax' and 'scm_t_intmax', which are deprecated in Guile 3.0. * testsuite/gdb.guile/source2.scm: Add #f first argument to 'format'. * testsuite/gdb.guile/types-module.exp: Remove "ERROR:" from regexps since Guile 3.0 no longer prints that. * configure.ac (try_guile_versions): Add "guile-3.0". * configure (try_guile_versions): Regenerate. * NEWS: Update entry. gdb/doc/ChangeLog 2020-06-15 Ludovic Courtès * doc/guile.texi (Guile Introduction): Mention Guile 3.0. --- gdb/NEWS | 2 +- gdb/configure | 2 +- gdb/configure.ac | 2 +- gdb/doc/guile.texi | 2 +- gdb/guile/scm-math.c | 4 ++-- gdb/testsuite/gdb.guile/source2.scm | 2 +- gdb/testsuite/gdb.guile/types-module.exp | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index d8a9de4179..23705e1c65 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -85,7 +85,7 @@ GNU/Linux/RISC-V (gdbserver) riscv*-*-linux* * Guile API - ** GDB can now be built with GNU Guile 2.2 in addition to 2.0. + ** GDB can now be built with GNU Guile 3.0 and 2.2 in addition to 2.0. ** Procedures 'memory-port-read-buffer-size', 'set-memory-port-read-buffer-size!', 'memory-port-write-buffer-size', diff --git a/gdb/configure b/gdb/configure index bd12695291..5ad1e53ac4 100755 --- a/gdb/configure +++ b/gdb/configure @@ -10954,7 +10954,7 @@ fi -try_guile_versions="guile-2.2 guile-2.0" +try_guile_versions="guile-3.0 guile-2.2 guile-2.0" have_libguile=no case "${with_guile}" in no) diff --git a/gdb/configure.ac b/gdb/configure.ac index 87afc26581..d8cef1e914 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1088,7 +1088,7 @@ AC_MSG_RESULT([$with_guile]) dnl We check guile with pkg-config. AC_PATH_PROG(pkg_config_prog_path, pkg-config, missing) -try_guile_versions="guile-2.2 guile-2.0" +try_guile_versions="guile-3.0 guile-2.2 guile-2.0" have_libguile=no case "${with_guile}" in no) diff --git a/gdb/doc/guile.texi b/gdb/doc/guile.texi index 0e6c74ef8b..45c8f3f197 100644 --- a/gdb/doc/guile.texi +++ b/gdb/doc/guile.texi @@ -38,7 +38,7 @@ Guile support in @value{GDBN} follows the Python support in @value{GDBN} reasonably closely, so concepts there should carry over. However, some things are done differently where it makes sense. -@value{GDBN} requires Guile version 2.2 or 2.0. +@value{GDBN} requires Guile version 3.0, 2.2, or 2.0. @cindex guile scripts directory Guile scripts used by @value{GDBN} should be installed in diff --git a/gdb/guile/scm-math.c b/gdb/guile/scm-math.c index 7c63fa2ae0..419f5099bf 100644 --- a/gdb/guile/scm-math.c +++ b/gdb/guile/scm-math.c @@ -578,7 +578,7 @@ vlscm_integer_fits_p (SCM obj, struct type *type) ULONGEST max; /* If scm_is_unsigned_integer can't work with this type, just punt. */ - if (TYPE_LENGTH (type) > sizeof (scm_t_uintmax)) + if (TYPE_LENGTH (type) > sizeof (uintmax_t)) return 0; get_unsigned_type_max (type, &max); return scm_is_unsigned_integer (obj, 0, max); @@ -588,7 +588,7 @@ vlscm_integer_fits_p (SCM obj, struct type *type) LONGEST min, max; /* If scm_is_signed_integer can't work with this type, just punt. */ - if (TYPE_LENGTH (type) > sizeof (scm_t_intmax)) + if (TYPE_LENGTH (type) > sizeof (intmax_t)) return 0; get_signed_type_minmax (type, &min, &max); return scm_is_signed_integer (obj, min, max); diff --git a/gdb/testsuite/gdb.guile/source2.scm b/gdb/testsuite/gdb.guile/source2.scm index 39638053d9..c39f03801a 100644 --- a/gdb/testsuite/gdb.guile/source2.scm +++ b/gdb/testsuite/gdb.guile/source2.scm @@ -15,5 +15,5 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . -(display (format "y~As" "e")) +(display (format #f "y~As" "e")) (newline) diff --git a/gdb/testsuite/gdb.guile/types-module.exp b/gdb/testsuite/gdb.guile/types-module.exp index 5a631dca8e..8ced6fbffb 100644 --- a/gdb/testsuite/gdb.guile/types-module.exp +++ b/gdb/testsuite/gdb.guile/types-module.exp @@ -44,7 +44,7 @@ gdb_test "guile (print (type-has-field-deep? d \"base_member\"))" \ "= #t" "type-has-field-deep? member in baseclass" gdb_test "guile (print (type-has-field-deep? (lookup-type \"int\") \"base_member\"))" \ - "ERROR: .*Wrong type argument in position 1 \\(expecting struct or union\\): #.*" \ + "Wrong type argument in position 1 \\(expecting struct or union\\): #.*" \ "type-has-field-deep? from int" gdb_scm_test_silent_cmd "guile (define enum-htab (make-enum-hashtable (lookup-type \"enum_type\")))" \ @@ -54,9 +54,9 @@ gdb_test "guile (print (hash-ref enum-htab \"B\"))" \ "= 1" "verify make-enum-hashtable" gdb_test "guile (define bad-enum-htab (make-enum-hashtable #f))" \ - "ERROR: .*Wrong type argument in position 1 \\(expecting gdb:type\\): #f.*" \ + "Wrong type argument in position 1 \\(expecting gdb:type\\): #f.*" \ "make-enum-hashtable from #f" gdb_test "guile (define bad-enum-htab (make-enum-hashtable (lookup-type \"int\")))" \ - "ERROR: .*Wrong type argument in position 1 \\(expecting enum\\): #.*" \ + "Wrong type argument in position 1 \\(expecting enum\\): #.*" \ "make-enum-hashtable from int" -- 2.26.2