Re: [PATCH] Sync libiberty/ & include/ with GCC

[Markus Trippelsdorf <markus@trippelsdorf.de>]

On 2017.09.16 at 20:47 +0200, Andreas Schwab wrote:
> On Sep 15 2017, Pedro Alves <palves@redhat.com> wrote:
> 
> > 	2017-09-12  Jiong Wang  <jiong.wang@arm.com>
> >
> > 	* 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

-- 
Markus