[mc] Remove remaining bits of libdw outside of mc_libdw.{h,c}pp

diff --git a/src/mc/mc_dwarf_expression.cpp b/src/mc/mc_dwarf_expression.cpp
index 5f9e162..bf80037 100644 (file)
--- a/src/mc/mc_dwarf_expression.cpp
+++ b/src/mc/mc_dwarf_expression.cpp
@@ -4,11 +4,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <cstdint>
+
 #include <stdint.h>
 #include <stdarg.h>
 
 #include <dwarf.h>
-#include <elfutils/libdw.h>
 
 #include "mc_dwarf.hpp"
 #include "mc_private.h"
@@ -21,7 +22,7 @@ using simgrid::mc::remote;
 
 extern "C" {
 
-static int mc_dwarf_push_value(mc_expression_state_t state, Dwarf_Off value)
+static int mc_dwarf_push_value(mc_expression_state_t state, std::uint64_t value)
 {
   if (state->stack_size >= MC_EXPRESSION_STACK_SIZE)
     return MC_EXPRESSION_E_STACK_OVERFLOW;
@@ -233,7 +234,7 @@ int mc_dwarf_execute_expression(size_t n, const simgrid::mc::DwarfInstruction* o
         return MC_EXPRESSION_E_NO_BASE_ADDRESS;
       if (state->stack_size == MC_EXPRESSION_STACK_SIZE)
         return MC_EXPRESSION_E_STACK_OVERFLOW;
-      Dwarf_Off addr = (Dwarf_Off) (uintptr_t)
+      std::uint64_t addr = (std::uint64_t) (uintptr_t)
         state->object_info->base_address() + op->number;
       error = mc_dwarf_push_value(state, addr);
       break;

diff --git a/src/mc/mc_libdw.cpp b/src/mc/mc_libdw.cpp
index 1f04ca0..7c589bd 100644 (file)
--- a/src/mc/mc_libdw.cpp
+++ b/src/mc/mc_libdw.cpp
@@ -12,6 +12,7 @@
 #include <utility>
 
 #include <dwarf.h>
+#include <elfutils/libdw.h>
 
 #include <xbt/log.h>
 

diff --git a/src/mc/mc_location.h b/src/mc/mc_location.h
index 051a56f..0143f2d 100644 (file)
--- a/src/mc/mc_location.h
+++ b/src/mc/mc_location.h
@@ -13,7 +13,6 @@
 
 #include <libunwind.h>
 #include <dwarf.h>
-#include <elfutils/libdw.h>
 
 #include <simgrid_config.h>
 #include "mc_base.h"