diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rwxr-xr-x | gdb/contrib/gdb-add-index.sh | 28 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp | 47 |
4 files changed, 86 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 52d5faa..624d579 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-05-10 Lancelot Six <lsix@lancelotsix.com> + + PR gdb/27614 + * contrib/gdb-add-index.sh: Fix when called with a symlink as an + argument. + 2021-05-10 Simon Marchi <simon.marchi@polymtl.ca> * nat/linux-waitpid.c (status_to_str): Show signal name. diff --git a/gdb/contrib/gdb-add-index.sh b/gdb/contrib/gdb-add-index.sh index 2ac3fdd..734110c 100755 --- a/gdb/contrib/gdb-add-index.sh +++ b/gdb/contrib/gdb-add-index.sh @@ -37,6 +37,34 @@ fi file="$1" +if test -L "$file"; then + if ! command -v readlink >/dev/null 2>&1; then + echo "$myname: 'readlink' missing. Failed to follow symlink $1." 1>&2 + exit 1 + fi + + # Count number of links followed in order to detect loops. + count=0 + while test -L "$file"; do + target=$(readlink "$file") + + case "$target" in + /*) + file="$target" + ;; + *) + file="$(dirname "$file")/$target" + ;; + esac + + count="$((count + 1))" + if test "$count" -gt 10; then + echo "$myname: Detected loop while following link $file" + exit 1 + fi + done +fi + if test ! -r "$file"; then echo "$myname: unable to access: $file" 1>&2 exit 1 diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b3a41bd..c188719 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-05-10 Lancelot Six <lsix@lancelotsix.com> + + PR gdb/27614 + * gdb.dwarf2/gdb-add-index-symlink.exp: New test. + 2021-05-10 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.guile/guile.exp: Don't use the source directory as a diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp new file mode 100644 index 0000000..eaeddec --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -0,0 +1,47 @@ +# Copyright 2021 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +load_lib dwarf.exp + +# This test can only be run on targets which support DWARF-2. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile main.c + +if { [prepare_for_testing "failed to prepare" "${testfile}" \ + [list ${srcfile}]] } { + return -1 +} + +set symlink [file dirname $binfile]/symlink + +if { ![file exists $symlink] } { + file link -symbolic $symlink $binfile +} + +if { [ensure_gdb_index $symlink] == -1 } { + fail "Unable to call gdb-add-index with a symlink to a symfile" + return -1 +} + +# Ok, we have a copy of $binfile with an index. +# Restart gdb and verify the index was used. + +clean_restart $symlink +gdb_test "mt print objfiles ${testfile}" \ + "(gdb_index|debug_names).*" \ + "index used" |