From 6892f60143f7809641dc1824e29dcc406a705df6 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 23 Apr 2019 15:35:21 +0200 Subject: [PATCH] [gdb/contrib] Remove superfluous .alt file after dwz invocation in cc-with-tweaks.sh 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. gdb/ChangeLog: 2019-04-23 Tom de Vries PR gdb/24438 * contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz invocation. --- gdb/ChangeLog | 6 ++++++ gdb/contrib/cc-with-tweaks.sh | 1 + 2 files changed, 7 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7c5e4fb3cd..1b403bc1c2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-04-23 Tom de Vries + + PR gdb/24438 + * contrib/cc-with-tweaks.sh: Remove superfluous .alt file after dwz + invocation. + 2019-03-27 Ali Tamur 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 -- 2.34.1