From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id Yex1ITPSEmB0cwAAWB0awg (envelope-from ) for ; Thu, 28 Jan 2021 10:03:15 -0500 Received: by simark.ca (Postfix, from userid 112) id 759641EF80; Thu, 28 Jan 2021 10:03:15 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id CA9A41E945 for ; Thu, 28 Jan 2021 10:03:14 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 38EDC39960CE; Thu, 28 Jan 2021 15:03:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 38EDC39960CE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1611846194; bh=D7lUO7bEsJ3ZLIaafKZBwtP9hKhAwDsvWNMyRdt1ghI=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=C/7k10v5BIMQ8eJKD/sOHR4AswrK4EL4uU9Xy79OhZcL1ddDImidZ0lCZzKneRD+a jY0YwbnZq7s99iE4c0HkjNSDzcePzU7FRIaLiz9yyxmJaKcgclMVzAM+lYpFk7XP0u fYRVdQapj3FFw1YLcLEmykgTeZnRe4KmYfedGbVE= Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 873003851416 for ; Thu, 28 Jan 2021 15:03:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 873003851416 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 10SF334J003401 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 28 Jan 2021 10:03:07 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 10SF334J003401 Received: from [10.0.0.11] (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 8E17D1E945; Thu, 28 Jan 2021 10:03:02 -0500 (EST) Subject: Re: [PATCH][gdb/testsuite] Fix gdb.opt/solib-intra-step.exp with -m32 and gcc-10 To: Tom de Vries , gdb-patches@sourceware.org References: <20210126180312.GA7860@delia> Message-ID: Date: Thu, 28 Jan 2021 10:03:02 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210126180312.GA7860@delia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Thu, 28 Jan 2021 15:03:03 +0000 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: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" On 2021-01-26 1:03 p.m., Tom de Vries wrote: > Hi, > > When running test-case gdb.opt/solib-intra-step.exp with target board > unix/-m32 and gcc-10, I run into: > ... > (gdb) step^M > __x86.get_pc_thunk.bx () at ../sysdeps/i386/crti.S:68^M > 68 ../sysdeps/i386/crti.S: No such file or directory.^M > (gdb) step^M > shlib_second (dummy=0) at solib-intra-step-lib.c:23^M > 23 abort (); /* second-hit */^M > (gdb) FAIL: gdb.opt/solib-intra-step.exp: second-hit > ... > > The problem is that the test-case expects to step past the retry line, > which is optional. > > Fix this by make the retry line step optional, both for shlib_first and > shlib_second. > > Any comments? > > Thanks, > - Tom > > [gdb/testsuite] Fix gdb.opt/solib-intra-step.exp with -m32 and gcc-10 > > gdb/testsuite/ChangeLog: > > 2021-01-26 Tom de Vries > > * gdb.opt/solib-intra-step.exp: Make step into retry line optional. > > --- > gdb/testsuite/gdb.opt/solib-intra-step.exp | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp > index ad19895d890..13e0cf04c7a 100644 > --- a/gdb/testsuite/gdb.opt/solib-intra-step.exp > +++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp > @@ -63,7 +63,7 @@ gdb_test_multiple "step" $test { > exp_continue > } > -re -wrap "get_pc_thunk.*" { > - if { $state != 1 } { > + if { $state != 0 && $state != 1 } { > set state -1 > } else { > set state 2 > @@ -89,7 +89,7 @@ gdb_test_multiple "step" $test { > exp_continue > } > -re -wrap "get_pc_thunk.*" { > - if { $state != 1 } { > + if { $state != 0 && $state != 1 } { > set state -1 > } else { > set state 2 > I don't really understand what happens here, what state value means what. A bit of commenting would help. Simon