From patchwork Wed Aug 9 12:04:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 22007 Received: (qmail 110498 invoked by alias); 9 Aug 2017 12:04:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 110483 invoked by uid 89); 9 Aug 2017 12:04:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-pf0-f182.google.com Received: from mail-pf0-f182.google.com (HELO mail-pf0-f182.google.com) (209.85.192.182) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Aug 2017 12:04:55 +0000 Received: by mail-pf0-f182.google.com with SMTP id t86so27057120pfe.2 for ; Wed, 09 Aug 2017 05:04:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=IakPUmD0sN15A56001bOACqzecqQ8yjSQvmKWtp3yVE=; b=ro5xkwIXJy49rCacjJjBjYfpI2eNC7f2iSTKgFD9LJ5cWOO5mr7tK/J/Y0YwQ3kRCG PkkSZx5xH1JP03o48gJ/YE/a2CQpBWWZyhmQTmhoU8jOoPSYEvlBNmIdYOFza03ArMX1 B7Vnmcdz0/k3kdLf2g8cHFcSYHwVJ24yFT+/wTuXWKdmohxfIe47SZgXKHp8YEhuFAFO 5IsXmUz5TeN4rARVWRbMVK8tID/RQRVtopznM1skL7p6BTsFID5ugSPMILl6zQ7Lgv/k 8ezuZFiQzAnsHnHzxsMY/QOicv+S3jh/IPVXvQxWp9velxRPtZdQInpsIJhJWw7tutSc MCSQ== X-Gm-Message-State: AHYfb5jvIkut7UZjbLT0NV1fHaTQNGMl4OVFS03r1ZWH52EiLIfEyprj 065mdjfbeRLonuc1 X-Received: by 10.98.57.66 with SMTP id g63mr8095643pfa.5.1502280293522; Wed, 09 Aug 2017 05:04:53 -0700 (PDT) Received: from gnu-tools-1.localdomain (c-73-93-86-59.hsd1.ca.comcast.net. [73.93.86.59]) by smtp.gmail.com with ESMTPSA id p62sm6444470pfg.66.2017.08.09.05.04.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Aug 2017 05:04:52 -0700 (PDT) Received: by gnu-tools-1.localdomain (Postfix, from userid 1000) id 186EE1C038E; Wed, 9 Aug 2017 05:04:52 -0700 (PDT) Date: Wed, 9 Aug 2017 05:04:52 -0700 From: "H.J. Lu" To: GDB Subject: [committed, PATCH] gdb: Fix build failure with GCC 7 Message-ID: <20170809120452.GA10133@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) X-IsSubscribed: yes 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 209d0b6da6..19d6c1bd2c 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 2a527e897c..4f2fdce8de 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