Message ID | 20190411102627.GA1116@delia |
---|---|
State | New, archived |
Headers |
Received: (qmail 104288 invoked by alias); 11 Apr 2019 10:26:34 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: <gdb-patches.sourceware.org> List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org> List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org> List-Archive: <http://sourceware.org/ml/gdb-patches/> List-Post: <mailto:gdb-patches@sourceware.org> List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs> Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 104269 invoked by uid 89); 11 Apr 2019 10:26:33 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.6 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; Thu, 11 Apr 2019 10:26:32 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 64E8EAB42; Thu, 11 Apr 2019 10:26:30 +0000 (UTC) Date: Thu, 11 Apr 2019 12:26:28 +0200 From: Tom de Vries <tdevries@suse.de> To: gdb-patches@sourceware.org, Pedro Alves <palves@redhat.com> Subject: [PATCH] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh Message-ID: <20190411102627.GA1116@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes |
Commit Message
Tom de Vries
April 11, 2019, 10:26 a.m. UTC
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 <tdevries@suse.de>
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(+)
Comments
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 <tdevries@suse.de> > > 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 >
>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
Tom> Fix this by removing the superflous copy after dwz invocation.
Tom> Tested on x86_64-linux.
Tom> OK for trunk?
Tom> Thanks,
Tom> - Tom
Tom> [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh
Tom> gdb/ChangeLog:
Tom> 2019-04-11 Tom de Vries <tdevries@suse.de>
Tom> PR gdb/24438
Tom> * contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz
Tom> invocation.
Thanks, this is ok.
Tom
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