From: Djordje Todorovic <djordje.todorovic@rt-rk.com>
Date: Tue, 26 Sep 2017 13:20:04 +0000 (+0200)
Subject: dwarflint: Update code to work with current version of elfutils
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a60e309123060d0916015f94c327ef58bb3638e;p=thirdparty%2Felfutils.git

dwarflint: Update code to work with current version of elfutils

Signed-off-by: Djordje Todorovic <djordje.todorovic@rt-rk.com>
---

diff --git a/dwarflint/check_debug_line.cc b/dwarflint/check_debug_line.cc
index 34047e275..f3d64001f 100644
--- a/dwarflint/check_debug_line.cc
+++ b/dwarflint/check_debug_line.cc
@@ -513,9 +513,9 @@ check_debug_line::check_debug_line (checkstack &stack, dwarflint &lint)
 		    handled = false;
 		    switch (extended)
 		      {
-#define ONE_KNOWN_DW_LNE(NAME, CODE) case CODE: break;
-			ALL_KNOWN_DW_LNE
-#undef ONE_KNOWN_DW_LNE
+#define DWARF_ONE_KNOWN_DW_LNE(NAME, CODE) case CODE: break;
+			DWARF_ALL_KNOWN_DW_LNE
+#undef DWARF_ONE_KNOWN_DW_LNE
 		      default:
 			/* No we don't, emit a warning.  */
 			wr_message (op_where, mc_impact_2 | mc_line)
@@ -601,9 +601,9 @@ check_debug_line::check_debug_line (checkstack &stack, dwarflint &lint)
 
 	      switch (opcode)
 		{
-#define ONE_KNOWN_DW_LNS(NAME, CODE) case CODE: break;
-		  ALL_KNOWN_DW_LNS
-#undef ONE_KNOWN_DW_LNS
+#define DWARF_ONE_KNOWN_DW_LNS(NAME, CODE) case CODE: break;
+		  DWARF_ALL_KNOWN_DW_LNS
+#undef DWARF_ONE_KNOWN_DW_LNS
 
 		default:
 		  if (opcode < opcode_base)
diff --git a/dwarflint/check_debug_loc_range.cc b/dwarflint/check_debug_loc_range.cc
index 5f286226b..d51fa6cee 100644
--- a/dwarflint/check_debug_loc_range.cc
+++ b/dwarflint/check_debug_loc_range.cc
@@ -673,7 +673,7 @@ namespace
 	   the CU chain.  So just take the address size of the first CU in
 	   chain.  */
 	struct hole_info hi = {
-	  sec->id, cat, ctx.data->d_buf, cu_chain->head->address_size
+	  sec->id, cat, ctx.data->d_buf, (unsigned)cu_chain->head->address_size
 	};
 	coverage.find_holes (0, ctx.data->d_size, found_hole, &hi);
 
diff --git a/dwarflint/dwarflint.cc b/dwarflint/dwarflint.cc
index 8067bf41c..5e07e5b43 100644
--- a/dwarflint/dwarflint.cc
+++ b/dwarflint/dwarflint.cc
@@ -30,6 +30,7 @@
 #include <cstring>
 #include <cerrno>
 #include <stdexcept>
+#include <unistd.h>
 
 std::ostream &
 operator << (std::ostream &o, checkstack const &stack)
diff --git a/dwarflint/files.cc b/dwarflint/files.cc
index fb74a0e47..b912492f6 100644
--- a/dwarflint/files.cc
+++ b/dwarflint/files.cc
@@ -28,6 +28,7 @@
 #include <cstring>
 #include <cerrno>
 #include <stdexcept>
+#include <unistd.h>
 
 namespace
 {
diff --git a/dwarflint/locstats.cc b/dwarflint/locstats.cc
index 7602e7fda..8a7802b69 100644
--- a/dwarflint/locstats.cc
+++ b/dwarflint/locstats.cc
@@ -29,6 +29,7 @@
 
 #include <sstream>
 #include <bitset>
+#include <unistd.h>
 
 using elfutils::dwarf;
 
diff --git a/dwarflint/misc.hh b/dwarflint/misc.hh
index f779ed615..86d5836dc 100644
--- a/dwarflint/misc.hh
+++ b/dwarflint/misc.hh
@@ -23,7 +23,7 @@
 
 extern "C"
 {
-#include "../lib/system.h"
+#include "../lib/libeu.h"
 }
 
 #define REALLOC(A, BUF)					\
diff --git a/dwarflint/reloc.cc b/dwarflint/reloc.cc
index ec8232dd8..07686bc48 100644
--- a/dwarflint/reloc.cc
+++ b/dwarflint/reloc.cc
@@ -497,7 +497,7 @@ read_rel (struct elf_file *file,
 	  if (value != 0)
 	    wr_message (mc_impact_2 | mc_reloc, &where,
 			": SHR_RELA relocates a place with non-zero value (addend=%#"
-			PRIx64", value=%#"PRIx64").\n", rela->r_addend, value);
+			 PRIx64 ", value=%#" PRIx64 ").\n", rela->r_addend, value);
 	  cur->addend = rela->r_addend;
 	}
       else