From 1d39a0d7588b1d7b7bed3a3a841caa7f68d3140f Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Thu, 9 Jan 2025 13:08:49 -0700
Subject: [PATCH] Remove gnatmake_version_at_least

This removes gnatmake_version_at_least in favor of using the more
flexible gnat_version_compare.  I think these two version numbers
should be the same, as gnatmake is shipped with the compiler.
---
 gdb/testsuite/gdb.ada/mi_prot.exp             |  2 +-
 .../gdb.ada/rename_subscript_param.exp        |  2 +-
 gdb/testsuite/gdb.ada/scalar_storage.exp      |  2 +-
 gdb/testsuite/gdb.ada/verylong.exp            |  2 +-
 gdb/testsuite/lib/ada.exp                     | 21 -------------------
 5 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp
index 5a3ab10b16c..8525c1fcf32 100644
--- a/gdb/testsuite/gdb.ada/mi_prot.exp
+++ b/gdb/testsuite/gdb.ada/mi_prot.exp
@@ -16,7 +16,7 @@
 load_lib "ada.exp"
 
 require allow_ada_tests
-require {gnatmake_version_at_least 8}
+require {gnat_version_compare >= 8}
 
 standard_ada_testfile prot
 
diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp
index bd49b5b02b6..efb29f40f62 100644
--- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp
+++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp
@@ -17,7 +17,7 @@ load_lib "ada.exp"
 
 require allow_ada_tests
 
-require {gnatmake_version_at_least 8}
+require {gnat_version_compare >= 8}
 
 standard_ada_testfile pb30_012
 
diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp
index 5dccaef8f14..f8fc46974b1 100644
--- a/gdb/testsuite/gdb.ada/scalar_storage.exp
+++ b/gdb/testsuite/gdb.ada/scalar_storage.exp
@@ -36,7 +36,7 @@ if {![runto "storage.adb:$bp_location"]} {
 gdb_test "print V_LE" "= \\(value => 126, another_value => 12, color => green\\)"
 
 # This requires a compiler fix that is in GCC 14.
-if { ![gnatmake_version_at_least 14] }	{
+if { ![gnat_version_compare >= 14] }	{
     setup_kfail "DW_AT_endianity on enum types" *-*-*
 }
 gdb_test "print V_BE" "= \\(value => 126, another_value => 12, color => green\\)"
diff --git a/gdb/testsuite/gdb.ada/verylong.exp b/gdb/testsuite/gdb.ada/verylong.exp
index 4a3e0b9eeb2..c8574f34e9d 100644
--- a/gdb/testsuite/gdb.ada/verylong.exp
+++ b/gdb/testsuite/gdb.ada/verylong.exp
@@ -16,7 +16,7 @@
 load_lib "ada.exp"
 
 require allow_ada_tests
-require {gnatmake_version_at_least 11}
+require {gnat_version_compare >= 11}
 
 standard_ada_testfile prog
 
diff --git a/gdb/testsuite/lib/ada.exp b/gdb/testsuite/lib/ada.exp
index 05151d3d8f1..83b419ae210 100644
--- a/gdb/testsuite/lib/ada.exp
+++ b/gdb/testsuite/lib/ada.exp
@@ -167,27 +167,6 @@ proc find_ada_tool {tool} {
     return $result
 }
 
-# Return 1 if gnatmake is at least version $MAJOR.x.x
-
-proc gnatmake_version_at_least { major } {
-    set gnatmake [find_gnatmake]
-    set gnatmake [lindex [split $gnatmake] 0]
-    if {[catch {exec $gnatmake --version} output]} {
-	return 0
-    }
-    if { [regexp {GNATMAKE ([^ .]+).([^ .]+).([^ .]+)} $output \
-	      match gnatmake_major gnatmake_minor gnatmake_micro] } {
-	if { $gnatmake_major >= $major } {
-	    return 1
-	} else {
-	    return 0
-	}
-    }
-
-    # Unknown, return 1
-    return 1
-}
-
 # Compare the GNAT version against L2 using version_compare.  If the
 # compiler does not appear to be GCC, this will always return false.
 
-- 
2.39.5