From patchwork Sun Sep 17 07:11:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Trippelsdorf X-Patchwork-Id: 22914 Received: (qmail 35753 invoked by alias); 17 Sep 2017 07:12:05 -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 35104 invoked by uid 89); 17 Sep 2017 07:12:04 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-22.1 required=5.0 tests=AWL, BAYES_50, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_MXURI, RCVD_IN_DNSWL_LOW, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=dwarf_reader.o, sk:dwarf_r, elfcpp, DTOOLBINDIR X-HELO: mail.ud10.udmedia.de Received: from ud10.udmedia.de (HELO mail.ud10.udmedia.de) (194.117.254.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 17 Sep 2017 07:12:01 +0000 Received: (qmail 9136 invoked from network); 17 Sep 2017 09:11:57 +0200 Received: from ip5b405f48.dynamic.kabel-deutschland.de (HELO x4) (ud10?360p3@91.64.95.72) by mail.ud10.udmedia.de with ESMTPSA (ECDHE-RSA-AES256-SHA encrypted, authenticated); 17 Sep 2017 09:11:57 +0200 Date: Sun, 17 Sep 2017 09:11:56 +0200 From: Markus Trippelsdorf To: Andreas Schwab Cc: Pedro Alves , binutils@sourceware.org, gdb-patches@sourceware.org Subject: Re: [PATCH] Sync libiberty/ & include/ with GCC Message-ID: <20170917071156.GA279@x4> References: <1505493997-31716-1-git-send-email-palves@redhat.com> <87a81u5vl6.fsf@linux-m68k.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87a81u5vl6.fsf@linux-m68k.org> On 2017.09.16 at 20:47 +0200, Andreas Schwab wrote: > On Sep 15 2017, Pedro Alves wrote: > > > 2017-09-12 Jiong Wang > > > > * dwarf2.def (DW_CFA_AARCH64_negate_ra_state): New DW_CFA_DUP. > > * dwarf2.h (DW_CFA_DUP): New define. > > That breaks gold: > > g++ -DHAVE_CONFIG_H -I. -I../../binutils/gold -I../../binutils/gold -I../../binutils/gold/../include -I../../binutils/gold/../elfcpp -DLOCALEDIR="\"/usr/share/locale\"" -DBINDIR="\"/usr/bin\"" -DTOOLBINDIR="\"/usr/x86_64-linux/bin\"" -DTOOLLIBDIR="\"/usr/x86_64-linux/lib\"" -W -Wall -Werror -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -frandom-seed=dwarf_reader.o -O2 -g -MT dwarf_reader.o -MD -MP -MF .deps/dwarf_reader.Tpo -c -o dwarf_reader.o ../../binutils/gold/dwarf_reader.cc > In file included from ../../binutils/gold/../elfcpp/dwarf.h:83:0, > from ../../binutils/gold/dwarf_reader.cc:30: > ../../binutils/gold/../include/dwarf2.def:781:1: error: expected ‘}’ before ‘DW_CFA_DUP’ > DW_CFA_DUP (DW_CFA_AARCH64_negate_ra_state, 0x2d) > ^ Yes, elfcpp/dwarf.h needs to be updated for DW_CFA_DUP: diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h index e5053c4444d3..9536f78edfbf 100644 --- a/elfcpp/dwarf.h +++ b/elfcpp/dwarf.h @@ -72,6 +72,7 @@ namespace elfcpp #define DW_FIRST_CFA(name, value) enum DW_CFA { \ name = value #define DW_CFA(name, value) , name = value +#define DW_CFA_DUP(name, value) , name = value #define DW_END_CFA }; #define DW_FIRST_IDX(name, value) enum dwarf_name_index_attribute { \ @@ -108,6 +109,7 @@ namespace elfcpp #undef DW_FIRST_CFA #undef DW_CFA +#undef DW_CFA_DUP #undef DW_END_CFA #undef DW_FIRST_IDX