From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) by sourceware.org (Postfix) with ESMTPS id F34AB3858C5E for ; Tue, 14 Mar 2023 14:03:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F34AB3858C5E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-il1-x135.google.com with SMTP id i19so8660781ila.10 for ; Tue, 14 Mar 2023 07:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1678802580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ctGuv1Kzz0QEdR/aKCWFhAdr1zBe8EQ/G4p9t0WusfI=; b=MKqnymOV78nZ6vWF5Oh8lkk4zkAj/66Ho3SojBa4ssPE7KHnCB5bGLgQ6YmgEdPjBR 5LrGQ+VuebsYF3c900kH6A1g+h70CzJMxASen6oErJNEsPwjj1MXAhdRSnhBoOyuCycI Z2NWg/6VkbT6xz3PsaA/yAzTY3VO3mt0QVVcchGVNarK2DxECdNL7g++a5IsuOfir7DD zzLDiwJkiXyhhDW7WKbIer65AfHvryN/c4qVS8MyFmqxViduaA8AbTfprhXwp1Diltf1 9SofApbBbHxEOKtvQQkqdjELqVuS1mKnlqUYm/vzQklGU5Hr5PP6EMXTAuziZRUTWzDW vQAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678802580; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ctGuv1Kzz0QEdR/aKCWFhAdr1zBe8EQ/G4p9t0WusfI=; b=RLQWamDbJubKx4/cfYVSlET4WP3uF1/fDH/F3QMtsKbzrV/0g8OKkbj1AmRwKzGNEi Xs0/ya1CLIr+x7DMHwU7YFYLsWaumw3DdtYhxRnpFpM+9b58y3HrR/xzkx3tbSRfYfHs otck2I0W4tRGvP1F3+pgj6J/Nwik25D3O9EhvlBniiiqbUBIQ4ru2Q/rUptxaEp6wY9M DzLmHOdoiIVXBxgLoP89/TXpfng/5SAcHpiu8i7cZwLgNxfWag7t2b5G+twYgm5uP4H3 PXSye8gcQhfc5QuIt2d7zdITg23tvcGiX/WYjqmzrn2bDzFkogoaSi3RiJ90qjWE8AIm BjfQ== X-Gm-Message-State: AO0yUKUs11bnKz5u0jhwV50pXqTqZdHLnbH68IcCiZhkdcIgvijZ8/Oq 7rDYWYW8oOGkEnkajuGt5R2nH/SgAJg9NDkBivY= X-Google-Smtp-Source: AK7set+zTtFh+gqaGkEXmkxKydsZJxurlTf63FkST+PRbqI2kh40Ugo1rjBJd/WNM6zqnSCe6cezrg== X-Received: by 2002:a92:d3c6:0:b0:317:9711:cf0 with SMTP id c6-20020a92d3c6000000b0031797110cf0mr2488758ilh.16.1678802580079; Tue, 14 Mar 2023 07:03:00 -0700 (PDT) Received: from localhost.localdomain (71-211-185-113.hlrn.qwest.net. [71.211.185.113]) by smtp.gmail.com with ESMTPSA id q3-20020a02a303000000b003a971c488cesm778356jai.173.2023.03.14.07.02.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Mar 2023 07:02:59 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 3/3] Remove version_at_least Date: Tue, 14 Mar 2023 08:02:51 -0600 Message-Id: <20230314140251.1081243-4-tromey@adacore.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230314140251.1081243-1-tromey@adacore.com> References: <20230314140251.1081243-1-tromey@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: version_at_least is a less capable variant of version_compare, so this patch removes it. --- gdb/testsuite/lib/gdb.exp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 23277c4ab79..3e028372191 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1478,25 +1478,13 @@ proc gdb_test { args } { return [gdb_test_multiple $command $message {*}$opts $user_code] } -# Return 1 if version MAJOR.MINOR is at least AT_LEAST_MAJOR.AT_LEAST_MINOR. -proc version_at_least { major minor at_least_major at_least_minor} { - if { $major > $at_least_major } { - return 1 - } elseif { $major == $at_least_major \ - && $minor >= $at_least_minor } { - return 1 - } else { - return 0 - } -} - # Return 1 if tcl version used is at least MAJOR.MINOR proc tcl_version_at_least { major minor } { global tcl_version regexp {^([0-9]+)\.([0-9]+)$} $tcl_version \ dummy tcl_version_major tcl_version_minor - return [version_at_least $tcl_version_major $tcl_version_minor \ - $major $minor] + return [version_compare [list $major $minor] \ + <= [list $tcl_version_major $tcl_version_minor]] } if { [tcl_version_at_least 8 5] == 0 } { @@ -6869,7 +6857,7 @@ proc readelf_prints_pie { } { # flag is printed by readelf, but we cannot reliably construct a PIE # executable if the multilib_flags dictate otherwise # (--target_board=unix/-no-pie/-fno-PIE). - return [version_at_least $major $minor 2 26] + return [version_compare {2 26} <= [list $major $minor]] } # Return 1 if EXECUTABLE is a Position Independent Executable, 0 if it is not, -- 2.39.1