From patchwork Thu May 16 17:46:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 90302 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D36ED384CB97 for ; Thu, 16 May 2024 17:47:44 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id C85033858C98 for ; Thu, 16 May 2024 17:46:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C85033858C98 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C85033858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715881610; cv=none; b=halkXX5ggqrklYAJt1rlcow5EHj78zCbKD1leELVUTiez6L3HCvb5DmLYwayLpXolqbznPEDOfGpM1aJtUTnBJxCl+SpLYzD+g39kG/bdqNXMoACkmrlM3thyf24kckKpb2uxR+mKlBoSD6l4yRg4WRNmImSZiKRwV5eUhrKc5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715881610; c=relaxed/simple; bh=B05L+z5zSaNY+zlv3qTsWPmosZNZv7Cp1CNl3+VUcRg=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=UoGc739gQCCdhnBj6UtscEHuCmp8NUqlziKpJkE3DOmyvgy0yu7x/dz41eMjsEULnww2ou8cRXgY87IdBaagsyPTDwTTsh7RiuHfnDR0VdbsZTlz6cjhLg7sy9C7VdndefRxKhZVWtlEd1lVPFn/zWf/mcRMalzBj6HiprGaOXA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-7e1cdde66c1so67506339f.2 for ; Thu, 16 May 2024 10:46:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715881607; x=1716486407; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=/m1U4cIZ/z9xRL305l6DC9gH0Ga+dyE1mJnOXRRPlh8=; b=lV/ZnL+QcvEAR0g4mej8XesLy125CxGju70Z8UPdl/bv9Wl5sl3La0nmB0OLrWQn8m uTXW2GE0uLmdAApF2hqwdC45VOCMd8pyZlnWl9mWw9H883LZKwF4ONdwScPNBdy8jyqQ JJ+/MMxw6FZY8DJAQuoQzJErWQnqrOJjoC1NVw4GnMsEz2QmJX3cl7Dzxm/jSEfuzzuC i18HgXftxh/JDPb6nZFmd5SoK/NlYxOJdtexFgDc8Z45U8ejanlz7kBWIhq+baC+HXCW 5ZlR089saW542E+Nc4mThRNws7TdayMm+hwMOSgpAqTiURAabakzUXKu1Otl890Blekl RBCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715881607; x=1716486407; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/m1U4cIZ/z9xRL305l6DC9gH0Ga+dyE1mJnOXRRPlh8=; b=AEisPtJiPI/s/DP9y/4Y9fnzdzmR54uSXC0MGcBYpnfAzIDxvZ3Gw4+baS1CleLeBj HkaHDmnV7J8CeRqYN97HmB3WjbrxaLVfoLPhQhoyJk229ItbbY45nCwpOYhFRqSzxZXj CoevIaE6K+26XP6O9yqqNR0x3kDCZSd88nA/GENLa2sv/REEs0OcCR4z0/QnJkdHFO7h GdpYCZ8xGP4DYZukj8tkbhxBNvZyqlOjSnV5JvUsLZ2wJ9vjGwGOtzol3hBbRPvqGXcc lrCGfCtt9Ta/HFlggpxK0HE9G5TtKd2l/iFnJt/jJQ2rNXHS3RbHR63QILZ13Jp5HeD/ 23ag== X-Gm-Message-State: AOJu0Yzzvu+XLriPm3yTDNb3k5/Rv1UzKDp/4NE2fOb1o10NUA86zcEu oa5XI1r1fQS/xVe1OMzhjIBW52OAYwCVQWE1qF8Fmmz4BaCnUFfFafqebT1j81ykTF1moGyg1Jg = X-Google-Smtp-Source: AGHT+IFZRtvDGd0GjbSh3WBAbJdcg3m33JsZ3qphv3TGP4zDueyTxdD3I9lINgsjaRtgKGUYYzen0g== X-Received: by 2002:a05:6602:2816:b0:7e2:1180:5f45 with SMTP id ca18e2360f4ac-7e211805fe2mr333031439f.15.1715881606956; Thu, 16 May 2024 10:46:46 -0700 (PDT) Received: from localhost.localdomain (75-166-134-4.hlrn.qwest.net. [75.166.134.4]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-48a43d4e684sm1000821173.90.2024.05.16.10.46.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 10:46:46 -0700 (PDT) From: Tom Tromey Date: Thu, 16 May 2024 11:46:45 -0600 Subject: [PATCH 2/2] Introduce gnat-llvm board file MIME-Version: 1.0 Message-Id: <20240516-gnat-llvm-experiment-v1-2-5c13d1092119@adacore.com> References: <20240516-gnat-llvm-experiment-v1-0-5c13d1092119@adacore.com> In-Reply-To: <20240516-gnat-llvm-experiment-v1-0-5c13d1092119@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.13.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This adds a new gnat-llvm board file, so that gdb's Ada tests can be run against gnat-llvm. It changes foreach_gnat_encoding to handle the gnat-llvm case, and finally it updates a few tests to adapt as well. --- gdb/testsuite/boards/gnat-llvm.exp | 29 +++++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/bias.exp | 8 ++++++-- gdb/testsuite/gdb.ada/finish-large.exp | 2 +- gdb/testsuite/gdb.ada/scalar_storage.exp | 3 +++ gdb/testsuite/gdb.ada/win_fu_syms.exp | 3 +++ gdb/testsuite/lib/ada.exp | 18 +++++++++++++++++- 6 files changed, 59 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/boards/gnat-llvm.exp b/gdb/testsuite/boards/gnat-llvm.exp new file mode 100644 index 00000000000..f2cfe124359 --- /dev/null +++ b/gdb/testsuite/boards/gnat-llvm.exp @@ -0,0 +1,29 @@ +# Copyright 2024 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This file is a dejagnu "board file" and is used to run the testsuite +# with gnat-llvm. + +load_board_description "local-board" + +# This is based on baseboards/unix.exp. +# At the moment we only support systems that unix.exp supports. +load_generic_config "unix" +process_multilib_options "" + +set GNATMAKE_FOR_TARGET llvm-gnatmake + +load_lib ada.exp +set is_gnat_llvm 1 diff --git a/gdb/testsuite/gdb.ada/bias.exp b/gdb/testsuite/gdb.ada/bias.exp index 1b8b917444a..4da4070454a 100644 --- a/gdb/testsuite/gdb.ada/bias.exp +++ b/gdb/testsuite/gdb.ada/bias.exp @@ -19,8 +19,12 @@ require allow_ada_tests standard_ada_testfile bias -if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \ - {debug additional_flags=-fgnat-encodings=minimal}] != "" } { +set flags {debug} +if {!$::is_gnat_llvm} { + lappend flags additional_flags=-fgnat-encodings=minimal +} + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != ""} { return -1 } diff --git a/gdb/testsuite/gdb.ada/finish-large.exp b/gdb/testsuite/gdb.ada/finish-large.exp index b9823d313c4..a40d12808f2 100644 --- a/gdb/testsuite/gdb.ada/finish-large.exp +++ b/gdb/testsuite/gdb.ada/finish-large.exp @@ -21,7 +21,7 @@ standard_ada_testfile p set flags {debug} -if {[have_fvar_tracking]} { +if {[have_fvar_tracking] && !$is_gnat_llvm} { lappend flags "additional_flags=-fvar-tracking" } diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp index e01e75fe5d2..435c0a768a1 100644 --- a/gdb/testsuite/gdb.ada/scalar_storage.exp +++ b/gdb/testsuite/gdb.ada/scalar_storage.exp @@ -20,6 +20,9 @@ load_lib "ada.exp" require allow_ada_tests +# LLVM does not support scalar storage order. +require !ada_llvm + standard_ada_testfile storage if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { diff --git a/gdb/testsuite/gdb.ada/win_fu_syms.exp b/gdb/testsuite/gdb.ada/win_fu_syms.exp index 527a4496649..c2ec349f19a 100644 --- a/gdb/testsuite/gdb.ada/win_fu_syms.exp +++ b/gdb/testsuite/gdb.ada/win_fu_syms.exp @@ -17,6 +17,9 @@ load_lib "ada.exp" require allow_ada_tests +# Currently gnat-llvm does not supply a shared libgnat. +require !ada_llvm + standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-shared additional_flags=-margs]] != "" } { diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp index 0544544acbe..544660def86 100644 --- a/gdb/testsuite/lib/ada.exp +++ b/gdb/testsuite/lib/ada.exp @@ -13,6 +13,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +# When non-zero, assume gnat-llvm. See foreach_gnat_encoding. +set is_gnat_llvm 0 + +# Return the value of is_gnat_llvm. Useful with 'require'. + +proc ada_llvm {} { + return $::is_gnat_llvm +} + # A wrapper for foreach_with_prefix that applies suitable # -fgnat-encodings arguments to a command line. SCENARIO_ARG is the # name of a loop variable that will hold the scenario currently being @@ -21,11 +30,18 @@ # to run, and BODY is what actually does the work. proc foreach_gnat_encoding {scenario_arg flags_arg list body} { + # gnat-llvm does not understand -fgnat-encodings at all. However, + # some tests examine the precise setting of the scenario -- so + # pretend we support minimal. + if {$::is_gnat_llvm} { + set list {minimal} + } + upvar 1 $scenario_arg scenario upvar 1 $flags_arg flags foreach_with_prefix scenario $list { set flags {} - if {$scenario != "none"} { + if {$scenario != "none" && !$::is_gnat_llvm} { lappend flags additional_flags=-fgnat-encodings=$scenario } uplevel 1 $body