From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127078 invoked by alias); 23 Apr 2019 13:42:40 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 127065 invoked by uid 89); 23 Apr 2019 13:42:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 23 Apr 2019 13:42:39 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 319F4ADE6; Tue, 23 Apr 2019 13:42:37 +0000 (UTC) Subject: [committed] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh From: Tom de Vries To: gdb-patches@sourceware.org, Pedro Alves References: <20190411102627.GA1116@delia> Message-ID: <408e32f8-0414-7f43-715c-c47077cb9ba2@suse.de> Date: Tue, 23 Apr 2019 13:42:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190411102627.GA1116@delia> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2019-04/txt/msg00456.txt.bz2 Committed as obvious. Thanks, - Tom On 11-04-19 12:26, Tom de Vries wrote: > Hi, > > The -m option of cc-with-tweaks.sh sets want_multi to true, invoking dwz like > this: > ... > elif [ "$want_multi" = true ]; then > cp $output_file ${output_file}.alt > $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt \ > > /dev/null 2>&1 > fi > ... > > The problem that is being solved here, is that we want to test dwz in > multifile mode, which requires more than one input file, while we only have > (at the scope of cc-with-tweaks.sh) one executable. We handle this by copying > the executable and offering this as a second input (and using a copy has the > additional benefit that it maximally enables dwz transformation). > > However, after the dwz invocation, the copy is no longer used, and the > presence of the file actually causes a test regression: > ... > FAIL: gdb.base/jit-so.exp: test jit-reader-load filename completion > ... > > Fix this by removing the superflous copy after dwz invocation. > > Tested on x86_64-linux. > > OK for trunk? > > Thanks, > - Tom > > [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh > > gdb/ChangeLog: > > 2019-04-11 Tom de Vries > > PR gdb/24438 > * contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz > invocation. > > --- > gdb/contrib/cc-with-tweaks.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh > index f6bfa16565..33c6322138 100755 > --- a/gdb/contrib/cc-with-tweaks.sh > +++ b/gdb/contrib/cc-with-tweaks.sh > @@ -180,6 +180,7 @@ if [ "$want_dwz" = true ]; then > elif [ "$want_multi" = true ]; then > cp $output_file ${output_file}.alt > $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null 2>&1 > + rm -f ${output_file}.alt > fi > > if [ "$want_dwp" = true ]; then >