X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf75523de37862d1f4eddaa1cbdd276f20755fea..9575359fcebd3a393b65891c293990d1a882eb34:/src/mc/mc_dwarf.cpp

diff --git a/src/mc/mc_dwarf.cpp b/src/mc/mc_dwarf.cpp
index 3d086788f7..89951e4db1 100644
--- a/src/mc/mc_dwarf.cpp
+++ b/src/mc/mc_dwarf.cpp
@@ -358,13 +358,13 @@ static bool MC_dwarf_attr_flag(Dwarf_Die * die, int attribute, bool integrate)
   return result;
 }
 
-/** \brief Find the default lower bound for a given language
+/** @brief Find the default lower bound for a given language
  *
  *  The default lower bound of an array (when DW_TAG_lower_bound
  *  is missing) depends on the language of the compilation unit.
  *
- *  \param lang Language of the compilation unit (values defined in the DWARF spec)
- *  \return     Default lower bound of an array in this compilation unit
+ *  @param lang Language of the compilation unit (values defined in the DWARF spec)
+ *  @return     Default lower bound of an array in this compilation unit
  * */
 static uint64_t MC_dwarf_default_lower_bound(int lang)
 {
@@ -874,7 +874,7 @@ static void MC_dwarf_handle_scope_die(simgrid::mc::ObjectInformation* info, Dwar
 
   if (klass == simgrid::dwarf::TagClass::Subprogram) {
     const char *name = MC_dwarf_attr_integrate_string(die, DW_AT_name);
-    if (ns)
+    if (name && ns)
       frame.name  = std::string(ns) + "::" + name;
     else if (name)
       frame.name = name;
@@ -1044,6 +1044,7 @@ void read_dwarf_info(simgrid::mc::ObjectInformation* info, Dwarf* dwarf)
 static
 std::vector<char> get_build_id(Elf* elf)
 {
+#ifdef __linux
   // Summary: the GNU build ID is stored in a ("GNU, NT_GNU_BUILD_ID) note
   // found in a PT_NOTE entry in the program header table.
 
@@ -1081,6 +1082,7 @@ std::vector<char> get_build_id(Elf* elf)
     }
 
   }
+#endif
   return std::vector<char>();
 }