This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] [PATCH] Sync libiberty/ & include/ with GCC - addendum: update elfcpp/dwarf.h with the new DW_CFA_DU
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 18 Sep 2017 08:23:50 -0000
- Subject: [binutils-gdb] [PATCH] Sync libiberty/ & include/ with GCC - addendum: update elfcpp/dwarf.h with the new DW_CFA_DU
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e4114cb89e65c53839d5beb80cec956476ecb5dc
commit e4114cb89e65c53839d5beb80cec956476ecb5dc
Author: Nick Clifton <nickc@redhat.com>
Date: Mon Sep 18 09:21:38 2017 +0100
[PATCH] Sync libiberty/ & include/ with GCC - addendum: update elfcpp/dwarf.h with the new DW_CFA_DUP macro.
From the original email:
Note this brings in the interface files for libcc1/G++ as well, which
we will be needing in GDB soon anyway. That commit renamed a method
in the C interface and that required a small update to GDB's compile/
code, which I've included that in this patch to keep the tree
building.
From the follow up email:
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)
Diff:
---
elfcpp/dwarf.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index e5053c4..47de57c 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 { \
@@ -107,6 +108,7 @@ namespace elfcpp
#undef DW_END_ATE
#undef DW_FIRST_CFA
+#undef DW_CFA_DUP
#undef DW_CFA
#undef DW_END_CFA