From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id DCEFF3870844 for ; Fri, 19 Jun 2020 14:18:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DCEFF3870844 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 33770B16D; Fri, 19 Jun 2020 14:18:52 +0000 (UTC) Subject: Re: [PATCH][gdb/testsuite] Limit default_target_compile override From: Tom de Vries To: gdb-patches@sourceware.org, Tom Tromey References: <20200619120959.GA10641@delia> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: Date: Fri, 19 Jun 2020 16:18:52 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200619120959.GA10641@delia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-15.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Fri, 19 Jun 2020 14:18:55 -0000 On 6/19/20 2:10 PM, Tom de Vries wrote: > Hi, > > The file lib/future.exp contains an override of dejagnu's > default_target_compile. > > The override is activated if dejagnu's default_target_compile is missing > support for one or more languages. > > However, if the override is activated, it's active for all languages. > > This unnecessarily extends the scope of potential problems in the override to > languages that don't need the override. > > Fix this by limiting the scope of the override. > Interestingly, AFAICT this also seems to fix all the regressions with dejagnu trunk. Thanks, - Tom > Also add a note stating for which languages the override is active, as a > reminder that support for those languages needs to be ported to dejagnu. With > my system dejagnu 1.6.1, as well as with current dejagnu trunk, that gives us: > ... > NOTE: Dejagnu's default_target_compile is missing support for Go, using \ > local override > NOTE: Dejagnu's default_target_compile is missing support for Rust, using \ > local override > ... > > Tested on x86_64-linux. > > Any comments? > > Thanks, > - Tom > > [gdb/testsuite] Limit default_target_compile override > > gdb/testsuite/ChangeLog: > > 2020-06-19 Tom de Vries > > * lib/gdb.exp (gdb_note): New proc. > * lib/future.exp (gdb_default_target_compile_1): Factor out of ... > (gdb_default_target_compile): ... here. Only call > gdb_default_target_compile_1 if use_gdb_compile() is set. > (use_gdb_compile): Change to array. > (toplevel): Update sets of use_gdb_compile to specify language. > Warn about default_target_compile override. Store dejagnu's version > of default_target_compile in dejagnu_default_target_compile. > > --- > gdb/testsuite/lib/future.exp | 68 +++++++++++++++++++++++++++++++++++--------- > gdb/testsuite/lib/gdb.exp | 6 ++++ > 2 files changed, 61 insertions(+), 13 deletions(-) > > diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp > index 62cc7e68a5..a46640c14c 100644 > --- a/gdb/testsuite/lib/future.exp > +++ b/gdb/testsuite/lib/future.exp > @@ -172,7 +172,9 @@ proc gdb_find_eu-unstrip {} { > return $eu_unstrip > } > > -proc gdb_default_target_compile {source destfile type options} { > +# Local version of default_target_compile, to be used for languages that > +# dejagnu's default_target_compile doesn't support. > +proc gdb_default_target_compile_1 {source destfile type options} { > global target_triplet > global tool_root_dir > global CFLAGS_FOR_TARGET > @@ -627,40 +629,80 @@ proc gdb_default_target_compile {source destfile type options} { > return ${comp_output} > } > > -# See if the version of dejaGNU being used to run the testsuite is > -# recent enough to contain support for building Ada programs or not. > -# If not, then use the functions above in place of the ones provided > -# by dejaGNU. This is only temporary (brobecker/2004-03-31). > +# If dejagnu's default_target_compile supports the language specified in > +# OPTIONS, use it. Otherwise, use gdb_default_target_compile_1. > +proc gdb_default_target_compile {source destfile type options} { > + global use_gdb_compile > + > + set need_local 0 > + foreach i $options { > + > + if { $i == "ada" || $i == "d" || $i == "go" || $i == "rust" } { > + set need_local [info exists use_gdb_compile($i)] > + break > + } > + > + if { $i == "c++" } { > + break > + } > + > + if { $i == "f77" || $i == "f90" } { > + set need_local [info exists use_gdb_compile(fortran)] > + break > + } > + } > + > + if { $need_local } { > + return [gdb_default_target_compile_1 $source $destfile $type $options] > + } > + > + return [dejagnu_default_target_compile $source $destfile $type $options] > +} > + > +# Array of languages for which dejagnu's default_target_compile is missing > +# support. > +array set use_gdb_compile [list] > + > +# Note missing support in dejagnu's default_target_compile. This > +# needs to be fixed by porting the missing support to Dejagnu. > +set note_prefix "Dejagnu's default_target_compile is missing support for " > +set note_suffix ", using local override" > > -set use_gdb_compile 0 > if {[info procs find_gnatmake] == ""} { > rename gdb_find_gnatmake find_gnatmake > - set use_gdb_compile 1 > + set use_gdb_compile(ada) 1 > + gdb_note [join [list $note_prefix "Ada" $note_suffix] ""] > } > > if {[info procs find_gfortran] == ""} { > rename gdb_find_gfortran find_gfortran > - set use_gdb_compile 1 > + set use_gdb_compile(fortran) 1 > + gdb_note [join [list $note_prefix "Fortran" $note_suffix] ""] > } > > if {[info procs find_go_linker] == ""} { > rename gdb_find_go find_go > rename gdb_find_go_linker find_go_linker > - set use_gdb_compile 1 > + set use_gdb_compile(go) 1 > + gdb_note [join [list $note_prefix "Go" $note_suffix] ""] > } > > if {[info procs find_gdc] == ""} { > rename gdb_find_gdc find_gdc > - set use_gdb_compile 1 > + set use_gdb_compile(d) 1 > + gdb_note [join [list $note_prefix "D" $note_suffix] ""] > } > > if {[info procs find_rustc] == ""} { > rename gdb_find_rustc find_rustc > - set use_gdb_compile 1 > + set use_gdb_compile(rust) 1 > + gdb_note [join [list $note_prefix "Rust" $note_suffix] ""] > } > > -if {$use_gdb_compile} { > - catch {rename default_target_compile {}} > +# If dejagnu's default_target_compile is missing support for any language, > +# override it. > +if { [array size use_gdb_compile] != 0 } { > + catch {rename default_target_compile dejagnu_default_target_compile} > rename gdb_default_target_compile default_target_compile > } > > diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp > index 480af7052f..7b243f5fff 100644 > --- a/gdb/testsuite/lib/gdb.exp > +++ b/gdb/testsuite/lib/gdb.exp > @@ -7393,5 +7393,11 @@ proc tuiterm_env { } { > lappend gdb_finish_hooks tuiterm_env_finish > } > > +# Dejagnu has a version of note, but usage is not allowed outside of dejagnu. > +# Define a local version. > +proc gdb_note { message } { > + verbose -- "NOTE: $message" 0 > +} > + > # Always load compatibility stuff. > load_lib future.exp >