aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2023-03-14 07:55:49 -0600
committerTom Tromey <tromey@adacore.com>2023-03-29 10:13:12 -0600
commitb28937b874fe2580dc372d5eb2d81748460b3363 (patch)
treeac1e09205dcf80f47d6fec4404d5cff572c22658 /gdb
parent1fa14231efd56ee77a9d8f66f741e285c0040839 (diff)
downloadgdb-b28937b874fe2580dc372d5eb2d81748460b3363.zip
gdb-b28937b874fe2580dc372d5eb2d81748460b3363.tar.gz
gdb-b28937b874fe2580dc372d5eb2d81748460b3363.tar.bz2
Remove version_at_least
version_at_least is a less capable variant of version_compare, so this patch removes it.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/lib/gdb.exp18
1 files changed, 3 insertions, 15 deletions
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 7fb4f1c..8b85618 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1489,25 +1489,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 } {
@@ -7018,7 +7006,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,