This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [GOLD] Repair include/dwarf2.def breakage


On Mon, Jul 03, 2017 at 09:44:20PM +0930, Alan Modra wrote:
> Jan's libiberty patch broke gold.  Applying as obvious.
> 
> 	* dwarf.h (DW_FIRST_IDX, DW_IDX, DW_IDX_DUP, DW_END_IDX): Define.

Ugh, this was supposed to be merged into the last patch.

diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog
index 1ca1df1..fc864bf 100644
--- a/elfcpp/ChangeLog
+++ b/elfcpp/ChangeLog
@@ -1,6 +1,7 @@
 2017-07-03  Alan Modra  <amodra@gmail.com>
 
-	* dwarf.h (DW_FIRST_IDX, DW_IDX, DW_IDX_DUP, DW_END_IDX): Define.
+	* dwarf.h (DW_FIRST_IDX, DW_IDX, DW_IDX_DUP, DW_END_IDX): Define,
+	and undefine after using.
 
 2017-06-21  Alan Modra  <amodra@gmail.com>
 
diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index 85004a4..e5053c4 100644
--- a/elfcpp/dwarf.h
+++ b/elfcpp/dwarf.h
@@ -110,6 +110,11 @@ namespace elfcpp
 #undef DW_CFA
 #undef DW_END_CFA
 
+#undef DW_FIRST_IDX
+#undef DW_IDX
+#undef DW_IDX_DUP
+#undef DW_END_IDX
+
 // Frame unwind information.
 
 enum DW_EH_PE

-- 
Alan Modra
Australia Development Lab, IBM


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]