From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 18FC63858C54 for ; Thu, 7 Apr 2022 01:52:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 18FC63858C54 X-ASG-Debug-ID: 1649296321-0c856e06abaf8310001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id 81IJBBeQGNuEPTPD (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 06 Apr 2022 21:52:01 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id 4FCD1441D67; Wed, 6 Apr 2022 21:52:01 -0400 (EDT) From: Simon Marchi X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 4/6] gdb/testsuite: add "macros" option to gdb_compile Date: Wed, 6 Apr 2022 21:51:57 -0400 X-ASG-Orig-Subj: [PATCH 4/6] gdb/testsuite: add "macros" option to gdb_compile Message-Id: <20220407015159.1734834-5-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220407015159.1734834-1-simon.marchi@polymtl.ca> References: <20220407015159.1734834-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1649296321 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 6307 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.97177 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-Spam-Status: No, score=-3613.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_QUARANTINE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Apr 2022 01:52:14 -0000 From: Simon Marchi Make gdb_compile handle a new "macros" option, which makes it pass the appropriate flag to make the compiler include macro information in the debug info. This will help simplify tests using macros, reduce redundant code, and make it easier to add support for a new compiler. Right now it only handles clang specially (using -fdebug-macro) and falls back to -g3 otherwise (which works for gcc). Other compilers can be added as needed. Change-Id: I50cd6ab1bfbb478c1005486408e214b551364c9b --- gdb/testsuite/gdb.base/info-macros.exp | 14 +---------- gdb/testsuite/gdb.base/macscp.exp | 11 ++------- gdb/testsuite/gdb.base/style.exp | 23 ++++--------------- gdb/testsuite/gdb.linespec/macro-relative.exp | 9 +------- gdb/testsuite/lib/gdb.exp | 13 +++++++++++ 5 files changed, 22 insertions(+), 48 deletions(-) diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp index b3e1032d76f9..39c9bc696ccf 100644 --- a/gdb/testsuite/gdb.base/info-macros.exp +++ b/gdb/testsuite/gdb.base/info-macros.exp @@ -21,19 +21,7 @@ if [using_fission] { return -1 } -set options {debug} - -get_compiler_info -if { [test_compiler_info gcc*] } { - lappend options "additional_flags=-g3" -} elseif { [test_compiler_info clang*] } { - lappend options "additional_flags=-fdebug-macro" -} else { - untested "no compiler info" - return -1 -} - -if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } { +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug macros}] } { return -1 } diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp index 4c06423e6d50..be9bd5312ff2 100644 --- a/gdb/testsuite/gdb.base/macscp.exp +++ b/gdb/testsuite/gdb.base/macscp.exp @@ -18,19 +18,12 @@ standard_testfile macscp1.c set objfile [standard_output_file ${testfile}.o] -set options { debug additional_flags=-DFROM_COMMANDLINE=ARG} - -get_compiler_info -if { [test_compiler_info "gcc-*"] } { - lappend options additional_flags=-g3 -} elseif { [test_compiler_info "clang-*"] } { - lappend options additional_flags=-fdebug-macro -} +set options {debug macros additional_flags=-DFROM_COMMANDLINE=ARG} # Generate the intermediate object file. This is required by Darwin to # have access to the .debug_macinfo section. if {[gdb_compile "${srcdir}/${subdir}/macscp1.c" "${objfile}" \ - object $options] != "" + object $options] != "" || [gdb_compile "${objfile}" "${binfile}" executable $options] != "" } { untested "failed to compile" return -1 diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp index 611b8ae52ba0..6bb5e1c9ac06 100644 --- a/gdb/testsuite/gdb.base/style.exp +++ b/gdb/testsuite/gdb.base/style.exp @@ -20,18 +20,7 @@ load_lib gdb-python.exp standard_testfile # Compile the test executable. -set test_macros 0 -set options debug -get_compiler_info -if { [test_compiler_info "gcc-*"] } { - lappend options additional_flags=-g3 - set test_macros 1 -} elseif { [test_compiler_info "clang-*"] } { - lappend options additional_flags=-fdebug-macro - set test_macros 1 -} - -if {[build_executable "failed to build" $testfile $srcfile $options]} { +if {[build_executable "failed to build" $testfile $srcfile {debug macros}]} { return -1 } @@ -75,7 +64,7 @@ proc clean_restart_and_disable { args } { # CLEAN_RESTART_AND_DISABLE instead of CLEAN_RESTART, this ensures # that the test operates as expected as styles are disabled. proc run_style_tests { } { - global testfile srcfile hex binfile test_macros + global testfile srcfile hex binfile global currently_disabled_style decimal hex save_vars { env(TERM) } { @@ -181,11 +170,9 @@ proc run_style_tests { } { gdb_test_no_output "set width 0" "" } - if {$test_macros} { - set macro_line [gdb_get_line_number "\#define SOME_MACRO"] - gdb_test "info macro SOME_MACRO" \ - "Defined at $base_file_expr:$macro_line\r\n#define SOME_MACRO 23" - } + set macro_line [gdb_get_line_number "\#define SOME_MACRO"] + gdb_test "info macro SOME_MACRO" \ + "Defined at $base_file_expr:$macro_line\r\n#define SOME_MACRO 23" gdb_test_no_output "set width 0" diff --git a/gdb/testsuite/gdb.linespec/macro-relative.exp b/gdb/testsuite/gdb.linespec/macro-relative.exp index f827420eb3cf..609f290d8fbe 100644 --- a/gdb/testsuite/gdb.linespec/macro-relative.exp +++ b/gdb/testsuite/gdb.linespec/macro-relative.exp @@ -26,14 +26,7 @@ if [is_remote host] { return 0 } -set opts {debug additional_flags=-I.} - -get_compiler_info -if [test_compiler_info gcc*] { - lappend opts additional_flags=-g3 -} elseif [test_compiler_info clang*] { - lappend opts additional_flags=-fdebug-macro -} +set opts {debug additional_flags=-I. macros} if { [file pathtype $objdir] == "relative" } { untested "objdir $objdir should be absolute" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 0b242b649929..8db41154e428 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4347,6 +4347,8 @@ set gdb_saved_set_unbuffered_mode_obj "" # - nowarnings: Inhibit all compiler warnings. # - pie: Force creation of PIE executables. # - nopie: Prevent creation of PIE executables. +# - macros: Add the required compiler flag to include macro information in +# debug information # # And here are some of the not too obscure options understood by DejaGnu that # influence the compilation: @@ -4574,6 +4576,17 @@ proc gdb_compile {source dest type options} { lappend options "$flag" } + set macros [lsearch -exact $options macros] + if {$macros != -1} { + if { [test_compiler_info "clang-*"] } { + set flag "additional_flags=-fdebug-macro" + } else { + set flag "additional_flags=-g3" + } + + set options [lreplace $options $macros $macros $flag] + } + if { $type == "executable" } { if { ([istarget "*-*-mingw*"] || [istarget "*-*-*djgpp"] -- 2.35.1