[gdb/testsuite, tclint] Fix lib/aarch64.exp

diff --git a/gdb/tclint.toml b/gdb/tclint.toml
index 138b6fcade7fdb36914ba7b2df715bfb82f4ea6c..bd5203927eb9b40c15630669924d28203fd34837 100644 (file)
--- a/gdb/tclint.toml
+++ b/gdb/tclint.toml
@@ -33,7 +33,6 @@ exclude = [
 # TODO:
 "gdb/testsuite/boards",
 "gdb/testsuite/config",
-"gdb/testsuite/lib/aarch64.exp",
 "gdb/testsuite/lib/aarch64-scalable.exp",
 "gdb/testsuite/lib/gdb.exp",
 # IGNORE (document reason in trailing comment):

diff --git a/gdb/testsuite/lib/aarch64.exp b/gdb/testsuite/lib/aarch64.exp
index ef644892d4ffa30bd333f2cb00c0ba9d3b11fd67..0d3ed836674cd78a0ea66501cc19b0aae5a404da 100644 (file)
--- a/gdb/testsuite/lib/aarch64.exp
+++ b/gdb/testsuite/lib/aarch64.exp
@@ -78,7 +78,7 @@ proc initialize_1d_array { name byte elements } {
        append data $byte
 
        # If this isn't the last element, add a comma.
-       if {[expr $element + 1] < $elements} {
+       if {$element + 1 < $elements} {
            append data ", "
        }
     }
@@ -101,7 +101,7 @@ proc initialize_2d_array { name byte rows columns } {
     set brace_open "{"
     set brace_close "}"
 
-    if {[expr $rows * $columns] <= 256} {
+    if {$rows * $columns <= 256} {
        # Build the assignment in a single shot, as we have a maximum of 256
        # elements.
        for {set row 0} {$row < $rows} {incr row} {
@@ -111,7 +111,7 @@ proc initialize_2d_array { name byte rows columns } {
                append data $byte
 
                # If this isn't the last column, add a comma.
-               if {[expr $column + 1] < $columns} {
+               if {$column + 1 < $columns} {
                    append data ", "
                }
            }
@@ -119,7 +119,7 @@ proc initialize_2d_array { name byte rows columns } {
            append data $brace_close
 
            # If this isn't the last row, add a comma.
-           if {[expr $row + 1] < $rows} {
+           if {$row + 1 < $rows} {
                append data ","
            }
        }