diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rwxr-xr-x | gdb/contrib/cc-with-tweaks.sh | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 85fa7cf..c2dc2b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-04-24 Tom de Vries <tdevries@suse.de> + + * contrib/cc-with-tweaks.sh: Remove <exec>.gdb-index file handling. + Run gdb-add-index inside temp dir. + 2020-04-23 Tom Tromey <tromey@adacore.com> * windows-tdep.c (is_linked_with_cygwin_dll): Always update "iter" diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh index 7cad3ac..2998a9d 100755 --- a/gdb/contrib/cc-with-tweaks.sh +++ b/gdb/contrib/cc-with-tweaks.sh @@ -144,13 +144,6 @@ then exit $? fi -index_file="${output_file}.gdb-index" -if [ "$want_index" = true ] && [ -f "$index_file" ] -then - echo "$myname: Index file $index_file exists, won't clobber." >&2 - exit 1 -fi - output_dir="${output_file%/*}" [ "$output_dir" = "$output_file" ] && output_dir="." @@ -176,12 +169,16 @@ if [ "$want_objcopy_compress" = true ]; then fi if [ "$want_index" = true ]; then + get_tmpdir + mv "$output_file" "$tmpdir" + tmpfile="$tmpdir/$(basename $output_file)" # Filter out these messages which would stop dejagnu testcase run: # echo "$myname: No index was created for $file" 1>&2 # echo "$myname: [Was there no debuginfo? Was there already an index?]" 1>&2 - GDB=$GDB $GDB_ADD_INDEX $index_options "$output_file" 2>&1 \ + GDB=$GDB $GDB_ADD_INDEX $index_options "$tmpfile" 2>&1 \ | grep -v "^${GDB_ADD_INDEX##*/}: " >&2 rc=${PIPESTATUS[0]} + mv "$tmpfile" "$output_file" [ $rc != 0 ] && exit $rc fi @@ -237,5 +234,4 @@ if [ "$want_dwp" = true ]; then fi fi -rm -f "$index_file" exit $rc |