summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-10-24 22:32:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-24 22:32:01 +0000
commit3b4e21d2318bc1b6547e45f3393514e7b0be7df2 (patch)
treeca331cec68e5f9234f1e78734d78c351e286dcb5
parent58f165c4164cd7680b37e3672d8b6d7053e86373 (diff)
parente44cf9875724610a41579a7997451ee2fcb390a9 (diff)
downloadgdb-3b4e21d2318bc1b6547e45f3393514e7b0be7df2.tar.gz
Merge "Fix dwarf2_string_attr for -gsplit-dwarf"ndk-r17bndk-r17-beta2ndk-r17-beta1ndk-r17ndk-release-r17
-rw-r--r--gdb-8.0.1/gdb/dwarf2read.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb-8.0.1/gdb/dwarf2read.c b/gdb-8.0.1/gdb/dwarf2read.c
index 8503e6171..d10ce286f 100644
--- a/gdb-8.0.1/gdb/dwarf2read.c
+++ b/gdb-8.0.1/gdb/dwarf2read.c
@@ -17577,7 +17577,8 @@ dwarf2_string_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *c
if (attr != NULL)
{
if (attr->form == DW_FORM_strp || attr->form == DW_FORM_line_strp
- || attr->form == DW_FORM_string || attr->form == DW_FORM_GNU_strp_alt)
+ || attr->form == DW_FORM_string || DW_FORM_GNU_str_index
+ || attr->form == DW_FORM_GNU_strp_alt)
str = DW_STRING (attr);
else
complaint (&symfile_complaints,