From 61ee7510b3fa24ca48b6c053c4fad5916a6b01ff Mon Sep 17 00:00:00 2001 From: Nils-Christian Kempke Date: Tue, 7 Jun 2022 12:16:36 +0200 Subject: [PATCH] gdb/testsuite: use test_compiler_info in gcc_major_version The procedure gcc_major_version was earlier using the global variable compiler_info to retrieve gcc's major version. This is discouraged and (as can be read in a comment in compiler.c) compiler_info should be local to get_compiler_info and test_compiler_info. The preferred way of getting the compiler string is via calling test_compiler_info without arguments. Gcc_major_version was changed to do that. --- gdb/testsuite/lib/gdb.exp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 6a3fed110a8..7b11dab870e 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4218,12 +4218,11 @@ proc test_compiler_info { {compiler ""} {language ""} } { # For gcc 7.5.0, the major version 7. proc gcc_major_version { } { - global compiler_info global decimal if { ![test_compiler_info "gcc-*"] } { return -1 } - set res [regexp gcc-($decimal)-($decimal)- $compiler_info \ + set res [regexp gcc-($decimal)-($decimal)- [test_compiler_info] \ dummy_var major minor] if { $res != 1 } { return -1 -- 2.30.2