From: Alan Modra <amodra@gmail.com>
Date: Fri, 25 Sep 2020 00:30:01 +0000 (+0930)
Subject: Re: Sync libiberty and include with GCC for get_DW_UT_name
X-Git-Tag: binutils-2_35_2~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c33430a9e758aa3314483b96c358dba79dac9834;p=thirdparty%2Fbinutils-gdb.git

Re: Sync libiberty and include with GCC for get_DW_UT_name

	* dwarf.h (DW_FIRST_UT, DW_UT, DW_END_UT): Define.

(cherry picked from commit cc9ea2c21cd6e2c88995a7484d2c848c7d7ce71b)
---

diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog
index efb82c57703..fa1d20e5d9a 100644
--- a/elfcpp/ChangeLog
+++ b/elfcpp/ChangeLog
@@ -1,3 +1,10 @@
+2020-11-16  Mark Wielaard  <mark@klomp.org>
+
+	Backport from the mainline:
+	2020-09-25  Alan Modra  <amodra@gmail.com>
+
+	* dwarf.h (DW_FIRST_UT, DW_UT, DW_END_UT): Define.
+
 2020-07-04  Nick Clifton  <nickc@redhat.com>
 
 	Binutils 2.35 branch created.
diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index 1221f37f8a6..d5e06d4d7d3 100644
--- a/elfcpp/dwarf.h
+++ b/elfcpp/dwarf.h
@@ -81,6 +81,11 @@ namespace elfcpp
 #define DW_IDX_DUP(name, value) , name = value
 #define DW_END_IDX };
 
+#define DW_FIRST_UT(name, value) enum dwarf_unit_type { \
+  name = value
+#define DW_UT(name, value) , name = value
+#define DW_END_UT };
+
 #include "dwarf2.def"
 
 #undef DW_FIRST_TAG
@@ -117,6 +122,10 @@ namespace elfcpp
 #undef DW_IDX_DUP
 #undef DW_END_IDX
 
+#undef DW_FIRST_UT
+#undef DW_UT
+#undef DW_END_UT
+
 // Frame unwind information.
 
 enum DW_EH_PE