From b33404388e5bbd8a1fddfde73cd4593ae2b557e8 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 9 Aug 2017 05:01:55 -0700 Subject: [PATCH] gdb: Fix build failure with GCC 7 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix: /export/gnu/import/git/sources/binutils-gdb/gdb/dwarf2read.c: In function ‘const char* dwarf2_string_attr(die_info*, unsigned int, dwarf2_cu*)’: /export/gnu/import/git/sources/binutils-gdb/gdb/dwarf2read.c:17626:39: error: enum constant in boolean context [-Werror=int-in-bool-context] || attr->form == DW_FORM_string || DW_FORM_GNU_str_index * dwarf2read.c (dwarf2_string_attr): Fix a typo. --- gdb/ChangeLog | 4 ++++ gdb/dwarf2read.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 209d0b6da6e..19d6c1bd2c8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-08-09 H.J. Lu + + * dwarf2read.c (dwarf2_string_attr): Fix a typo. + 2017-08-09 Alex Lindsay Yao Qi diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 2a527e897cd..4f2fdce8de1 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -17623,7 +17623,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 || DW_FORM_GNU_str_index + || attr->form == DW_FORM_string + || attr->form == DW_FORM_GNU_str_index || attr->form == DW_FORM_GNU_strp_alt) str = DW_STRING (attr); else -- 2.30.2