From: Dodji Seketeli <dodji@redhat.com>
Date: Thu, 22 Jun 2017 10:16:42 +0000 (+0200)
Subject: Bug 21627 - Libabigail doesn't consider translation unit compile dir
X-Git-Tag: upstream/1.0~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90919fceeb001c71ed7797138b5dffe5ec94be45;p=platform%2Fupstream%2Flibabigail.git

Bug 21627 - Libabigail doesn't consider translation unit compile dir

The path of a translation unit is relative to the directory where that
translation unit was compiled.

So there can be several different translation units (in the same
binary) that have the same (relative) paths.  To tell them apart, one
needs to consider the compile directory of those translation units.

But then Libabigail ignores the compilation directory of translation
units.  It just considers their (relative) path.  That leads to
different translation units having the same path.

Furthermore, there can be a translation unit with full path (one that
takes into account the file name and its compile directory) named "P"
that contains function definitions f1 and f2, as described by the
debug info.  Further down the road, there can be *another* translation
unit which also has "P" as its full path, and that cotnains function
definitions f3 and f4.  A way to understand is to consider that the
translation unit of full path "P" contains f1, f2, f3 and f4.

This patch introduces the concept of the compile dir of a given
translation unit, and the concept of the absolute path of the
translation unit which would then be a concatenation of the compile
dir and relative paths of the translation unit.

The patch also tries to reuse a translation unit with a given path,
*if* that translation unit has already been seen in the current
binary, instead of creating a new one altogether.

This patch doesn't carry a regression test as the problem was found
while running the
https://pagure.io/libabigail-selfcheck/blob/master/f/selfcheck.py
script over the Fedora 25 critpath packages.

The patch does however update existing reference outputs of existings
tests where appropriate.

	* include/abg-ir.h (translation_unit::{get_compilation_dir_path,
	set_compilation_dir_path, get_absolute_path}):
	* src/abg-corpus.cc (corpus::add): Use the new
	translation_unit::get_absolute_path() as the key for the tu path
	-> tu map.
	* src/abg-dwarf-reader.cc
	(read_context::resolve_declaration_only_classes):  Use the new
	translation_unit::get_absolute_path().
	(build_translation_unit_and_add_to_ir): Set the compilation
	directory of the translation unit.
	* src/abg-ir-priv.h (translation_unit::priv::{comp_dir_path_,
	abs_path_}):
	* src/abg-ir.cc (translation_unit::set_path): Update comment.
	(translation_unit::{get_compilation_dir_path,
	set_compilation_dir_path, get_absolute_path}): Define new member
	functions.
	* src/abg-reader.cc (read_translation_unit): Take the new
	'comp-dir-path' attribute into account.
	* src/abg-writer.cc (write_translation_unit): Emit the new
	'comp-dir-path' attribute.
	* tests/data/test-annotate/libtest23.so.abi: Adjust.
	* tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Adjust.
	* tests/data/test-annotate/libtest24-drop-fns.so.abi: Adjust.
	* tests/data/test-annotate/test0.abi: Adjust.
	* tests/data/test-annotate/test1.abi: Adjust.
	* tests/data/test-annotate/test13-pr18894.so.abi: Adjust.
	* tests/data/test-annotate/test14-pr18893.so.abi: Adjust.
	* tests/data/test-annotate/test15-pr18892.so.abi: Adjust.
	* tests/data/test-annotate/test17-pr19027.so.abi: Adjust.
	* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: Adjust.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi: Adjust.
	* tests/data/test-annotate/test2.so.abi: Adjust.
	* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi: Adjust.
	* tests/data/test-annotate/test21-pr19092.so.abi: Adjust.
	* tests/data/test-annotate/test3.so.abi: Adjust.
	* tests/data/test-annotate/test4.so.abi: Adjust.
	* tests/data/test-annotate/test5.o.abi: Adjust.
	* tests/data/test-annotate/test6.so.abi: Adjust.
	* tests/data/test-annotate/test7.so.abi: Adjust.
	* tests/data/test-annotate/test8-qualified-this-pointer.so.abi: Adjust.
	* tests/data/test-read-dwarf/libtest23.so.abi: Adjust.
	* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi: Adjust.
	* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Adjust.
	* tests/data/test-read-dwarf/test0.abi: Adjust.
	* tests/data/test-read-dwarf/test1.abi: Adjust.
	* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Adjust.
	* tests/data/test-read-dwarf/test11-pr18828.so.abi: Adjust.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Adjust.
	* tests/data/test-read-dwarf/test13-pr18894.so.abi: Adjust.
	* tests/data/test-read-dwarf/test14-pr18893.so.abi: Adjust.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Adjust.
	* tests/data/test-read-dwarf/test16-pr18904.so.abi: Adjust.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Adjust.
	* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: Adjust.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi: Adjust.
	* tests/data/test-read-dwarf/test2.so.abi: Adjust.
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi: Adjust.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Adjust.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi: Adjust.
	* tests/data/test-read-dwarf/test3.so.abi: Adjust.
	* tests/data/test-read-dwarf/test4.so.abi: Adjust.
	* tests/data/test-read-dwarf/test5.o.abi: Adjust.
	* tests/data/test-read-dwarf/test6.so.abi: Adjust.
	* tests/data/test-read-dwarf/test7.so.abi: Adjust.
	* tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi: Adjust.
	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Adjust.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---

diff --git a/include/abg-ir.h b/include/abg-ir.h
index 540a7cd3..fd7e6fff 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -493,6 +493,15 @@ public:
   void
   set_path(const string&);
 
+  const std::string&
+  get_compilation_dir_path() const;
+
+  void
+  set_compilation_dir_path(const std::string&);
+
+  const std::string&
+  get_absolute_path() const;
+
   void
   set_corpus(corpus*);
 
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index 18587c72..bb7cfe6a 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -539,13 +539,13 @@ corpus::add(const translation_unit_sptr tu)
   assert(tu->get_environment() == get_environment());
 
   priv_->members.push_back(tu);
-  if (!tu->get_path().empty())
+  if (!tu->get_absolute_path().empty())
     {
       // Update the path -> translation_unit map.
       string_tu_map_type::const_iterator i =
-	priv_->path_tu_map.find(tu->get_path());
+	priv_->path_tu_map.find(tu->get_absolute_path());
       assert(i == priv_->path_tu_map.end());
-      priv_->path_tu_map[tu->get_path()] = tu;
+      priv_->path_tu_map[tu->get_absolute_path()] = tu;
     }
 
   tu->set_corpus(this);
diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index a9524796..d9d7634f 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -4946,7 +4946,7 @@ public:
 	    if (klass->get_is_declaration_only())
 	      continue;
 
-	    string tu_path = klass->get_translation_unit()->get_path();
+	    string tu_path = klass->get_translation_unit()->get_absolute_path();
 	    if (tu_path.empty())
 	      continue;
 
@@ -4969,7 +4969,8 @@ public:
 		if ((*j)->get_is_declaration_only()
 		    && ((*j)->get_definition_of_declaration() == 0))
 		  {
-		    string tu_path = (*j)->get_translation_unit()->get_path();
+		    string tu_path =
+		      (*j)->get_translation_unit()->get_absolute_path();
 		    unordered_map<string, class_decl_sptr>::const_iterator e =
 		      per_tu_class_map.find(tu_path);
 		    if (e != per_tu_class_map.end())
@@ -12079,13 +12080,31 @@ build_translation_unit_and_add_to_ir(read_context&	ctxt,
   ctxt.cur_tu_die(die);
 
   string path = die_string_attribute(die, DW_AT_name);
-  result.reset(new translation_unit(ctxt.env(),
-				    path,
-				    address_size));
+  string compilation_dir = die_string_attribute(die, DW_AT_comp_dir);
 
-  uint64_t l = 0;
-  die_unsigned_constant_attribute(die, DW_AT_language, l);
-  result->set_language(dwarf_language_to_tu_language(l));
+  // See if the same translation unit exits already in the current
+  // corpus.  Sometimes, the same translation unit can be present
+  // several times in the same debug info.  The content of the
+  // different instances of the translation unit are different.  So to
+  // represent that, we are going to re-use the same translation
+  // unit.  That is, it's going to be the union of all the translation
+  // units of the same path.
+  {
+    string abs_path = compilation_dir + "/" + path;
+    result = ctxt.current_corpus()->find_translation_unit(abs_path);
+  }
+
+  if (!result)
+    {
+      result.reset(new translation_unit(ctxt.env(),
+					path,
+					address_size));
+      result->set_compilation_dir_path(compilation_dir);
+      ctxt.current_corpus()->add(result);
+      uint64_t l = 0;
+      die_unsigned_constant_attribute(die, DW_AT_language, l);
+      result->set_language(dwarf_language_to_tu_language(l));
+    }
 
   ctxt.current_corpus()->add(result);
   ctxt.cur_transl_unit(result);
@@ -12095,6 +12114,8 @@ build_translation_unit_and_add_to_ir(read_context&	ctxt,
   if (dwarf_child(die, &child) != 0)
     return result;
 
+  result->set_is_constructed(false);
+
   do
     build_ir_node_from_die(ctxt, &child,
 			   die_is_public_decl(&child),
diff --git a/src/abg-ir-priv.h b/src/abg-ir-priv.h
index 85395491..4c2baf21 100644
--- a/src/abg-ir-priv.h
+++ b/src/abg-ir-priv.h
@@ -141,6 +141,8 @@ struct translation_unit::priv
   char						address_size_;
   language					language_;
   std::string					path_;
+  std::string					comp_dir_path_;
+  std::string					abs_path_;
   location_manager				loc_mgr_;
   mutable global_scope_sptr			global_scope_;
   mutable vector<type_base_sptr>		synthesized_types_;
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 362e1f78..1ed72f1a 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -703,8 +703,15 @@ void
 translation_unit::set_language(language l)
 {priv_->language_ = l;}
 
-/// @return the path of the compilation unit associated to the current
-/// instance of translation_unit.
+
+/// Get the path of the current translation unit.
+///
+/// This path is relative to the build directory of the translation
+/// unit as returned by translation_unit::get_compilation_dir_path.
+///
+/// @return the relative path of the compilation unit associated to
+/// the current instance of translation_unit.
+//
 const std::string&
 translation_unit::get_path() const
 {return priv_->path_;}
@@ -712,11 +719,63 @@ translation_unit::get_path() const
 /// Set the path associated to the current instance of
 /// translation_unit.
 ///
-/// @param a_path the new path to set.
+/// This path is relative to the build directory of the translation
+/// unit as returned by translation_unit::get_compilation_dir_path.
+///
+/// @param a_path the new relative path to set.
 void
 translation_unit::set_path(const string& a_path)
 {priv_->path_ = a_path;}
 
+
+/// Get the path of the directory that was 'current' when the
+/// translation unit was compiled.
+///
+/// Note that the path returned by translation_unit::get_path is
+/// relative to the path returned by this function.
+///
+/// @return the compilation directory for the current translation
+/// unit.
+const std::string&
+translation_unit::get_compilation_dir_path() const
+{return priv_->comp_dir_path_;}
+
+/// Set the path of the directory that was 'current' when the
+/// translation unit was compiled.
+///
+/// Note that the path returned by translation_unit::get_path is
+/// relative to the path returned by this function.
+///
+/// @param the compilation directory for the current translation unit.
+void
+translation_unit::set_compilation_dir_path(const std::string& d)
+{priv_->comp_dir_path_ = d;}
+
+/// Get the concatenation of the build directory and the relative path
+/// of the translation unit.
+///
+/// @return the absolute path of the translation unit.
+const std::string&
+translation_unit::get_absolute_path() const
+{
+  if (priv_->abs_path_.empty())
+    {
+      string path;
+      if (!priv_->path_.empty())
+	{
+	  if (!priv_->comp_dir_path_.empty())
+	    {
+	      path = priv_->comp_dir_path_;
+	      path += "/";
+	    }
+	  path += priv_->path_;
+	}
+      priv_->abs_path_ = path;
+    }
+
+  return priv_->abs_path_;
+}
+
 /// Set the corpus this translation unit is a member of.
 ///
 /// Note that adding a translation unit to a @ref corpus automatically
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index cb6ab52a..09d866f2 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1387,6 +1387,12 @@ read_translation_unit(read_context& ctxt, translation_unit& tu, xmlNodePtr node)
   if (path_str)
     tu.set_path(reinterpret_cast<char*>(path_str.get()));
 
+  xml::xml_char_sptr comp_dir_path_str =
+    XML_NODE_GET_ATTRIBUTE(node, "comp-dir-path");
+  if (comp_dir_path_str)
+    tu.set_compilation_dir_path(reinterpret_cast<char*>
+				(comp_dir_path_str.get()));
+
   xml::xml_char_sptr language_str = XML_NODE_GET_ATTRIBUTE(node, "language");
   if (language_str)
     tu.set_language(string_to_translation_unit_language
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 4e82e50d..7ecd211e 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -1713,6 +1713,10 @@ write_translation_unit(const translation_unit&	tu,
   if (!tu.get_path().empty())
     o << " path='" << xml::escape_xml_string(tu.get_path()) << "'";
 
+  if (!tu.get_compilation_dir_path().empty())
+    o << " comp-dir-path='"
+      << xml::escape_xml_string(tu.get_compilation_dir_path()) << "'";
+
   if (tu.get_language() != translation_unit::LANG_UNKNOWN)
     o << " language='"
       << translation_unit_language_to_string(tu.get_language())
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 4e34d01d..ca7196be 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -15,7 +15,7 @@
     <!-- _init -->
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -2883,7 +2883,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
index 3143c6fa..0dde19d3 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -17,7 +17,7 @@
     <!-- _init -->
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index 3143c6fa..0dde19d3 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -17,7 +17,7 @@
     <!-- _init -->
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi
index 9a2571ab..f7939b5e 100644
--- a/tests/data/test-annotate/test0.abi
+++ b/tests/data/test-annotate/test0.abi
@@ -35,7 +35,7 @@
     <!-- global -->
     <elf-symbol name='global' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='test0.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- namespace ns0 -->
     <namespace-decl name='ns0'>
       <!-- void ns0::bar(int, ...) -->
diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi
index c4129f73..2cfbca9f 100644
--- a/tests/data/test-annotate/test1.abi
+++ b/tests/data/test-annotate/test1.abi
@@ -59,7 +59,7 @@
     <!-- _ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3 -->
     <elf-symbol name='_ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='test1.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- struct b0 -->
     <class-decl name='b0' size-in-bits='128' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='1' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 98bdd781..4620ff02 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -474,7 +474,7 @@
     <!-- dbus_watch_set_data -->
     <elf-symbol name='dbus_watch_set_data' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='dbus-address.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-address.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <!-- const char -->
@@ -664,7 +664,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-bus.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-bus.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusConnection -->
     <class-decl name='DBusConnection' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-25'/>
     <!-- typedef DBusConnection DBusConnection -->
@@ -822,7 +822,7 @@
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-connection.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-connection.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- void dbus_connection_set_change_sigpipe(dbus_bool_t) -->
     <function-decl name='dbus_connection_set_change_sigpipe' mangled-name='dbus_connection_set_change_sigpipe' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6043' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_set_change_sigpipe'>
       <!-- parameter of type 'typedef dbus_bool_t' -->
@@ -2046,7 +2046,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-errors.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-errors.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- const DBusError -->
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-138'/>
     <!-- const DBusError* -->
@@ -2114,7 +2114,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-message.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-message.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- dbus_bool_t dbus_message_contains_unix_fds(DBusMessage*) -->
     <function-decl name='dbus_message_contains_unix_fds' mangled-name='dbus_message_contains_unix_fds' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_contains_unix_fds'>
       <!-- parameter of type 'DBusMessage*' -->
@@ -2848,7 +2848,7 @@
       <return type-id='type-id-11'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-misc.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-misc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- void dbus_get_version(int*, int*, int*) -->
     <function-decl name='dbus_get_version' mangled-name='dbus_get_version' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_get_version'>
       <!-- parameter of type 'int*' -->
@@ -2866,7 +2866,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-pending-call.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-pending-call.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusPendingCall -->
     <class-decl name='DBusPendingCall' size-in-bits='576' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='63' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3015,7 +3015,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-server.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-server.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusServer -->
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-150'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3299,7 +3299,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-uuidgen.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-uuidgen.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- dbus_bool_t dbus_internal_do_not_use_create_uuid(char**) -->
     <function-decl name='dbus_internal_do_not_use_create_uuid' mangled-name='dbus_internal_do_not_use_create_uuid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_create_uuid'>
       <!-- parameter of type 'char**' -->
@@ -3321,7 +3321,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-signature.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-signature.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct __anonymous_struct__ -->
     <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-167' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h' line='45' column='1' id='type-id-168'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3446,7 +3446,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-syntax.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-syntax.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- dbus_bool_t dbus_validate_utf8(const char*, DBusError*) -->
     <function-decl name='dbus_validate_utf8' mangled-name='dbus_validate_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_validate_utf8'>
       <!-- parameter of type 'const char*' -->
@@ -3502,7 +3502,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-timeout.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-timeout.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusTimeout -->
     <class-decl name='DBusTimeout' size-in-bits='448' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='41' column='1' id='type-id-111'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3589,7 +3589,7 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-threads.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-threads.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct __anonymous_struct__ -->
     <class-decl name='__anonymous_struct__' size-in-bits='1216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-175' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='153' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3794,7 +3794,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-watch.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-watch.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- struct DBusWatch -->
     <class-decl name='DBusWatch' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='41' column='1' id='type-id-121'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -3916,7 +3916,7 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-memory.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-memory.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- void dbus_free(void*) -->
     <function-decl name='dbus_free' mangled-name='dbus_free' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='701' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_free'>
       <!-- parameter of type 'void*' -->
@@ -3962,7 +3962,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-sysdeps.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-sysdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <!-- dbus_bool_t dbus_setenv(const char*, const char*) -->
     <function-decl name='dbus_setenv' mangled-name='dbus_setenv' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_setenv'>
       <!-- parameter of type 'const char*' -->
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index 7647b9e2..5079763e 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -126,7 +126,7 @@
     <!-- gluUnProject4 -->
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='libutil/error.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- unsigned char -->
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <!-- typedef unsigned char GLubyte -->
@@ -147,7 +147,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-7'/>
     <!-- typedef int GLint -->
@@ -314,7 +314,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/project.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- double -->
     <type-decl name='double' size-in-bits='64' id='type-id-12'/>
     <!-- typedef double GLdouble -->
@@ -475,7 +475,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/quad.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- struct GLUquadric -->
     <class-decl name='GLUquadric' size-in-bits='192' is-struct='yes' visibility='default' filepath='libutil/quad.c' line='45' column='1' id='type-id-21'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -647,7 +647,7 @@
       <return type-id='type-id-10'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/registry.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- const GLubyte* gluGetString(GLenum) -->
     <function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
       <!-- parameter of type 'typedef GLenum' -->
@@ -665,7 +665,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libtess/tess.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <!-- struct GLUtesselator -->
     <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1465,7 +1465,7 @@
       <return type-id='type-id-10'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class CachingEvaluator -->
     <class-decl name='CachingEvaluator' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-117'>
       <member-type access='private'>
@@ -2303,7 +2303,7 @@
       <return type-id='type-id-10'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- struct OpenGLSurfaceEvaluator -->
     <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-139'>
     <!-- struct BasicSurfaceEvaluator -->
@@ -13688,9 +13688,9 @@
       <subrange length='2'/>
     </array-type-def>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- typedef bezierPatch bezierPatch -->
     <typedef-decl name='bezierPatch' type-id='type-id-248' filepath='libnurbs/interface/bezierPatch.h' line='65' column='1' id='type-id-358'/>
     <!-- typedef bezierPatchMesh bezierPatchMesh -->
@@ -13698,11 +13698,11 @@
     <!-- struct SurfaceMap -->
     <class-decl name='SurfaceMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-160'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- struct BezierArc -->
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class ArcSorter -->
     <class-decl name='ArcSorter' size-in-bits='192' visibility='default' filepath='libnurbs/internals/arcsorter.h' line='44' column='1' id='type-id-360'>
     <!-- class Sorter -->
@@ -13848,29 +13848,29 @@
     <!-- ArcTdirSorter* -->
     <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-368'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/cachingeval.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/coveandtiler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/displaylist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/knotvector.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/knotvector.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/maplist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class vertexArray -->
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-369'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -14206,17 +14206,17 @@
     <!-- reflexChain* -->
     <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-374'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monotonizer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monotonizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/nurbsinterfac.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/slicer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- struct Knotspec -->
     <class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-375'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -14602,7 +14602,7 @@
     <!-- typedef Quilt* Quilt_ptr -->
     <typedef-decl name='Quilt_ptr' type-id='type-id-216' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-382'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class Varray -->
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-383'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -14711,7 +14711,7 @@
     <!-- long int* -->
     <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-387'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class sampledLine -->
     <class-decl name='sampledLine' size-in-bits='192' visibility='default' filepath='libnurbs/nurbtess/sampledLine.h' line='38' column='1' id='type-id-388'>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -15460,7 +15460,7 @@
     <!-- sampledLine** -->
     <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-396'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoChain.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoChain.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <!-- class monoChain -->
     <class-decl name='monoChain' size-in-bits='640' visibility='default' filepath='libnurbs/nurbtess/monoChain.h' line='41' column='1' id='type-id-397'>
       <data-member access='private' layout-offset-in-bits='0'>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index beefe242..7cf6f395 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -3035,7 +3035,7 @@
     <!-- __asan_cplus_demangle_operators -->
     <elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- typedef unsigned long int __sanitizer::uptr -->
@@ -3512,7 +3512,7 @@
     <!-- const __tsan::SyncClock* -->
     <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-23'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void __sanitizer::CheckFailed(const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) -->
@@ -10063,7 +10063,7 @@
       <subrange length='16'/>
     </array-type-def>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- enum __sanitizer::memory_order -->
@@ -10243,7 +10243,7 @@
     <!-- const __tsan::Backoff* -->
     <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-312'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_report.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_report.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- int __sanitizer::internal_snprintf(char*, __sanitizer::uptr, const char*, ...) -->
@@ -11876,7 +11876,7 @@
     <!-- __tsan::Decorator* -->
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-377'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void __sanitizer::FlushUnneededShadowMemory(__sanitizer::uptr, __sanitizer::uptr) -->
@@ -13098,7 +13098,7 @@
     <!-- const __sanitizer::GenericScopedLock<__sanitizer::ThreadRegistry>& -->
     <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-395'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void* __sanitizer::internal_memset(void*, int, __sanitizer::uptr) -->
@@ -13733,7 +13733,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::CommonFlags* __sanitizer::common_flags() -->
@@ -13822,7 +13822,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- typedef unsigned short int __sanitizer::u16 -->
@@ -14011,7 +14011,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- unsigned long int __sanitizer::Min<long unsigned int>(unsigned long int, unsigned long int) -->
@@ -14700,7 +14700,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void __sanitizer::atomic_store<__sanitizer::atomic_uint8_t>(volatile __sanitizer::atomic_uint8_t*, __sanitizer::atomic_uint8_t::Type, __sanitizer::memory_order) -->
@@ -15502,11 +15502,11 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::atomic_uint64_t::Type __sanitizer::atomic_fetch_add<__sanitizer::atomic_uint64_t>(volatile __sanitizer::atomic_uint64_t*, __sanitizer::atomic_uint64_t::Type, __sanitizer::memory_order) -->
@@ -15807,11 +15807,11 @@
     <!-- const __sanitizer::GenericScopedReadLock<__tsan::Mutex>& -->
     <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-541'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- int __sanitizer::ToLower(int) -->
@@ -32282,7 +32282,7 @@
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*> -->
     <qualified-type-def type-id='type-id-575' const='yes' id='type-id-1431'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_md5.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_md5.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
@@ -32378,7 +32378,7 @@
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-1437'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
@@ -32459,7 +32459,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- const char* __sanitizer::GetPwd() -->
@@ -32547,7 +32547,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- int __sanitizer::internal_strcmp(const char*, const char*) -->
@@ -33291,7 +33291,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::MostSignificantSetBitIndex(__sanitizer::uptr) -->
@@ -34600,7 +34600,7 @@
     <!-- const __sanitizer::GenericScopedLock<__sanitizer::BlockingMutex>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1479'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::RoundUpToPowerOfTwo(__sanitizer::uptr) -->
@@ -34904,7 +34904,7 @@
     <!-- const __sanitizer::InternalScopedBuffer<__tsan::MutexSet>& -->
     <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1496'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::atomic_uint64_t::Type __sanitizer::atomic_fetch_sub<__sanitizer::atomic_uint64_t>(volatile __sanitizer::atomic_uint64_t*, __sanitizer::atomic_uint64_t::Type, __sanitizer::memory_order) -->
@@ -34921,7 +34921,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
     <!-- namespace __tsan -->
     <namespace-decl name='__tsan'>
@@ -35116,11 +35116,11 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize_addr2line_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize_addr2line_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::internal_dup2(int, int) -->
@@ -35318,7 +35318,7 @@
       <return type-id='type-id-13'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- typedef void (typedef __sanitizer::uptr, typedef __sanitizer::uptr)* __sanitizer::LowLevelAllocateCallback -->
@@ -35398,7 +35398,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void __sanitizer::ReportErrorSummary(const char*) -->
@@ -35900,7 +35900,7 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- bool __sanitizer::PrintsToTty() -->
@@ -35922,7 +35922,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::InternalMmapVector<long unsigned int> -->
@@ -36295,7 +36295,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::internal_strcspn(const char*, const char*) -->
@@ -36309,7 +36309,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- bool __sanitizer::IsSpace(int) -->
@@ -36439,10 +36439,10 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::internal_open(const char*, int, __sanitizer::u32) -->
@@ -37265,7 +37265,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::Unwind_GetIP(_Unwind_Context*) -->
@@ -37487,14 +37487,14 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- unsigned int __sanitizer::struct_statfs64_sz -->
       <var-decl name='struct_statfs64_sz' type-id='type-id-22' mangled-name='_ZN11__sanitizer18struct_statfs64_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' line='63' column='1'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- unsigned int __sanitizer::struct_utsname_sz -->
@@ -38571,7 +38571,7 @@
       <var-decl name='sigset_t_sz' type-id='type-id-22' mangled-name='_ZN11__sanitizer11sigset_t_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='138' column='1'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::u32 __sanitizer::GetUid() -->
@@ -38688,7 +38688,7 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::uptr __sanitizer::GetMmapGranularity() -->
@@ -38744,7 +38744,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- int __sanitizer::VSNPrintf(char*, int, const char*, typedef __va_list_tag __va_list_tag*) -->
@@ -38787,7 +38787,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- __sanitizer::atomic_uint32_t::Type __sanitizer::atomic_fetch_add<__sanitizer::atomic_uint32_t>(volatile __sanitizer::atomic_uint32_t*, __sanitizer::atomic_uint32_t::Type, __sanitizer::memory_order) -->
@@ -39166,13 +39166,13 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void __sanitizer::TracerThreadSignalHandler(int, void*, void*) -->
@@ -39390,7 +39390,7 @@
     <!-- __sanitizer::StopTheWorldScope* -->
     <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- bool __sanitizer::TemplateMatch(char*, const char*) -->
@@ -39413,7 +39413,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- void __sanitizer::__sanitizer_symbolize_flush() -->
@@ -39929,10 +39929,10 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
     <!-- void (const char*, typedef size_t, void*)* -->
     <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-1668'/>
@@ -40065,13 +40065,13 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
 
 
     <!-- void* dlvsym(void*, const char*, const char*) -->
@@ -40086,10 +40086,10 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- struct backtrace_state -->
     <class-decl name='backtrace_state' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='127' column='1' id='type-id-1670'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -40363,7 +40363,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- int __asan_backtrace_open(const char*, backtrace_error_callback, void*, int*) -->
     <function-decl name='__asan_backtrace_open' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
@@ -40393,7 +40393,7 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- int __asan_backtrace_close(int, backtrace_error_callback, void*) -->
     <function-decl name='__asan_backtrace_close' mangled-name='__asan_backtrace_close' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_close'>
       <!-- parameter of type 'int' -->
@@ -40433,11 +40433,11 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/sort.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/sort.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- struct demangle_component -->
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='453' column='1' id='type-id-1696'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -41078,12 +41078,12 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- typedef long int __off_t -->
     <typedef-decl name='__off_t' type-id='type-id-277' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-1730'/>
     <!-- typedef __off_t off_t -->
@@ -41169,7 +41169,7 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <!-- struct backtrace_freelist_struct -->
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='55' column='1' id='type-id-1689'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index dac85c40..350078f9 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -518,7 +518,7 @@
     <!-- hb_version_string -->
     <elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='hb-blob.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- struct hb_reference_count_t -->
     <class-decl name='hb_reference_count_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='53' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -1276,7 +1276,7 @@
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- const char** -->
     <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-59'/>
     <!-- const char** hb_buffer_serialize_list_formats() -->
@@ -3977,7 +3977,7 @@
     <!-- const hb_feature_t -->
     <qualified-type-def type-id='type-id-218' const='yes' id='type-id-223'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-buffer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- struct hb_utf_t<unsigned int, true> -->
     <class-decl name='hb_utf_t&lt;unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-224'>
       <member-function access='public' static='yes'>
@@ -4480,7 +4480,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-common.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- struct hb_language_item_t -->
     <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-236'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -4644,7 +4644,7 @@
       <return type-id='type-id-123'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-face.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::BEInt<unsigned int, 4> -->
@@ -32830,7 +32830,7 @@
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-font.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <!-- hb_font_funcs_t* hb_font_funcs_get_empty() -->
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
@@ -33457,7 +33457,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_language_t hb_ot_tag_to_language(hb_tag_t) -->
     <function-decl name='hb_ot_tag_to_language' mangled-name='hb_ot_tag_to_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_language'>
       <!-- parameter of type 'typedef hb_tag_t' -->
@@ -33491,7 +33491,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-set.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_set_t* hb_set_get_empty() -->
     <function-decl name='hb_set_get_empty' mangled-name='hb_set_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_empty'>
       <!-- hb_set_t* -->
@@ -33713,7 +33713,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-shape.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- const char* const -->
     <qualified-type-def type-id='type-id-47' const='yes' id='type-id-1682'/>
     <!-- const char* const* -->
@@ -33774,7 +33774,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-shape-plan.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_shape_plan_t* hb_shape_plan_get_empty() -->
     <function-decl name='hb_shape_plan_get_empty' mangled-name='hb_shape_plan_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_empty'>
       <!-- hb_shape_plan_t* -->
@@ -33871,7 +33871,7 @@
       <return type-id='type-id-169'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_unicode_funcs_t* hb_unicode_funcs_get_empty() -->
     <function-decl name='hb_unicode_funcs_get_empty' mangled-name='hb_unicode_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_empty'>
       <!-- hb_unicode_funcs_t* -->
@@ -34135,7 +34135,7 @@
       <return type-id='type-id-63'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::Supplier<OT::CmapSubtableLongGroup> -->
@@ -34444,7 +34444,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- namespace OT -->
     <namespace-decl name='OT'>
       <!-- struct OT::GSUB -->
@@ -37155,10 +37155,10 @@
     <!-- const hb_prealloced_array_t<hb_ot_map_builder_t::stage_info_t, 8u> -->
     <qualified-type-def type-id='type-id-1829' const='yes' id='type-id-1844'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
@@ -37187,19 +37187,19 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <!-- struct indic_shape_plan_t -->
     <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1845'>
@@ -37395,28 +37395,28 @@
     <!-- const indic_shape_plan_t* -->
     <pointer-type-def type-id='type-id-1860' size-in-bits='64' id='type-id-1849'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-glib.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- hb_unicode_funcs_t* hb_glib_get_unicode_funcs() -->
     <function-decl name='hb_glib_get_unicode_funcs' mangled-name='hb_glib_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_get_unicode_funcs'>
       <!-- hb_unicode_funcs_t* -->
@@ -37568,7 +37568,7 @@
       <return type-id='type-id-100'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ft.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- struct FT_FaceRec_ -->
     <class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-1862'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 38817bd4..39fe76cb 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -866,7 +866,7 @@
     <!-- vtkSurfaceLICPainter_SC -->
     <elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -8345,7 +8345,7 @@
     <!-- const vtkWeakPointer<vtkImageDataLIC2D> -->
     <qualified-type-def type-id='type-id-262' const='yes' id='type-id-302'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -8399,7 +8399,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -14567,12 +14567,12 @@
     <!-- float* const -->
     <qualified-type-def type-id='type-id-85' const='yes' id='type-id-447'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
@@ -15207,7 +15207,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -16603,7 +16603,7 @@
     <!-- const vtkSurfaceLICComposite& -->
     <reference-type-def kind='lvalue' type-id='type-id-487' size-in-bits='64' id='type-id-485'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
@@ -21166,7 +21166,7 @@
     <!-- const vtkSmartPointer<vtkOpenGLLightMonitor> -->
     <qualified-type-def type-id='type-id-598' const='yes' id='type-id-627'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -23148,7 +23148,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 58e5afda..60bc83e9 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1576,7 +1576,7 @@
     <!-- sys_alloc -->
     <elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -11713,7 +11713,7 @@
     <!-- const HeapProfileStats -->
     <qualified-type-def type-id='type-id-395' const='yes' id='type-id-399'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-7' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-400'/>
@@ -11758,7 +11758,7 @@
       <return type-id='type-id-7'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -32965,7 +32965,7 @@
     <!-- const __gnu_cxx::new_allocator<std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > > -->
     <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1127'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -33002,7 +33002,7 @@
     <!-- bool heap_leak_checker_bcad_variable -->
     <var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-30' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/profiler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -33783,7 +33783,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
     <!-- namespace std -->
     <namespace-decl name='std'>
@@ -35383,14 +35383,14 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/common.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- uint64_t tcmalloc::metadata_system_bytes() -->
@@ -35408,7 +35408,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- class tcmalloc::Logger -->
@@ -35497,7 +35497,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -35743,7 +35743,7 @@
     <!-- size_t TCMalloc_SystemTaken -->
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-28' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -35858,7 +35858,7 @@
     <!-- HugetlbSysAllocator* -->
     <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1271'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -35917,7 +35917,7 @@
     <!-- const tcmalloc::Span* -->
     <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1275'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -35952,7 +35952,7 @@
       <var-decl name='FLAGS_notcmalloc_heap_limit_mb' type-id='type-id-74' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead30FLAGS_notcmalloc_heap_limit_mbE' visibility='default' filepath='src/page_heap.cc' line='60' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead30FLAGS_notcmalloc_heap_limit_mbE'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/sampler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
     <!-- namespace std -->
@@ -35978,7 +35978,7 @@
       <var-decl name='FLAGS_notcmalloc_sample_parameter' type-id='type-id-74' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead33FLAGS_notcmalloc_sample_parameterE' visibility='default' filepath='src/sampler.cc' line='55' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead33FLAGS_notcmalloc_sample_parameterE'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/span.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- void tcmalloc::DeleteSpan(tcmalloc::Span*) -->
@@ -36033,7 +36033,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- class tcmalloc::StackTraceTable -->
@@ -36165,7 +36165,7 @@
     <!-- const tcmalloc::StackTraceTable* -->
     <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-1279'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -36173,7 +36173,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -38306,7 +38306,7 @@
     <!-- SymbolTable* -->
     <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1357'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/thread_cache.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/thread_cache.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace tcmalloc -->
     <namespace-decl name='tcmalloc'>
       <!-- void tcmalloc::SLL_PopRange(void**, int, void**, void**) -->
@@ -38351,7 +38351,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -39172,7 +39172,7 @@
       <return type-id='type-id-7'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/malloc_extension.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/malloc_extension.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -39294,7 +39294,7 @@
       <return type-id='type-id-7'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -39305,7 +39305,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-profile-table.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-profile-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -40277,7 +40277,7 @@
       <return type-id='type-id-30'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-profiler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -40365,7 +40365,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- class base::RawPrinter -->
@@ -40462,7 +40462,7 @@
     <!-- const base::RawPrinter& -->
     <reference-type-def kind='lvalue' type-id='type-id-1408' size-in-bits='64' id='type-id-1407'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -40597,7 +40597,7 @@
     <!-- const std::_Identity<MemoryRegionMap::Region>* -->
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1411'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -40605,7 +40605,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
     <!-- int RunningOnValgrind() -->
     <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='src/base/dynamic_annotations.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
       <!-- int -->
@@ -40617,7 +40617,7 @@
       <return type-id='type-id-97'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace base -->
     <namespace-decl name='base'>
 
@@ -41192,7 +41192,7 @@
     <!-- base::ElfMemImage::SymbolInfo* -->
     <pointer-type-def type-id='type-id-1417' size-in-bits='64' id='type-id-1436'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -41231,7 +41231,7 @@
       <return type-id='type-id-819'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace base -->
     <namespace-decl name='base'>
 
@@ -41262,7 +41262,7 @@
       </member-function>
     </class-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- namespace base::internal -->
@@ -41331,7 +41331,7 @@
     <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-1461'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -41392,7 +41392,7 @@
       <return type-id='type-id-7'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -41687,7 +41687,7 @@
     </function-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <!-- namespace base -->
     <namespace-decl name='base'>
       <!-- namespace base::subtle -->
@@ -41853,7 +41853,7 @@
     <!-- const base::VDSOSupport& -->
     <reference-type-def kind='lvalue' type-id='type-id-1485' size-in-bits='64' id='type-id-1484'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-annotate/test2.so.abi b/tests/data/test-annotate/test2.so.abi
index 8072a8ef..1f7c9431 100644
--- a/tests/data/test-annotate/test2.so.abi
+++ b/tests/data/test-annotate/test2.so.abi
@@ -23,7 +23,7 @@
     <!-- _init -->
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test2-0.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- struct first_type -->
     <class-decl name='first_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='4' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -74,7 +74,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='test2-1.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- struct second_type -->
     <class-decl name='second_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='12' column='1' id='type-id-8'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 7f965900..3ab267a9 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -752,7 +752,7 @@
     <!-- vtable for vtkCommunicator::Operation -->
     <elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -15820,7 +15820,7 @@
     <!-- const __gnu_cxx::new_allocator<unsigned char*> -->
     <qualified-type-def type-id='type-id-502' const='yes' id='type-id-512'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -15995,7 +15995,7 @@
     <!-- const vtkDummyCommunicator& -->
     <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-516'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -28007,7 +28007,7 @@
     <!-- const __gnu_cxx::new_allocator<vtksys::_Hashtable_node<std::pair<const int, void*> >*> -->
     <qualified-type-def type-id='type-id-822' const='yes' id='type-id-859'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -35221,7 +35221,7 @@
     <!-- int* const -->
     <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1069'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -36052,13 +36052,13 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -36112,7 +36112,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -42254,7 +42254,7 @@
       </member-function>
     </class-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -42541,7 +42541,7 @@
     <!-- const vtkSocketController& -->
     <reference-type-def kind='lvalue' type-id='type-id-1296' size-in-bits='64' id='type-id-1295'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -42740,7 +42740,7 @@
     <!-- const vtkSubCommunicator& -->
     <reference-type-def kind='lvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1300'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <!-- namespace std -->
     <namespace-decl name='std'>
 
@@ -43568,7 +43568,7 @@
     <!-- const vtkSubGroup& -->
     <reference-type-def kind='lvalue' type-id='type-id-1309' size-in-bits='64' id='type-id-1308'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index b637acb1..901057ca 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -889,7 +889,7 @@
     <!-- vflag -->
     <elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- void -->
     <type-decl name='void' id='type-id-1'/>
@@ -2890,7 +2890,7 @@
       </data-member>
     </class-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- const char* strchr(const char*, int) -->
     <function-decl name='strchr' mangled-name='strchr' filepath='/usr/include/string.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2911,7 +2911,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-26' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
@@ -3244,7 +3244,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- void* vec_gc_p_reserve(void*, int) -->
     <function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
@@ -3423,7 +3423,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- enum gt_types_enum -->
     <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-185'>
@@ -4141,7 +4141,7 @@
     <!-- alloc_zone tree_id_zone -->
     <var-decl name='tree_id_zone' type-id='type-id-186' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/diagnostic.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- void default_diagnostic_finalizer(diagnostic_context*, diagnostic_info*) -->
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
@@ -4684,7 +4684,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/pretty-print.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- void pp_base_set_line_maximum_length(pretty_printer*, int) -->
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
@@ -4878,7 +4878,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/intl.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- size_t gcc_gettext_width(const char*) -->
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
@@ -4985,7 +4985,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/input.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <!-- void dump_line_table_statistics() -->
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
@@ -5066,7 +5066,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <!-- char[6] -->
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='48' id='type-id-214'>
       <subrange length='6'/>
@@ -5092,7 +5092,7 @@
     <!-- char[31] const bug_report_url -->
     <var-decl name='bug_report_url' type-id='type-id-219' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/line-map.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/line-map.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void linemap_init(line_maps*) -->
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
@@ -5298,7 +5298,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- struct cpp_reader -->
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-222'>
       <member-type access='public'>
@@ -7503,7 +7503,7 @@
     <!-- typedef unsigned long int cpp_num_part -->
     <typedef-decl name='cpp_num_part' type-id='type-id-4' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-361'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void _cpp_overlay_buffer(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -7614,7 +7614,7 @@
       <return type-id='type-id-35'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/directives.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void cpp_undef_all(cpp_reader*) -->
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -8022,7 +8022,7 @@
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/errors.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/errors.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- bool cpp_warning_syshdr(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -8045,7 +8045,7 @@
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/expr.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- unsigned int cpp_interpret_float_suffix(const char*, size_t) -->
     <function-decl name='cpp_interpret_float_suffix' mangled-name='_Z26cpp_interpret_float_suffixPKcm' filepath='../.././libcpp/expr.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26cpp_interpret_float_suffixPKcm'>
       <!-- parameter of type 'const char*' -->
@@ -8167,7 +8167,7 @@
       <return type-id='type-id-374'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- bool _cpp_find_failed(_cpp_file*) -->
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
       <!-- parameter of type '_cpp_file*' -->
@@ -8602,7 +8602,7 @@
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/identifiers.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void _cpp_destroy_hashtable(cpp_reader*) -->
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -8671,7 +8671,7 @@
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- int cpp_ideq(const cpp_token*, const char*) -->
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
       <!-- parameter of type 'const cpp_token*' -->
@@ -8862,7 +8862,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/mkdeps.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void deps_free(deps*) -->
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
       <!-- parameter of type 'deps*' -->
@@ -8944,7 +8944,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/symtab.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/symtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void ht_purge(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
@@ -8986,7 +8986,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void cpp_init_iconv(cpp_reader*) -->
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -9078,7 +9078,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/init.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <!-- void cpp_set_lang(cpp_reader*, c_lang) -->
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
       <!-- parameter of type 'cpp_reader*' -->
@@ -9163,7 +9163,7 @@
     <!-- unsigned char _cpp_trigraph_map[256] -->
     <var-decl name='_cpp_trigraph_map' type-id='type-id-401' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void set_cplus_marker_for_demangling(int) -->
     <function-decl name='set_cplus_marker_for_demangling' mangled-name='set_cplus_marker_for_demangling' filepath='../.././libiberty/cplus-dem.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_cplus_marker_for_demangling'>
       <!-- parameter of type 'int' -->
@@ -9368,7 +9368,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- struct demangle_component -->
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-408'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -9951,7 +9951,7 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- struct md5_ctx -->
     <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-446'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -10065,7 +10065,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/argv.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/argv.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void freeargv(char**) -->
     <function-decl name='freeargv' mangled-name='freeargv' filepath='../.././libiberty/argv.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='freeargv'>
       <!-- parameter of type 'char**' -->
@@ -10165,7 +10165,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/concat.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/concat.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- char* concat_copy(char*, const char*, ...) -->
     <function-decl name='concat_copy' mangled-name='concat_copy' filepath='../.././libiberty/concat.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='concat_copy'>
       <!-- parameter of type 'char*' -->
@@ -10189,9 +10189,9 @@
     <!-- char* libiberty_concat_ptr -->
     <var-decl name='libiberty_concat_ptr' type-id='type-id-9' mangled-name='libiberty_concat_ptr' visibility='default' filepath='../.././libiberty/concat.c' line='134' column='1' elf-symbol-id='libiberty_concat_ptr'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/filename_cmp.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/filename_cmp.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/fopen_unlocked.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/fopen_unlocked.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void unlock_stream(FILE*) -->
     <function-decl name='unlock_stream' mangled-name='unlock_stream' filepath='../.././libiberty/fopen_unlocked.c' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_stream'>
       <!-- parameter of type 'FILE*' -->
@@ -10240,7 +10240,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/getpwd.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/getpwd.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- char* getcwd(char*, size_t) -->
     <function-decl name='getcwd' filepath='/usr/include/unistd.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'char*' -->
@@ -10251,7 +10251,7 @@
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- size_t htab_size(htab_t) -->
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
       <!-- parameter of type 'typedef htab_t' -->
@@ -10421,7 +10421,7 @@
     <!-- htab_eq htab_eq_pointer -->
     <var-decl name='htab_eq_pointer' type-id='type-id-166' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void hex_init() -->
     <function-decl name='hex_init' mangled-name='hex_init' filepath='../.././libiberty/hex.c' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hex_init'>
       <!-- void -->
@@ -10432,7 +10432,7 @@
     <!-- unsigned char[256] const _hex_value -->
     <var-decl name='_hex_value' type-id='type-id-454' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const char* unix_lbasename(const char*) -->
     <function-decl name='unix_lbasename' mangled-name='unix_lbasename' filepath='../.././libiberty/lbasename.c' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unix_lbasename'>
       <!-- parameter of type 'const char*' -->
@@ -10448,7 +10448,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/make-temp-file.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/make-temp-file.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- char* choose_tmpdir() -->
     <function-decl name='choose_tmpdir' mangled-name='choose_tmpdir' filepath='../.././libiberty/make-temp-file.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='choose_tmpdir'>
       <!-- char* -->
@@ -10464,7 +10464,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-common.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-common.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- struct pex_obj -->
     <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='54' column='1' id='type-id-23'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -10798,7 +10798,7 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const pex_funcs funcs -->
     <var-decl name='funcs' type-id='type-id-476' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <!-- int fcntl(int, int, ...) -->
@@ -11047,7 +11047,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- unsigned short int[256] -->
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='4096' id='type-id-487'>
       <subrange length='256'/>
@@ -11061,7 +11061,7 @@
     <!-- unsigned char[256] const _sch_tolower -->
     <var-decl name='_sch_tolower' type-id='type-id-454' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- int __lxstat(int, const char*, stat*) -->
     <function-decl name='__lxstat' filepath='/usr/include/sys/stat.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -11074,11 +11074,11 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xexit.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xexit.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void ()* _xexit_cleanup -->
     <var-decl name='_xexit_cleanup' type-id='type-id-60' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmalloc.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void xmalloc_failed(size_t) -->
     <function-decl name='xmalloc_failed' mangled-name='xmalloc_failed' filepath='../.././libiberty/xmalloc.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xmalloc_failed'>
       <!-- parameter of type 'typedef size_t' -->
@@ -11107,10 +11107,10 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmemdup.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmemdup.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrdup.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrdup.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrerror.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrerror.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-annotate/test3.so.abi b/tests/data/test-annotate/test3.so.abi
index ae55a67c..cbcb456d 100644
--- a/tests/data/test-annotate/test3.so.abi
+++ b/tests/data/test-annotate/test3.so.abi
@@ -16,7 +16,7 @@
     <!-- foo__ -->
     <elf-symbol name='foo__' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test3.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
     <!-- void -->
     <type-decl name='void' id='type-id-1'/>
     <!-- void __foo() -->
diff --git a/tests/data/test-annotate/test4.so.abi b/tests/data/test-annotate/test4.so.abi
index f9207381..435c281d 100644
--- a/tests/data/test-annotate/test4.so.abi
+++ b/tests/data/test-annotate/test4.so.abi
@@ -6,7 +6,7 @@
     <!-- cpy -->
     <elf-symbol name='cpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test4.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
     <!-- char -->
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <!-- char* -->
diff --git a/tests/data/test-annotate/test5.o.abi b/tests/data/test-annotate/test5.o.abi
index 04786d53..d042f206 100644
--- a/tests/data/test-annotate/test5.o.abi
+++ b/tests/data/test-annotate/test5.o.abi
@@ -3,7 +3,7 @@
     <!-- bar(void*) -->
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
     <!-- void -->
     <type-decl name='void' id='type-id-1'/>
     <!-- void* -->
diff --git a/tests/data/test-annotate/test6.so.abi b/tests/data/test-annotate/test6.so.abi
index 0a6dc70f..ead56013 100644
--- a/tests/data/test-annotate/test6.so.abi
+++ b/tests/data/test-annotate/test6.so.abi
@@ -23,7 +23,7 @@
     <!-- B::foo()::a -->
     <elf-symbol name='_ZZN1B3fooEvE1a' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='test6.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- struct B -->
     <class-decl name='B' size-in-bits='8' is-struct='yes' visibility='default' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test6.cc' line='9' column='1' id='type-id-1'>
       <member-function access='public'>
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 9a4cae82..c06281d8 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -3,7 +3,7 @@
     <!-- foo(S&) -->
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test7.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
     <!-- struct S -->
diff --git a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
index 2a962bb4..53b9aae6 100644
--- a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
@@ -13,7 +13,7 @@
     <!-- _init -->
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <!-- struct S -->
     <class-decl name='S' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf/test8-qualified-this-pointer.cc' line='1' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index 77c37454..754577a2 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -11,7 +11,7 @@
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test23-first-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <typedef-decl name='string' type-id='type-id-1' filepath='/usr/include/c++/4.8.2/bits/stringfwd.h' line='62' column='1' id='type-id-2'/>
@@ -1783,7 +1783,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test23-second-tu.cc' comp-dir-path='/home/dodji/git/libabigail/PR20369/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
index 69174caa..d324459e 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
@@ -11,7 +11,7 @@
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/5.3.1/bits/basic_string.h' line='2510' column='1' id='type-id-1'>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
index 3a9752e7..41410916 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -11,7 +11,7 @@
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test24-drop-fns.cc' comp-dir-path='/home/dodji/git/libabigail.git/suppr/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='char_traits&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/5.3.1/bits/char_traits.h' line='233' column='1' id='type-id-1'>
diff --git a/tests/data/test-read-dwarf/test0.abi b/tests/data/test-read-dwarf/test0.abi
index 865c5c90..a4ad017d 100644
--- a/tests/data/test-read-dwarf/test0.abi
+++ b/tests/data/test-read-dwarf/test0.abi
@@ -22,7 +22,7 @@
     <elf-symbol name='_IO_stdin_used' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='global' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='test0.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <namespace-decl name='ns0'>
       <function-decl name='bar' mangled-name='_ZN3ns03barEiz' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test0.cc' line='12' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN3ns03barEiz'>
         <parameter type-id='type-id-1'/>
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index d4c977f7..bd9e26ff 100644
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -34,7 +34,7 @@
     <elf-symbol name='_ZTVN10__cxxabiv117__class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZTVN10__cxxabiv121__vmi_class_type_infoE@@CXXABI_1.3' size='88' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='test1.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <class-decl name='b0' size-in-bits='128' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='1' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='m0' type-id='type-id-2' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test1.cc' line='3' column='1'/>
diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index 3755e14d..dc818b9d 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -410,7 +410,7 @@
     <elf-symbol name='_ZTVN5boost6system12system_errorE' size='40' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -3862,7 +3862,7 @@
       <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-229'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -9349,7 +9349,7 @@
     </array-type-def>
     <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-321'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -9603,7 +9603,7 @@
     <qualified-type-def type-id='type-id-572' const='yes' id='type-id-588'/>
     <reference-type-def kind='lvalue' type-id='type-id-588' size-in-bits='64' id='type-id-577'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -9813,7 +9813,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-607' size-in-bits='64' id='type-id-610'/>
     <pointer-type-def type-id='type-id-615' size-in-bits='64' id='type-id-611'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -9869,7 +9869,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
 
     <namespace-decl name='boost'>
@@ -9908,7 +9908,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -10171,7 +10171,7 @@
     <qualified-type-def type-id='type-id-621' const='yes' id='type-id-619'/>
     <qualified-type-def type-id='type-id-622' const='yes' id='type-id-620'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 8639c24f..22b3a5d8 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -633,7 +633,7 @@
     <elf-symbol name='_ZTVN5mongo23ExportedServerParameterIiEE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZTVN5mongo36ExportedScramIterationCountParameterE' size='80' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='src/mongo/db/auth/sasl_options.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/mongo/db/auth/sasl_options.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index fa2b3998..c9dfef8d 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1719,7 +1719,7 @@
     <elf-symbol name='_ZTVSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE' size='56' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZZN5mongo7BSONObjC1EvE21kEmptyObjectPrototype' size='5' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/replication_executor.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/replication_executor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <namespace-decl name='_V2'>
@@ -39187,7 +39187,7 @@
       </class-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -39208,7 +39208,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/scatter_gather_runner.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/mongo/db/repl/scatter_gather_runner.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index c69d6b2e..7763a8a2 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -240,7 +240,7 @@
     <elf-symbol name='dbus_watch_handle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='dbus_watch_set_data' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='dbus-address.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-address.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-2'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-3'/>
@@ -362,7 +362,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-bus.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-bus.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='DBusConnection' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-25'/>
     <typedef-decl name='DBusConnection' type-id='type-id-25' filepath='../dbus/dbus-connection.h' line='51' column='1' id='type-id-26'/>
     <pointer-type-def type-id='type-id-26' size-in-bits='64' id='type-id-27'/>
@@ -451,7 +451,7 @@
       <return type-id='type-id-27'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-connection.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-connection.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_connection_set_change_sigpipe' mangled-name='dbus_connection_set_change_sigpipe' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6043' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_set_change_sigpipe'>
       <parameter type-id='type-id-22' name='will_modify_sigpipe' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='6043' column='1'/>
       <return type-id='type-id-11'/>
@@ -1185,7 +1185,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-errors.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-errors.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-138'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
     <function-decl name='dbus_error_is_set' mangled-name='dbus_error_is_set' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-errors.c' line='329' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_error_is_set'>
@@ -1224,7 +1224,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-message.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-message.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_message_contains_unix_fds' mangled-name='dbus_message_contains_unix_fds' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_contains_unix_fds'>
       <parameter type-id='type-id-37' name='message' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3825' column='1'/>
       <return type-id='type-id-22'/>
@@ -1649,7 +1649,7 @@
       <return type-id='type-id-11'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-misc.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-misc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_get_version' mangled-name='dbus_get_version' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_get_version'>
       <parameter type-id='type-id-24' name='major_version_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='161' column='1'/>
       <parameter type-id='type-id-24' name='minor_version_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-misc.c' line='162' column='1'/>
@@ -1660,7 +1660,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-pending-call.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-pending-call.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='DBusPendingCall' size-in-bits='576' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='63' column='1' id='type-id-134'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='64' column='1'/>
@@ -1752,7 +1752,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-server.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-server.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='DBusServer' size-in-bits='1216' is-struct='yes' visibility='default' filepath='../dbus/dbus-server-protected.h' line='57' column='1' id='type-id-150'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-33' visibility='default' filepath='../dbus/dbus-server-protected.h' line='58' column='1'/>
@@ -1928,7 +1928,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-uuidgen.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-uuidgen.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_internal_do_not_use_create_uuid' mangled-name='dbus_internal_do_not_use_create_uuid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_create_uuid'>
       <parameter type-id='type-id-88' name='uuid_p' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='122' column='1'/>
       <return type-id='type-id-22'/>
@@ -1941,7 +1941,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-signature.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-signature.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-167' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h' line='45' column='1' id='type-id-168'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dummy1' type-id='type-id-8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-signature.h' line='46' column='1'/>
@@ -2016,7 +2016,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-syntax.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-syntax.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_validate_utf8' mangled-name='dbus_validate_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_validate_utf8'>
       <parameter type-id='type-id-3' name='alleged_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='289' column='1'/>
       <parameter type-id='type-id-19' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-syntax.c' line='290' column='1'/>
@@ -2048,7 +2048,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-timeout.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-timeout.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='DBusTimeout' size-in-bits='448' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='41' column='1' id='type-id-111'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-9' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='42' column='1'/>
@@ -2104,7 +2104,7 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-threads.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-threads.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='__anonymous_struct__' size-in-bits='1216' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-175' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='153' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mask' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-threads.h' line='154' column='1'/>
@@ -2232,7 +2232,7 @@
       <return type-id='type-id-11'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-watch.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-watch.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <class-decl name='DBusWatch' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='41' column='1' id='type-id-121'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='refcount' type-id='type-id-9' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='42' column='1'/>
@@ -2309,7 +2309,7 @@
       <return type-id='type-id-22'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-memory.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-memory.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_free' mangled-name='dbus_free' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='701' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_free'>
       <parameter type-id='type-id-8' name='memory' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='701' column='1'/>
       <return type-id='type-id-11'/>
@@ -2336,7 +2336,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='dbus-sysdeps.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='dbus-sysdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_setenv' mangled-name='dbus_setenv' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_setenv'>
       <parameter type-id='type-id-3' name='varname' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='114' column='1'/>
       <parameter type-id='type-id-3' name='value' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-sysdeps.c' line='115' column='1'/>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 9896ee6d..64830cd4 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -67,7 +67,7 @@
     <elf-symbol name='gluUnProject' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='gluUnProject4' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='libutil/error.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/error.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-1'/>
     <typedef-decl name='GLubyte' type-id='type-id-1' filepath='../../../include/GL/gl.h' line='156' column='1' id='type-id-2'/>
     <qualified-type-def type-id='type-id-2' const='yes' id='type-id-3'/>
@@ -79,7 +79,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/mipmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <type-decl name='int' size-in-bits='32' id='type-id-7'/>
     <typedef-decl name='GLint' type-id='type-id-7' filepath='../../../include/GL/gl.h' line='155' column='1' id='type-id-8'/>
     <typedef-decl name='GLsizei' type-id='type-id-7' filepath='../../../include/GL/gl.h' line='159' column='1' id='type-id-9'/>
@@ -167,7 +167,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/project.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/project.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <type-decl name='double' size-in-bits='64' id='type-id-12'/>
     <typedef-decl name='GLdouble' type-id='type-id-12' filepath='../../../include/GL/gl.h' line='162' column='1' id='type-id-13'/>
     <qualified-type-def type-id='type-id-13' const='yes' id='type-id-14'/>
@@ -252,7 +252,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/quad.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/quad.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <class-decl name='GLUquadric' size-in-bits='192' is-struct='yes' visibility='default' filepath='libutil/quad.c' line='45' column='1' id='type-id-21'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='normals' type-id='type-id-8' visibility='default' filepath='libutil/quad.c' line='46' column='1'/>
@@ -351,7 +351,7 @@
       <return type-id='type-id-10'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libutil/registry.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libutil/registry.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <function-decl name='gluGetString' mangled-name='gluGetString' filepath='libutil/registry.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='gluGetString'>
       <parameter type-id='type-id-6' name='name' filepath='libutil/registry.c' line='44' column='1'/>
       <return type-id='type-id-4'/>
@@ -362,7 +362,7 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libtess/tess.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libtess/tess.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C99'>
     <class-decl name='GLUtesselator' size-in-bits='29376' is-struct='yes' visibility='default' filepath='libtess/tess.h' line='59' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='state' type-id='type-id-31' visibility='default' filepath='libtess/tess.h' line='63' column='1'/>
@@ -887,7 +887,7 @@
       <return type-id='type-id-10'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glcurveval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='CachingEvaluator' visibility='default' filepath='libnurbs/internals/cachingeval.h' line='39' column='1' is-declaration-only='yes' id='type-id-117'>
       <member-type access='private'>
         <enum-decl name='ServiceMode' filepath='libnurbs/internals/cachingeval.h' line='42' column='1' id='type-id-118'>
@@ -1425,7 +1425,7 @@
       <return type-id='type-id-10'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glinterface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='OpenGLSurfaceEvaluator' size-in-bits='1074048' is-struct='yes' visibility='default' filepath='libnurbs/interface/glsurfeval.h' line='100' column='1' id='type-id-139'>
       <base-class access='public' layout-offset-in-bits='0' type-id='type-id-140'/>
       <data-member access='private' layout-offset-in-bits='64'>
@@ -8719,17 +8719,17 @@
       <subrange length='2'/>
     </array-type-def>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glrenderer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/interface/glsurfeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <typedef-decl name='bezierPatch' type-id='type-id-248' filepath='libnurbs/interface/bezierPatch.h' line='65' column='1' id='type-id-358'/>
     <typedef-decl name='bezierPatchMesh' type-id='type-id-161' filepath='libnurbs/interface/bezierPatchMesh.h' line='66' column='1' id='type-id-359'/>
     <class-decl name='SurfaceMap' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-160'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='BezierArc' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/arcsorter.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='ArcSorter' size-in-bits='192' visibility='default' filepath='libnurbs/internals/arcsorter.h' line='44' column='1' id='type-id-360'>
       <base-class access='private' layout-offset-in-bits='0' type-id='type-id-285'/>
       <data-member access='protected' layout-offset-in-bits='128'>
@@ -8819,29 +8819,29 @@
     </class-decl>
     <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-368'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/backend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/cachingeval.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/cachingeval.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/coveandtiler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/coveandtiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curve.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/curvelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/displaylist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/displaylist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/flist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/hull.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/knotvector.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/knotvector.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/maplist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/maplist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/mesher.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monoTriangulationBackend.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='vertexArray' size-in-bits='128' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='77' column='1' id='type-id-369'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='array' type-id='type-id-370' visibility='default' filepath='libnurbs/nurbtess/monoTriangulation.h' line='78' column='1'/>
@@ -9054,17 +9054,17 @@
     </class-decl>
     <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-374'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monotonizer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/monotonizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/nurbsinterfac.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/nurbsinterfac.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/patchlist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/slicer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/slicer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/tobezier.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='Knotspec' size-in-bits='1152' is-struct='yes' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='54' column='1' id='type-id-375'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='order' type-id='type-id-55' visibility='default' filepath='libnurbs/internals/tobezier.cc' line='55' column='1'/>
@@ -9322,7 +9322,7 @@
     <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
     <typedef-decl name='Quilt_ptr' type-id='type-id-216' filepath='libnurbs/internals/quilt.h' line='90' column='1' id='type-id-382'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/internals/varray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='Varray' size-in-bits='96192' visibility='default' filepath='libnurbs/internals/varray.h' line='43' column='1' id='type-id-383'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='varray' type-id='type-id-123' visibility='default' filepath='libnurbs/internals/varray.h' line='48' column='1'/>
@@ -9394,7 +9394,7 @@
     <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-386'/>
     <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-387'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/directedLine.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='sampledLine' size-in-bits='192' visibility='default' filepath='libnurbs/nurbtess/sampledLine.h' line='38' column='1' id='type-id-388'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='npoints' type-id='type-id-325' visibility='default' filepath='libnurbs/nurbtess/sampledLine.h' line='39' column='1'/>
@@ -9878,7 +9878,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-395'/>
     <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-396'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoChain.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='libnurbs/nurbtess/monoChain.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-T0fsxk/Mesa-8.0.5/src/glu/sgi' language='LANG_C_plus_plus'>
     <class-decl name='monoChain' size-in-bits='640' visibility='default' filepath='libnurbs/nurbtess/monoChain.h' line='41' column='1' id='type-id-397'>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='chainHead' type-id='type-id-392' visibility='default' filepath='libnurbs/nurbtess/monoChain.h' line='42' column='1'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 5e71b82c..b76a0b28 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1524,7 +1524,7 @@
     <elf-symbol name='__asan_cplus_demangle_builtin_types' size='1056' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='__asan_cplus_demangle_operators' size='1488' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_clock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <typedef-decl name='uptr' type-id='type-id-1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='56' column='1' id='type-id-2'/>
       <function-decl name='internal_memcpy' mangled-name='_ZN11__sanitizer15internal_memcpyEPvPKvm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1832,7 +1832,7 @@
     <qualified-type-def type-id='type-id-25' const='yes' id='type-id-29'/>
     <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-23'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_atomic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='CheckFailed' mangled-name='_ZN11__sanitizer11CheckFailedEPKciS1_yy' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__sanitizer11CheckFailedEPKciS1_yy'>
         <parameter type-id='type-id-30'/>
@@ -6212,7 +6212,7 @@
       <subrange length='16'/>
     </array-type-def>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <enum-decl name='memory_order' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='19' column='1' id='type-id-304'>
         <underlying-type type-id='type-id-8'/>
@@ -6322,7 +6322,7 @@
     <qualified-type-def type-id='type-id-310' const='yes' id='type-id-313'/>
     <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-312'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_report.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_report.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_snprintf' mangled-name='_ZN11__sanitizer17internal_snprintfEPcmPKcz' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-145'/>
@@ -7385,7 +7385,7 @@
     <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-316'/>
     <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-377'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='FlushUnneededShadowMemory' mangled-name='_ZN11__sanitizer25FlushUnneededShadowMemoryEmm' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
@@ -8150,7 +8150,7 @@
     <qualified-type-def type-id='type-id-393' const='yes' id='type-id-433'/>
     <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-395'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_memset' mangled-name='_ZN11__sanitizer15internal_memsetEPvim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='33' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-3'/>
@@ -8556,7 +8556,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='common_flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_flags.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-457'/>
@@ -8607,7 +8607,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <typedef-decl name='u16' type-id='type-id-460' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='67' column='1' id='type-id-461'/>
     </namespace-decl>
@@ -8712,7 +8712,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_platform_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='Min&lt;long unsigned int&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1'/>
@@ -9144,7 +9144,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='atomic_store&lt;__sanitizer::atomic_uint8_t&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-506'/>
@@ -9610,11 +9610,11 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_stat.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_sync.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='atomic_fetch_add&lt;__sanitizer::atomic_uint64_t&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-509'/>
@@ -9802,11 +9802,11 @@
     <qualified-type-def type-id='type-id-539' const='yes' id='type-id-548'/>
     <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-541'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_ignoreset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interceptors.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='ToLower' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-13'/>
@@ -18933,7 +18933,7 @@
     <qualified-type-def type-id='type-id-224' const='yes' id='type-id-1430'/>
     <qualified-type-def type-id='type-id-575' const='yes' id='type-id-1431'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_md5.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_md5.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__tsan'>
       <class-decl name='__anonymous_struct__' size-in-bits='1216' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_md5.cc' line='33' column='1' id='type-id-1432'>
@@ -18995,7 +18995,7 @@
     <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-1435'/>
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-1437'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__tsan'>
       <function-decl name='ReleaseStoreImpl' filepath='../../.././libsanitizer/tsan/tsan_rtl_mutex.cc' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19041,7 +19041,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='GetPwd' mangled-name='_ZN11__sanitizer6GetPwdEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-30'/>
@@ -19092,7 +19092,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_ann.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_strcmp' mangled-name='_ZN11__sanitizer15internal_strcmpEPKcS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-30' name='s1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='126' column='1'/>
@@ -19531,7 +19531,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mman.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='MostSignificantSetBitIndex' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
@@ -20373,7 +20373,7 @@
     <qualified-type-def type-id='type-id-1477' const='yes' id='type-id-1488'/>
     <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1479'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_rtl_report.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='RoundUpToPowerOfTwo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-2'/>
@@ -20559,7 +20559,7 @@
     <qualified-type-def type-id='type-id-1493' const='yes' id='type-id-1499'/>
     <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1496'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_fd.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='atomic_fetch_sub&lt;__sanitizer::atomic_uint64_t&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-509'/>
@@ -20570,7 +20570,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_interface_java.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__tsan'>
       <class-decl name='ScopedJavaFunc' size-in-bits='64' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_interface_java.cc' line='74' column='1' id='type-id-1500'>
@@ -20691,11 +20691,11 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_mutexset.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize_addr2line_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/tsan/tsan_symbolize_addr2line_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_dup2' mangled-name='_ZN11__sanitizer13internal_dup2Eii' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-13'/>
@@ -20819,7 +20819,7 @@
       <return type-id='type-id-13'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <typedef-decl name='LowLevelAllocateCallback' type-id='type-id-1525' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='116' column='1' id='type-id-1526'/>
       <function-decl name='SetLowLevelAllocateCallback' mangled-name='_ZN11__sanitizer27SetLowLevelAllocateCallbackEPFvmmE' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_allocator.cc' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20867,7 +20867,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='ReportErrorSummary' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-30'/>
@@ -21176,7 +21176,7 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='PrintsToTty' mangled-name='_ZN11__sanitizer11PrintsToTtyEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_libcdep.cc' line='16' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-59'/>
@@ -21190,7 +21190,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_coverage.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <class-decl name='InternalMmapVector&lt;long unsigned int&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-1551'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -21429,7 +21429,7 @@
       <return type-id='type-id-6'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_flags.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_strcspn' mangled-name='_ZN11__sanitizer16internal_strcspnEPKcS1_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libc.h' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-30'/>
@@ -21438,7 +21438,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='IsSpace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-13'/>
@@ -21511,10 +21511,10 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='internal_open' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux.cc' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-30'/>
@@ -22020,7 +22020,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='Unwind_GetIP' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1597'/>
@@ -22153,12 +22153,12 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <var-decl name='struct_statfs64_sz' type-id='type-id-22' mangled-name='_ZN11__sanitizer18struct_statfs64_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc' line='63' column='1'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <var-decl name='struct_utsname_sz' type-id='type-id-22' mangled-name='_ZN11__sanitizer17struct_utsname_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='120' column='1'/>
       <var-decl name='struct_stat_sz' type-id='type-id-22' mangled-name='_ZN11__sanitizer14struct_stat_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='121' column='1'/>
@@ -22698,7 +22698,7 @@
       <var-decl name='sigset_t_sz' type-id='type-id-22' mangled-name='_ZN11__sanitizer11sigset_t_szE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc' line='138' column='1'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='GetUid' mangled-name='_ZN11__sanitizer6GetUidEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cc' line='30' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-31'/>
@@ -22766,7 +22766,7 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='GetMmapGranularity' mangled-name='_ZN11__sanitizer18GetMmapGranularityEv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_posix.cc' line='26' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-2'/>
@@ -22799,7 +22799,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='VSNPrintf' mangled-name='_ZN11__sanitizer9VSNPrintfEPciPKcP13__va_list_tag' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_printf.cc' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-145'/>
@@ -22824,7 +22824,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stackdepot.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='atomic_fetch_add&lt;__sanitizer::atomic_uint32_t&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-552'/>
@@ -23066,13 +23066,13 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stacktrace_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='TracerThreadSignalHandler' mangled-name='_ZN11__sanitizer25TracerThreadSignalHandlerEiPvS0_' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-13'/>
@@ -23215,7 +23215,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-476' size-in-bits='64' id='type-id-1650'/>
     <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='TemplateMatch' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.cc' line='24' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-145'/>
@@ -23229,7 +23229,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
     <namespace-decl name='__sanitizer'>
       <function-decl name='__sanitizer_symbolize_flush' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-6'/>
@@ -23557,10 +23557,10 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libbacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
     <pointer-type-def type-id='type-id-1667' size-in-bits='64' id='type-id-1668'/>
     <typedef-decl name='demangle_callbackref' type-id='type-id-1668' filepath='../../.././libsanitizer/../include/demangle.h' line='150' column='1' id='type-id-1669'/>
@@ -23632,13 +23632,13 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_symbolizer_libcdep.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/sanitizer_common' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_linux.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
 
 
     <function-decl name='dlvsym' filepath='/usr/include/dlfcn.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -23648,10 +23648,10 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/interception/interception_type_test.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/interception' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/dwarf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <class-decl name='backtrace_state' size-in-bits='576' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='127' column='1' id='type-id-1670'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='filename' type-id='type-id-30' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='130' column='1'/>
@@ -23810,7 +23810,7 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/fileline.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <function-decl name='__asan_backtrace_open' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-30'/>
       <parameter type-id='type-id-1674'/>
@@ -23827,7 +23827,7 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <function-decl name='__asan_backtrace_close' mangled-name='__asan_backtrace_close' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__asan_backtrace_close'>
       <parameter type-id='type-id-13' name='descriptor' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1'/>
       <parameter type-id='type-id-1674' name='error_callback' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/posix.c' line='91' column='1'/>
@@ -23851,11 +23851,11 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/sort.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/sort.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/state.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='453' column='1' id='type-id-1696'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-1697' visibility='default' filepath='../../.././libsanitizer/../include/demangle.h' line='456' column='1'/>
@@ -24309,12 +24309,12 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/bridge.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/elf.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmapio.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <typedef-decl name='__off_t' type-id='type-id-277' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-1730'/>
     <typedef-decl name='off_t' type-id='type-id-1730' filepath='/usr/include/sys/types.h' line='87' column='1' id='type-id-1731'/>
     <class-decl name='backtrace_view' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/internal.h' line='169' column='1' id='type-id-1732'>
@@ -24364,7 +24364,7 @@
       <return type-id='type-id-13'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/libbacktrace' language='LANG_C89'>
     <class-decl name='backtrace_freelist_struct' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='55' column='1' id='type-id-1689'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-1684' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libbacktrace/mmap.c' line='58' column='1'/>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index 257ca67f..fb06daeb 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1615,12 +1615,12 @@
     <elf-symbol name='__offload_myo_var_tables' size='48' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='__offload_myo_vtable_tables' size='48' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/dv_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_common.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_common.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
 
 
 
@@ -1725,7 +1725,7 @@
     <typedef-decl name='int64_t' type-id='type-id-14' filepath='/usr/include/sys/types.h' line='197' column='1' id='type-id-10'/>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-11'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_table.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_table.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
 
 
 
@@ -2538,7 +2538,7 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_trace.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_trace.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='256' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='72' column='1' id='type-id-99'>
@@ -5901,12 +5901,12 @@
     <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-148'/>
     <typedef-decl name='_Atomic_word' type-id='type-id-31' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/x86_64-pc-linux-gnu/bits/atomic_word.h' line='32' column='1' id='type-id-147'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/cean_util.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/cean_util.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/coi/coi_client.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/coi/coi_client.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='COI'>
       <function-decl name='fini' mangled-name='_ZN3COI4finiEv' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.cpp' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
         <return type-id='type-id-1'/>
@@ -6459,7 +6459,7 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/compiler_if_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='_List_base&lt;coibuffer*, std::allocator&lt;coibuffer*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-468'>
@@ -25961,7 +25961,7 @@
       <class-decl name='__uses_alloc_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/uses_allocator.h' line='59' column='1' id='type-id-2113'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_engine.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -29093,7 +29093,7 @@
       <return type-id='type-id-59'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_env.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_env.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='list&lt;MicEnvVar::VarValue*, std::allocator&lt;MicEnvVar::VarValue*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2393'>
@@ -34251,7 +34251,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-2505' size-in-bits='64' id='type-id-2518'/>
     <pointer-type-def type-id='type-id-2508' size-in-bits='64' id='type-id-2519'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_host.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -35709,7 +35709,7 @@
     </enum-decl>
     <pointer-type-def type-id='type-id-3001' size-in-bits='64' id='type-id-3003'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_myo_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
         <class-decl name='list&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-3004'>
@@ -37888,7 +37888,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_omp_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
 
 
 
@@ -38055,7 +38055,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_orsl.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_orsl.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
 
 
 
@@ -38079,7 +38079,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_timer_host.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/offload_timer_host.cpp' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -38155,7 +38155,7 @@
     <var-decl name='offload_report_level' type-id='type-id-31' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='76' column='1'/>
     <var-decl name='offload_report_enabled' type-id='type-id-31' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_timer.h' line='77' column='1'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='../../../gcc/liboffloadmic/runtime/orsl-lite/lib/orsl-lite.c' comp-dir-path='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/liboffloadmic' language='LANG_C99'>
     <class-decl name='ORSLBusySet' size-in-bits='1088' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='52' column='1' id='type-id-3235'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-3236' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/orsl-lite/include/orsl-lite.h' line='53' column='1'/>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index d8cd8504..a2154a57 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -265,7 +265,7 @@
     <elf-symbol name='hb_version_atleast' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='hb_version_string' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='hb-blob.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-blob.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <class-decl name='hb_reference_count_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='53' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ref_count' type-id='type-id-2' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-object-private.hh' line='54' column='1'/>
@@ -751,7 +751,7 @@
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-59'/>
     <function-decl name='hb_buffer_serialize_list_formats' mangled-name='hb_buffer_serialize_list_formats' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_list_formats'>
       <return type-id='type-id-59'/>
@@ -2571,7 +2571,7 @@
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-222'/>
     <qualified-type-def type-id='type-id-218' const='yes' id='type-id-223'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-buffer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-buffer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <class-decl name='hb_utf_t&lt;unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='32' column='1' id='type-id-224'>
       <member-function access='public' static='yes'>
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIjLb1EE4nextEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2859,7 +2859,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-common.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <class-decl name='hb_language_item_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='212' column='1' id='type-id-236'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='214' column='1'/>
@@ -2956,7 +2956,7 @@
       <return type-id='type-id-123'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-face.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <namespace-decl name='OT'>
       <class-decl name='BEInt&lt;unsigned int, 4&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='532' column='1' id='type-id-241'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -21253,7 +21253,7 @@
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-font.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
       <return type-id='type-id-153'/>
@@ -21596,7 +21596,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_ot_tag_to_language' mangled-name='hb_ot_tag_to_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_language'>
       <parameter type-id='type-id-173' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
       <return type-id='type-id-123'/>
@@ -21616,7 +21616,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-set.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-set.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_set_get_empty' mangled-name='hb_set_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_empty'>
       <return type-id='type-id-835'/>
     </function-decl>
@@ -21741,7 +21741,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-shape.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-47' const='yes' id='type-id-1682'/>
     <pointer-type-def type-id='type-id-1682' size-in-bits='64' id='type-id-1683'/>
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
@@ -21775,7 +21775,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-shape-plan.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-shape-plan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_shape_plan_get_empty' mangled-name='hb_shape_plan_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_get_empty'>
       <return type-id='type-id-169'/>
     </function-decl>
@@ -21829,7 +21829,7 @@
       <return type-id='type-id-169'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_unicode_funcs_get_empty' mangled-name='hb_unicode_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_empty'>
       <return type-id='type-id-63'/>
     </function-decl>
@@ -21975,7 +21975,7 @@
       <return type-id='type-id-63'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <namespace-decl name='OT'>
       <class-decl name='Supplier&lt;OT::CmapSubtableLongGroup&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1292'/>
       <class-decl name='Supplier&lt;OT::VariationSelectorRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1322'/>
@@ -22179,7 +22179,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-layout.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <namespace-decl name='OT'>
       <class-decl name='GSUB' size-in-bits='80' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1318' column='1' id='type-id-1704'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1705'/>
@@ -23902,10 +23902,10 @@
     <qualified-type-def type-id='type-id-1823' const='yes' id='type-id-1843'/>
     <qualified-type-def type-id='type-id-1829' const='yes' id='type-id-1844'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
       <parameter type-id='type-id-169' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1'/>
@@ -23922,19 +23922,19 @@
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-arabic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-default.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hangul.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-hebrew.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <class-decl name='indic_shape_plan_t' size-in-bits='1344' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='507' column='1' id='type-id-1845'>
       <data-member access='public' layout-offset-in-bits='0'>
@@ -24075,28 +24075,28 @@
     <qualified-type-def type-id='type-id-1845' const='yes' id='type-id-1860'/>
     <pointer-type-def type-id='type-id-1860' size-in-bits='64' id='type-id-1849'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-indic-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-myanmar.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-sea.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-thai.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-complex-tibetan.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-normalize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ot-shape-fallback.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-glib.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-glib.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_glib_get_unicode_funcs' mangled-name='hb_glib_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_get_unicode_funcs'>
       <return type-id='type-id-63'/>
     </function-decl>
@@ -24239,7 +24239,7 @@
       <return type-id='type-id-100'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='hb-ft.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <class-decl name='FT_FaceRec_' size-in-bits='1984' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='959' column='1' id='type-id-1862'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='num_faces' type-id='type-id-1863' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='960' column='1'/>
diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 4d54c65e..4ccd2622 100644
--- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -450,7 +450,7 @@
     <elf-symbol name='vtkSurfaceLICPainter_GeomVs' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='vtkSurfaceLICPainter_SC' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-1'>
@@ -5172,7 +5172,7 @@
     <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-292'/>
     <qualified-type-def type-id='type-id-262' const='yes' id='type-id-302'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkImageDataLIC2DExtentTranslator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='ctype&lt;char&gt;' visibility='default' is-declaration-only='yes' id='type-id-303'>
@@ -5207,7 +5207,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkLineIntegralConvolution2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator-&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9104,12 +9104,12 @@
     <qualified-type-def type-id='type-id-39' const='yes' id='type-id-446'/>
     <qualified-type-def type-id='type-id-85' const='yes' id='type-id-447'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkPixelTransfer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkStructuredGridLIC2D.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
@@ -9521,7 +9521,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICComposite.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator==&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10352,7 +10352,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-418' size-in-bits='64' id='type-id-486'/>
     <reference-type-def kind='lvalue' type-id='type-id-487' size-in-bits='64' id='type-id-485'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICDefaultPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
@@ -13325,7 +13325,7 @@
     <class-decl name='vtkOpenGLLightMonitor' visibility='default' is-declaration-only='yes' id='type-id-628'/>
     <qualified-type-def type-id='type-id-598' const='yes' id='type-id-627'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkSurfaceLICPainter.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='uninitialized_copy&lt;std::_Deque_iterator&lt;vtkPixelExtent, vtkPixelExtent&amp;, vtkPixelExtent*&gt;, vtkPixelExtent*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14566,7 +14566,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Rendering/LIC/vtkTextureIO.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Rendering/LIC' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 52b84c9a..f273893d 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -794,7 +794,7 @@
     <elf-symbol name='heap_leak_checker_bcad_variable' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='sys_alloc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/tcmalloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='_Destroy&lt;MallocExtension::FreeListInfo*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7288,7 +7288,7 @@
     <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-397'/>
     <qualified-type-def type-id='type-id-395' const='yes' id='type-id-399'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
     <typedef-decl name='__pid_t' type-id='type-id-7' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-400'/>
     <typedef-decl name='pid_t' type-id='type-id-400' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-401'/>
@@ -7314,7 +7314,7 @@
       <return type-id='type-id-7'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-checker.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='swap&lt;AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20828,7 +20828,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1119' size-in-bits='64' id='type-id-1124'/>
     <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1127'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-checker-bcad.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -20854,7 +20854,7 @@
     <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-1129'/>
     <var-decl name='heap_leak_checker_bcad_variable' type-id='type-id-30' mangled-name='heap_leak_checker_bcad_variable' visibility='default' filepath='src/heap-checker-bcad.cc' line='53' column='1' elf-symbol-id='heap_leak_checker_bcad_variable'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/profiler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -21385,7 +21385,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/profile-handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
     <namespace-decl name='std'>
 
@@ -22413,14 +22413,14 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/profiledata.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/common.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/common.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='tcmalloc'>
       <function-decl name='metadata_system_bytes' mangled-name='_ZN8tcmalloc21metadata_system_bytesEv' filepath='src/common.cc' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc21metadata_system_bytesEv'>
         <return type-id='type-id-196'/>
@@ -22432,7 +22432,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/internal_logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='tcmalloc'>
       <class-decl name='Logger' size-in-bits='1728' visibility='default' filepath='src/internal_logging.cc' line='66' column='1' id='type-id-1252'>
         <data-member access='private' static='yes'>
@@ -22491,7 +22491,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/system-alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -22644,7 +22644,7 @@
     <var-decl name='sys_alloc' type-id='type-id-96' mangled-name='sys_alloc' visibility='default' filepath='src/system-alloc.cc' line='124' column='1' elf-symbol-id='sys_alloc'/>
     <var-decl name='TCMalloc_SystemTaken' type-id='type-id-28' mangled-name='TCMalloc_SystemTaken' visibility='default' filepath='src/system-alloc.cc' line='127' column='1' elf-symbol-id='TCMalloc_SystemTaken'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/memfs_malloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -22719,7 +22719,7 @@
     </class-decl>
     <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1271'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/central_freelist.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='max&lt;int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22755,7 +22755,7 @@
     <qualified-type-def type-id='type-id-205' const='yes' id='type-id-1276'/>
     <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1275'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/page_heap.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -22778,7 +22778,7 @@
       <var-decl name='FLAGS_notcmalloc_heap_limit_mb' type-id='type-id-74' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead30FLAGS_notcmalloc_heap_limit_mbE' visibility='default' filepath='src/page_heap.cc' line='60' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead30FLAGS_notcmalloc_heap_limit_mbE'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/sampler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/sampler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
     <namespace-decl name='std'>
@@ -22796,7 +22796,7 @@
       <var-decl name='FLAGS_notcmalloc_sample_parameter' type-id='type-id-74' mangled-name='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead33FLAGS_notcmalloc_sample_parameterE' visibility='default' filepath='src/sampler.cc' line='55' column='1' elf-symbol-id='_ZN61FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead33FLAGS_notcmalloc_sample_parameterE'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/span.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/span.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='tcmalloc'>
       <function-decl name='DeleteSpan' mangled-name='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE' filepath='src/span.cc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc10DeleteSpanEPNS_4SpanE'>
         <parameter type-id='type-id-214'/>
@@ -22830,7 +22830,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/stack_trace_table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='tcmalloc'>
       <class-decl name='StackTraceTable' size-in-bits='192' visibility='default' filepath='src/stack_trace_table.h' line='47' column='1' id='type-id-382'>
         <member-type access='private'>
@@ -22921,7 +22921,7 @@
     <qualified-type-def type-id='type-id-382' const='yes' id='type-id-1280'/>
     <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-1279'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/static_vars.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -22929,7 +22929,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/symbolize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='_Rb_tree&lt;const void*, std::pair&lt;const void* const, const char*&gt;, std::_Select1st&lt;std::pair&lt;const void* const, const char*&gt; &gt;, std::less&lt;const void*&gt;, std::allocator&lt;std::pair&lt;const void* const, const char*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-1281'>
@@ -24292,7 +24292,7 @@
     </class-decl>
     <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1357'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/thread_cache.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/thread_cache.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='tcmalloc'>
       <function-decl name='SLL_PopRange' filepath='src/linked_list.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-37'/>
@@ -24320,7 +24320,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__copy_move_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -24821,7 +24821,7 @@
       <return type-id='type-id-7'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/malloc_extension.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/malloc_extension.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -24896,7 +24896,7 @@
       <return type-id='type-id-7'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/low_level_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -24906,7 +24906,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-profile-table.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-profile-table.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__equal_aux&lt;const void* const*, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25477,7 +25477,7 @@
       <return type-id='type-id-30'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/heap-profiler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/heap-profiler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -25531,7 +25531,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/raw_printer.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='base'>
       <class-decl name='RawPrinter' size-in-bits='192' visibility='default' filepath='src/raw_printer.h' line='51' column='1' id='type-id-1404'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -25596,7 +25596,7 @@
     <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-1406'/>
     <reference-type-def kind='lvalue' type-id='type-id-1408' size-in-bits='64' id='type-id-1407'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/memory_region_map.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__equal_aux&lt;const void**, const void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25677,7 +25677,7 @@
     <qualified-type-def type-id='type-id-1409' const='yes' id='type-id-1415'/>
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1411'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/atomicops-internals-x86.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -25685,7 +25685,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='src/base/dynamic_annotations.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C89'>
     <function-decl name='RunningOnValgrind' mangled-name='RunningOnValgrind' filepath='src/base/dynamic_annotations.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='RunningOnValgrind'>
       <return type-id='type-id-7'/>
     </function-decl>
@@ -25693,7 +25693,7 @@
       <return type-id='type-id-97'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/elf_mem_image.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='base'>
 
       <class-decl name='ElfMemImage' size-in-bits='576' visibility='default' filepath='./src/base/elf_mem_image.h' line='56' column='1' id='type-id-1416'>
@@ -26080,7 +26080,7 @@
     <pointer-type-def type-id='type-id-1458' size-in-bits='64' id='type-id-1434'/>
     <pointer-type-def type-id='type-id-1417' size-in-bits='64' id='type-id-1436'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/logging.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -26105,7 +26105,7 @@
       <return type-id='type-id-819'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/spinlock.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='base'>
 
 
@@ -26128,7 +26128,7 @@
       </member-function>
     </class-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/spinlock_internal.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='base'>
       <namespace-decl name='internal'>
         <function-decl name='SpinLockWake' mangled-name='_ZN4base8internal12SpinLockWakeEPVib' filepath='./src/base/spinlock_linux-inl.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal12SpinLockWakeEPVib'>
@@ -26171,7 +26171,7 @@
     <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-1461'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/stacktrace.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -26208,7 +26208,7 @@
       <return type-id='type-id-7'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/sysinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
@@ -26394,7 +26394,7 @@
     </function-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/base/vdso_support.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
     <namespace-decl name='base'>
       <namespace-decl name='subtle'>
         <function-decl name='MemoryBarrier' mangled-name='_ZN4base6subtle13MemoryBarrierEv' filepath='./src/base/atomicops-internals-x86.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26503,7 +26503,7 @@
     <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-1483'/>
     <reference-type-def kind='lvalue' type-id='type-id-1485' size-in-bits='64' id='type-id-1484'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/maybe_threads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-read-dwarf/test2.so.abi b/tests/data/test-read-dwarf/test2.so.abi
index b3703264..d58fb993 100644
--- a/tests/data/test-read-dwarf/test2.so.abi
+++ b/tests/data/test-read-dwarf/test2.so.abi
@@ -15,7 +15,7 @@
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test2-0.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test2-0.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <class-decl name='first_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='4' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='member0' type-id='type-id-2' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='6' column='1'/>
@@ -48,7 +48,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='test2-1.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test2-1.cc' comp-dir-path='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <class-decl name='second_type' size-in-bits='64' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='12' column='1' id='type-id-8'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='member0' type-id='type-id-2' visibility='default' filepath='/home/dodji/git/libabigail/dwarf/tests/data/test-read-dwarf/test2.h' line='14' column='1'/>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 2f8b3a50..62ae9a54 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -386,7 +386,7 @@
     <elf-symbol name='_ZTV25vtkMultiProcessController' size='344' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZTVN15vtkCommunicator9OperationE' size='48' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-1'>
@@ -9755,7 +9755,7 @@
     </function-type>
     <qualified-type-def type-id='type-id-502' const='yes' id='type-id-512'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -9867,7 +9867,7 @@
     <pointer-type-def type-id='type-id-513' size-in-bits='64' id='type-id-514'/>
     <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-516'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkDummyController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -17465,7 +17465,7 @@
     <qualified-type-def type-id='type-id-820' const='yes' id='type-id-858'/>
     <qualified-type-def type-id='type-id-822' const='yes' id='type-id-859'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__fill_a&lt;std::_Bit_type*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -21943,7 +21943,7 @@
     <qualified-type-def type-id='type-id-983' const='yes' id='type-id-1068'/>
     <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1069'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessStream.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator==&lt;unsigned char, unsigned char&amp;, unsigned char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22420,13 +22420,13 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcess.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkProcessGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__copy_move_a&lt;false, int*, int*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22460,7 +22460,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator&amp;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/ios_base.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26331,7 +26331,7 @@
       </member-function>
     </class-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSocketController.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -26518,7 +26518,7 @@
     <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1294'/>
     <reference-type-def kind='lvalue' type-id='type-id-1296' size-in-bits='64' id='type-id-1295'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubCommunicator.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
@@ -26646,7 +26646,7 @@
     <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
     <reference-type-def kind='lvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1300'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkSubGroup.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__unguarded_linear_insert&lt;int*, int&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27155,7 +27155,7 @@
     <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-1307'/>
     <reference-type-def kind='lvalue' type-id='type-id-1309' size-in-bits='64' id='type-id-1308'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkFieldDataSerializer.cxx' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Parallel/Core' language='LANG_C_plus_plus'>
 
 
 
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index 9d4f1db3..c75c60d2 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -449,7 +449,7 @@
     <elf-symbol name='version_string' size='6' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='vflag' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <type-decl name='void' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
@@ -1784,7 +1784,7 @@
       </data-member>
     </class-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/collect2-aix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <function-decl name='strchr' mangled-name='strchr' filepath='/usr/include/string.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
@@ -1797,7 +1797,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <var-decl name='symbol_stack_obstack' type-id='type-id-26' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-152'>
@@ -2007,7 +2007,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/vec.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <function-decl name='vec_gc_p_reserve' mangled-name='_Z16vec_gc_p_reservePvi' filepath='../.././gcc/vec.c' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16vec_gc_p_reservePvi'>
       <parameter type-id='type-id-2'/>
@@ -2107,7 +2107,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-185'>
       <underlying-type type-id='type-id-83'/>
@@ -2809,7 +2809,7 @@
     <var-decl name='tree_zone' type-id='type-id-186' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
     <var-decl name='tree_id_zone' type-id='type-id-186' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/diagnostic.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/diagnostic.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <function-decl name='default_diagnostic_finalizer' mangled-name='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info' filepath='../.././gcc/diagnostic.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28default_diagnostic_finalizerP18diagnostic_contextP15diagnostic_info'>
       <parameter type-id='type-id-107'/>
@@ -3134,7 +3134,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/pretty-print.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/pretty-print.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <function-decl name='pp_base_set_line_maximum_length' mangled-name='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi' filepath='../.././gcc/pretty-print.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31pp_base_set_line_maximum_lengthP17pretty_print_infoi'>
       <parameter type-id='type-id-62' name='pp' filepath='../.././gcc/pretty-print.c' line='587' column='1'/>
@@ -3244,7 +3244,7 @@
       <return type-id='type-id-2'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/intl.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/intl.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <function-decl name='gcc_gettext_width' mangled-name='_Z17gcc_gettext_widthPKc' filepath='../.././gcc/intl.c' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17gcc_gettext_widthPKc'>
       <parameter type-id='type-id-8'/>
@@ -3304,7 +3304,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/input.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/input.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
 
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
       <return type-id='type-id-1'/>
@@ -3359,7 +3359,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././gcc/version.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/gcc' language='LANG_C_plus_plus'>
     <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='48' id='type-id-214'>
       <subrange length='6'/>
     </array-type-def>
@@ -3376,7 +3376,7 @@
     <qualified-type-def type-id='type-id-218' const='yes' id='type-id-219'/>
     <var-decl name='bug_report_url' type-id='type-id-219' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/line-map.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/line-map.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='linemap_init' mangled-name='_Z12linemap_initP9line_maps' filepath='../.././libcpp/line-map.c' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_initP9line_maps'>
       <parameter type-id='type-id-196' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <return type-id='type-id-1'/>
@@ -3490,7 +3490,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <class-decl name='cpp_reader' size-in-bits='10560' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='380' column='1' id='type-id-222'>
       <member-type access='public'>
         <class-decl name='__anonymous_struct__' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='528' column='1' id='type-id-223'>
@@ -4964,7 +4964,7 @@
     </class-decl>
     <typedef-decl name='cpp_num_part' type-id='type-id-4' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-361'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
       <parameter type-id='type-id-304' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <parameter type-id='type-id-255' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
@@ -5028,7 +5028,7 @@
       <return type-id='type-id-35'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/directives.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/directives.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
       <parameter type-id='type-id-304'/>
       <return type-id='type-id-1'/>
@@ -5256,7 +5256,7 @@
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/errors.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/errors.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
       <parameter type-id='type-id-304'/>
       <parameter type-id='type-id-3'/>
@@ -5270,7 +5270,7 @@
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/expr.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/expr.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_interpret_float_suffix' mangled-name='_Z26cpp_interpret_float_suffixPKcm' filepath='../.././libcpp/expr.c' line='190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26cpp_interpret_float_suffixPKcm'>
       <parameter type-id='type-id-8' name='s' filepath='../.././libcpp/expr.c' line='190' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/expr.c' line='190' column='1'/>
@@ -5339,7 +5339,7 @@
       <return type-id='type-id-374'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/files.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
       <parameter type-id='type-id-233' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <return type-id='type-id-35'/>
@@ -5584,7 +5584,7 @@
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/identifiers.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
       <parameter type-id='type-id-304'/>
       <return type-id='type-id-1'/>
@@ -5623,7 +5623,7 @@
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
       <parameter type-id='type-id-277' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <parameter type-id='type-id-8' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
@@ -5736,7 +5736,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/mkdeps.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/mkdeps.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
       <parameter type-id='type-id-239' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <return type-id='type-id-1'/>
@@ -5782,7 +5782,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/symtab.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/symtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <parameter type-id='type-id-331'/>
       <parameter type-id='type-id-392'/>
@@ -5806,7 +5806,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
       <parameter type-id='type-id-304'/>
       <return type-id='type-id-1'/>
@@ -5857,7 +5857,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libcpp/init.c' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../.././libcpp/init.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
     <function-decl name='cpp_set_lang' mangled-name='_Z12cpp_set_langP10cpp_reader6c_lang' filepath='../.././libcpp/init.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_set_langP10cpp_reader6c_lang'>
       <parameter type-id='type-id-304' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <parameter type-id='type-id-337' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
@@ -5906,7 +5906,7 @@
     </array-type-def>
     <var-decl name='_cpp_trigraph_map' type-id='type-id-401' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='set_cplus_marker_for_demangling' mangled-name='set_cplus_marker_for_demangling' filepath='../.././libiberty/cplus-dem.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_cplus_marker_for_demangling'>
       <parameter type-id='type-id-3' name='ch' filepath='../.././libiberty/cplus-dem.c' line='100' column='1'/>
       <return type-id='type-id-1'/>
@@ -6030,7 +6030,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-408'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='type' type-id='type-id-409' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
@@ -6446,7 +6446,7 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-446'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='A' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
@@ -6516,7 +6516,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/argv.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/argv.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='freeargv' mangled-name='freeargv' filepath='../.././libiberty/argv.c' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='freeargv'>
       <parameter type-id='type-id-25' name='vector' filepath='../.././libiberty/argv.c' line='108' column='1'/>
       <return type-id='type-id-1'/>
@@ -6573,7 +6573,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/concat.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/concat.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='concat_copy' mangled-name='concat_copy' filepath='../.././libiberty/concat.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='concat_copy'>
       <parameter type-id='type-id-9' name='dst' filepath='../.././libiberty/concat.c' line='117' column='1'/>
       <parameter type-id='type-id-8' name='first' filepath='../.././libiberty/concat.c' line='117' column='1'/>
@@ -6588,9 +6588,9 @@
     </function-decl>
     <var-decl name='libiberty_concat_ptr' type-id='type-id-9' mangled-name='libiberty_concat_ptr' visibility='default' filepath='../.././libiberty/concat.c' line='134' column='1' elf-symbol-id='libiberty_concat_ptr'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/filename_cmp.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/filename_cmp.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/fopen_unlocked.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/fopen_unlocked.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='unlock_stream' mangled-name='unlock_stream' filepath='../.././libiberty/fopen_unlocked.c' line='94' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_stream'>
       <parameter type-id='type-id-22' name='fp' filepath='../.././libiberty/fopen_unlocked.c' line='94' column='1'/>
       <return type-id='type-id-1'/>
@@ -6618,14 +6618,14 @@
       <return type-id='type-id-22'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/getpwd.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/getpwd.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='getcwd' filepath='/usr/include/unistd.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-9'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
       <parameter type-id='type-id-183'/>
       <return type-id='type-id-5'/>
@@ -6718,14 +6718,14 @@
     <var-decl name='htab_hash_pointer' type-id='type-id-165' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
     <var-decl name='htab_eq_pointer' type-id='type-id-166' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='hex_init' mangled-name='hex_init' filepath='../.././libiberty/hex.c' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hex_init'>
       <return type-id='type-id-1'/>
     </function-decl>
     <qualified-type-def type-id='type-id-401' const='yes' id='type-id-454'/>
     <var-decl name='_hex_value' type-id='type-id-454' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='unix_lbasename' mangled-name='unix_lbasename' filepath='../.././libiberty/lbasename.c' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unix_lbasename'>
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/lbasename.c' line='49' column='1'/>
       <return type-id='type-id-8'/>
@@ -6735,7 +6735,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/make-temp-file.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/make-temp-file.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='choose_tmpdir' mangled-name='choose_tmpdir' filepath='../.././libiberty/make-temp-file.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='choose_tmpdir'>
       <return type-id='type-id-9'/>
     </function-decl>
@@ -6745,7 +6745,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-common.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-common.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <class-decl name='pex_obj' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='54' column='1' id='type-id-23'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='flags' type-id='type-id-3' visibility='default' filepath='../.././libiberty/pex-common.h' line='57' column='1'/>
@@ -6953,7 +6953,7 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <var-decl name='funcs' type-id='type-id-476' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
@@ -7116,7 +7116,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='4096' id='type-id-487'>
       <subrange length='256'/>
     </array-type-def>
@@ -7125,7 +7125,7 @@
     <var-decl name='_sch_toupper' type-id='type-id-454' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
     <var-decl name='_sch_tolower' type-id='type-id-454' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='__lxstat' filepath='/usr/include/sys/stat.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
@@ -7133,10 +7133,10 @@
       <return type-id='type-id-3'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xexit.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xexit.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <var-decl name='_xexit_cleanup' type-id='type-id-60' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmalloc.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='xmalloc_failed' mangled-name='xmalloc_failed' filepath='../.././libiberty/xmalloc.c' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xmalloc_failed'>
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/xmalloc.c' line='117' column='1'/>
       <return type-id='type-id-1'/>
@@ -7153,10 +7153,10 @@
       <return type-id='type-id-2'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmemdup.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xmemdup.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrdup.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrdup.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrerror.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='../.././libiberty/xstrerror.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index 7c02ab02..be51253d 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -3670,7 +3670,7 @@
     <elf-symbol name='_ZTVSt9strstream' size='120' version='GLIBCXX_3.4' is-default-version='yes' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZTVSt9type_info' size='64' version='GLIBCXX_3.4' is-default-version='yes' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <namespace-decl name='__detail'>
@@ -23181,7 +23181,7 @@
     <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1144'/>
     <class-decl name='__locale_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1146'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__norm'>
         <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' line='41' column='1' id='type-id-1147'>
@@ -23264,10 +23264,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-1147' size-in-bits='64' id='type-id-1149'/>
     <reference-type-def kind='lvalue' type-id='type-id-1148' size-in-bits='64' id='type-id-1150'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list-2.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-debug_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' line='41' column='1' id='type-id-1151'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -23348,10 +23348,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-1151' size-in-bits='64' id='type-id-1153'/>
     <reference-type-def kind='lvalue' type-id='type-id-1152' size-in-bits='64' id='type-id-1154'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx1998'>
         <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/src/c++98/compatibility-list-2.cc' line='41' column='1' id='type-id-1155'>
@@ -23434,10 +23434,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1157'/>
     <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1158'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list-2.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++98/compatibility-parallel_list-2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -24453,7 +24453,7 @@
     <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-1243'/>
     <qualified-type-def type-id='type-id-1242' const='yes' id='type-id-1247'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-atomic-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -24830,7 +24830,7 @@
     <typedef-decl name='intmax_t' type-id='type-id-55' filepath='/usr/include/stdint.h' line='135' column='1' id='type-id-1299'/>
     <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1281'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/src/c++11/compatibility-thread-c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -28937,7 +28937,7 @@
     <qualified-type-def type-id='type-id-1702' const='yes' id='type-id-1736'/>
     <qualified-type-def type-id='type-id-1710' const='yes' id='type-id-1737'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/array_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/array_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__array_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='219' column='1' id='type-id-1738'>
@@ -28975,10 +28975,10 @@
 
     <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-1739'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/atexit_arm.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/atexit_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_alloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='bad_alloc' size-in-bits='64' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new' line='56' column='1' id='type-id-1740'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-86'/>
@@ -29021,7 +29021,7 @@
     <qualified-type-def type-id='type-id-1740' const='yes' id='type-id-1743'/>
     <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1742'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_cast.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_cast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='bad_cast' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='189' column='1' id='type-id-1744'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-86'/>
@@ -29064,7 +29064,7 @@
     <qualified-type-def type-id='type-id-1744' const='yes' id='type-id-1747'/>
     <pointer-type-def type-id='type-id-1747' size-in-bits='64' id='type-id-1746'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/bad_typeid.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='bad_typeid' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/typeinfo' line='206' column='1' id='type-id-1748'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-86'/>
@@ -29107,13 +29107,13 @@
     <qualified-type-def type-id='type-id-1748' const='yes' id='type-id-1751'/>
     <pointer-type-def type-id='type-id-1751' size-in-bits='64' id='type-id-1750'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/class_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_op.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -29121,7 +29121,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opnt.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new' line='69' column='1' id='type-id-1752'/>
     </namespace-decl>
@@ -29134,14 +29134,14 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opv.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <function-decl name='operator delete []' mangled-name='_ZdaPv' filepath='../../.././libstdc++-v3/libsupc++/del_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPv@@GLIBCXX_3.4'>
       <parameter type-id='type-id-33'/>
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <function-decl name='operator delete []' mangled-name='_ZdaPvRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/del_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPvRKSt9nothrow_t@@GLIBCXX_3.4'>
       <parameter type-id='type-id-33' name='ptr' filepath='../../.././libstdc++-v3/libsupc++/del_opnt.cc' line='33' column='1'/>
@@ -29149,7 +29149,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/dyncast.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/dyncast.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <function-decl name='__dynamic_cast' mangled-name='__dynamic_cast' filepath='../../.././libstdc++-v3/libsupc++/dyncast.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_cast@@CXXABI_1.3'>
@@ -29162,7 +29162,7 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_alloc.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <typedef-decl name='unexpected_handler' type-id='type-id-1202' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='92' column='1' id='type-id-1756'/>
       <typedef-decl name='terminate_handler' type-id='type-id-1202' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='89' column='1' id='type-id-1757'/>
@@ -29504,11 +29504,11 @@
       <return type-id='type-id-4'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_arm.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_arm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_aux_runtime.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
     <namespace-decl name='__cxxabiv1'>
@@ -29520,7 +29520,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_call.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_call.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
     <namespace-decl name='__cxxabiv1'>
@@ -29534,7 +29534,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_catch.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_catch.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <function-decl name='uncaught_exception' mangled-name='_ZSt18uncaught_exceptionv' filepath='../../.././libstdc++-v3/libsupc++/eh_catch.cc' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uncaught_exceptionv@@GLIBCXX_3.4'>
         <return type-id='type-id-23'/>
@@ -29570,7 +29570,7 @@
       <return type-id='type-id-4'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_exception.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <class-decl name='__forced_unwind' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/cxxabi_forced.h' line='48' column='1' id='type-id-1798'>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
@@ -29675,13 +29675,13 @@
     <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-1799'/>
     <pointer-type-def type-id='type-id-1800' size-in-bits='64' id='type-id-1801'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_globals.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_globals.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_personality.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_personality.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <function-decl name='unexpected' mangled-name='_ZSt10unexpectedv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt10unexpectedv@@GLIBCXX_3.4'>
         <return type-id='type-id-4'/>
@@ -29750,7 +29750,7 @@
       <return type-id='type-id-1777'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__exception_ptr'>
         <function-decl name='operator==' mangled-name='_ZNSt15__exception_ptreqERKNS_13exception_ptrES2_' filepath='../../.././libstdc++-v3/libsupc++/eh_ptr.cc' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__exception_ptreqERKNS_13exception_ptrES2_@@CXXABI_1.3.3'>
@@ -29778,13 +29778,13 @@
       <return type-id='type-id-1788'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <var-decl name='__terminate_handler' type-id='type-id-1757' mangled-name='_ZN10__cxxabiv119__terminate_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_term_handler.cc' line='40' column='1'/>
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <function-decl name='set_terminate' mangled-name='_ZSt13set_terminatePFvvE' filepath='../../.././libstdc++-v3/libsupc++/eh_terminate.cc' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13set_terminatePFvvE@@GLIBCXX_3.4'>
         <parameter type-id='type-id-1757'/>
@@ -29798,7 +29798,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_tm.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_tm.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
     <namespace-decl name='__cxxabiv1'>
@@ -29810,7 +29810,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_throw.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_throw.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_throw' mangled-name='__cxa_throw' filepath='../../.././libstdc++-v3/libsupc++/eh_throw.cc' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_throw@@CXXABI_1.3'>
@@ -29828,7 +29828,7 @@
       <return type-id='type-id-1788'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_type.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_type.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_current_exception_type' mangled-name='__cxa_current_exception_type' filepath='../../.././libstdc++-v3/libsupc++/eh_type.cc' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_current_exception_type@@CXXABI_1.3'>
         <return type-id='type-id-1337'/>
@@ -29836,13 +29836,13 @@
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <var-decl name='__unexpected_handler' type-id='type-id-1756' mangled-name='_ZN10__cxxabiv120__unexpected_handlerE' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/eh_unex_handler.cc' line='28' column='1'/>
     </namespace-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/enum_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/enum_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__enum_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='246' column='1' id='type-id-1810'>
@@ -29880,7 +29880,7 @@
 
     <pointer-type-def type-id='type-id-1810' size-in-bits='64' id='type-id-1811'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/function_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/function_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__function_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='230' column='1' id='type-id-1812'>
@@ -29926,7 +29926,7 @@
     <qualified-type-def type-id='type-id-1812' const='yes' id='type-id-1815'/>
     <pointer-type-def type-id='type-id-1815' size-in-bits='64' id='type-id-1814'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/fundamental_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/fundamental_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__fundamental_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='208' column='1' id='type-id-1816'>
@@ -29964,7 +29964,7 @@
 
     <pointer-type-def type-id='type-id-1816' size-in-bits='64' id='type-id-1817'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__cxxabiv1'>
 
@@ -30022,12 +30022,12 @@
       <return type-id='type-id-55'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard_error.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/guard_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <namespace-decl name='std'>
       <function-decl name='_Fnv_hash_bytes' mangled-name='_ZSt15_Fnv_hash_bytesPKvmm' filepath='../../.././libstdc++-v3/libsupc++/hash_bytes.cc' line='158' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15_Fnv_hash_bytesPKvmm@@CXXABI_1.3.5'>
@@ -30038,7 +30038,7 @@
       </function-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/nested_exception.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/nested_exception.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='nested_exception' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/nested_exception.h' line='55' column='1' id='type-id-1822'>
@@ -30106,7 +30106,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1822' size-in-bits='64' id='type-id-1825'/>
     <pointer-type-def type-id='type-id-1827' size-in-bits='64' id='type-id-1826'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_handler.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_handler.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <typedef-decl name='new_handler' type-id='type-id-1202' filepath='../../.././libstdc++-v3/libsupc++/new' line='75' column='1' id='type-id-1828'/>
       <function-decl name='set_new_handler' mangled-name='_ZSt15set_new_handlerPFvvE' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15set_new_handlerPFvvE@@GLIBCXX_3.4'>
@@ -30116,7 +30116,7 @@
       <var-decl name='nothrow' type-id='type-id-1753' mangled-name='_ZSt7nothrow' visibility='default' filepath='../../.././libstdc++-v3/libsupc++/new_handler.cc' line='30' column='1' elf-symbol-id='_ZSt7nothrow@@GLIBCXX_3.4'/>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_op.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_op.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
     <function-decl name='operator new' mangled-name='_Znwm' filepath='../../.././libstdc++-v3/libsupc++/new_op.cc' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znwm@@GLIBCXX_3.4'>
@@ -30124,7 +30124,7 @@
       <return type-id='type-id-33'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opnt.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <function-decl name='operator new' mangled-name='_ZnwmRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmRKSt9nothrow_t@@GLIBCXX_3.4'>
       <parameter type-id='type-id-66' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
@@ -30136,14 +30136,14 @@
       <return type-id='type-id-33'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opv.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opv.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <function-decl name='operator new []' mangled-name='_Znam' filepath='../../.././libstdc++-v3/libsupc++/new_opv.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Znam@@GLIBCXX_3.4'>
       <parameter type-id='type-id-66'/>
       <return type-id='type-id-33'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <function-decl name='operator new []' mangled-name='_ZnamRKSt9nothrow_t' filepath='../../.././libstdc++-v3/libsupc++/new_opvnt.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnamRKSt9nothrow_t@@GLIBCXX_3.4'>
       <parameter type-id='type-id-66' name='sz' filepath='../../.././libstdc++-v3/libsupc++/new_opnt.cc' line='37' column='1'/>
@@ -30156,7 +30156,7 @@
       <return type-id='type-id-33'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pbase_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pbase_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__pbase_type_info' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='257' column='1' id='type-id-1829'>
@@ -30248,7 +30248,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1829' size-in-bits='64' id='type-id-1833'/>
     <pointer-type-def type-id='type-id-1835' size-in-bits='64' id='type-id-1834'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pmem_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pmem_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__pointer_to_member_type_info' size-in-bits='320' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='324' column='1' id='type-id-1836'>
@@ -30319,7 +30319,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1836' size-in-bits='64' id='type-id-1839'/>
     <pointer-type-def type-id='type-id-1841' size-in-bits='64' id='type-id-1840'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pointer_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__pointer_type_info' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='299' column='1' id='type-id-1842'>
@@ -30376,7 +30376,7 @@
     <qualified-type-def type-id='type-id-1842' const='yes' id='type-id-1845'/>
     <pointer-type-def type-id='type-id-1845' size-in-bits='64' id='type-id-1844'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pure.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/pure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
       <function-decl name='__cxa_pure_virtual' mangled-name='__cxa_pure_virtual' filepath='../../.././libstdc++-v3/libsupc++/pure.cc' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_pure_virtual@@CXXABI_1.3'>
         <return type-id='type-id-4'/>
@@ -30395,7 +30395,7 @@
       <return type-id='type-id-1847'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/si_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__si_class_type_info' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='478' column='1' id='type-id-1848'>
@@ -30487,15 +30487,15 @@
     <reference-type-def kind='lvalue' type-id='type-id-1848' size-in-bits='64' id='type-id-1851'/>
     <pointer-type-def type-id='type-id-1853' size-in-bits='64' id='type-id-1852'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo2.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/tinfo2.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vec.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vec.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <typedef-decl name='__cxa_cdtor_type' type-id='type-id-1780' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='65' column='1' id='type-id-1854'/>
@@ -30601,7 +30601,7 @@
       <return type-id='type-id-33'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vmi_class_type_info.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
     <namespace-decl name='__cxxabiv1'>
 
       <class-decl name='__base_class_type_info' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/cxxabi.h' line='351' column='1' id='type-id-1861'>
@@ -30731,7 +30731,7 @@
     <qualified-type-def type-id='type-id-1864' const='yes' id='type-id-1870'/>
     <pointer-type-def type-id='type-id-1870' size-in-bits='64' id='type-id-1868'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vterminate.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../.././libstdc++-v3/libsupc++/vterminate.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__verbose_terminate_handler' mangled-name='_ZN9__gnu_cxx27__verbose_terminate_handlerEv' filepath='../../.././libstdc++-v3/libsupc++/vterminate.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx27__verbose_terminate_handlerEv@@CXXABI_1.3'>
@@ -30754,7 +30754,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='cp-demangle.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++' language='LANG_C89'>
     <function-decl name='__cxa_demangle' mangled-name='__cxa_demangle' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cxa_demangle@@CXXABI_1.3'>
       <parameter type-id='type-id-11' name='mangled_name' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
       <parameter type-id='type-id-149' name='output_buffer' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/libsupc++/cp-demangle.c' line='5305' column='1'/>
@@ -30784,7 +30784,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/bitmap_allocator.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/bitmap_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__addressof&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -32273,7 +32273,7 @@
     <qualified-type-def type-id='type-id-1894' const='yes' id='type-id-2062'/>
     <pointer-type-def type-id='type-id-2062' size-in-bits='64' id='type-id-1895'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/pool_allocator.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/pool_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__pool_alloc_base' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/pool_allocator.h' line='77' column='1' id='type-id-2063'>
@@ -32600,7 +32600,7 @@
     <qualified-type-def type-id='type-id-2085' const='yes' id='type-id-2096'/>
     <qualified-type-def type-id='type-id-2086' const='yes' id='type-id-2097'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/mt_allocator.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__pool_base' size-in-bits='576' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/mt_allocator.h' line='49' column='1' id='type-id-2098'>
@@ -33292,7 +33292,7 @@
     <qualified-type-def type-id='type-id-2156' const='yes' id='type-id-2168'/>
     <reference-type-def kind='lvalue' type-id='type-id-2168' size-in-bits='64' id='type-id-2161'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/codecvt.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/codecvt.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='min&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -33305,7 +33305,7 @@
 
     <class-decl name='__locale_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1146'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/complex_io.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/complex_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__check_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34442,7 +34442,7 @@
     <qualified-type-def type-id='type-id-2198' const='yes' id='type-id-2249'/>
     <qualified-type-def type-id='type-id-2218' const='yes' id='type-id-2250'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ctype.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ctype.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='ctype_byname&lt;wchar_t&gt;' size-in-bits='10752' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1497' column='1' id='type-id-2251'>
@@ -34490,7 +34490,7 @@
 
     <pointer-type-def type-id='type-id-2251' size-in-bits='64' id='type-id-2252'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/globals_io.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/globals_io.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <typedef-decl name='fake_istream' type-id='type-id-2253' filepath='../../../.././libstdc++-v3/src/c++98/globals_io.cc' line='53' column='1' id='type-id-2254'/>
@@ -34659,7 +34659,7 @@
     </array-type-def>
     <qualified-type-def type-id='type-id-589' const='yes' id='type-id-2261'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hash_tr1.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hash_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <namespace-decl name='tr1'>
@@ -34751,7 +34751,7 @@
     <qualified-type-def type-id='type-id-2282' const='yes' id='type-id-2289'/>
     <pointer-type-def type-id='type-id-2289' size-in-bits='64' id='type-id-2284'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hashtable_tr1.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/hashtable_tr1.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='tr1'>
         <namespace-decl name='__detail'>
@@ -34764,7 +34764,7 @@
     </array-type-def>
     <qualified-type-def type-id='type-id-2291' const='yes' id='type-id-2290'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__throw_ios_failure' mangled-name='_ZSt19__throw_ios_failurePKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functexcept.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt19__throw_ios_failurePKc@@GLIBCXX_3.4'>
@@ -34871,12 +34871,12 @@
       </enum-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_failure.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_failure.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_init.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator|' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35021,12 +35021,12 @@
 
     <pointer-type-def type-id='type-id-2300' size-in-bits='64' id='type-id-2302'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_locale.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios_locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/list.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/list.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <namespace-decl name='__detail'>
@@ -35085,7 +35085,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator==&lt;char&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2490' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35113,7 +35113,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_init.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_init.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator!=&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2553' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35131,7 +35131,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale_facets.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator&amp;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35165,7 +35165,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/localename.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/localename.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='operator-&lt;char*, std::basic_string&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator.h' line='898' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35177,15 +35177,15 @@
     <reference-type-def kind='lvalue' type-id='type-id-731' size-in-bits='64' id='type-id-2310'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_float.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_float.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_long_double.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_long_double.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/stdexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='logic_error' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/stdexcept' line='56' column='1' id='type-id-2311'>
@@ -35565,7 +35565,7 @@
     <pointer-type-def type-id='type-id-2327' size-in-bits='64' id='type-id-2328'/>
     <pointer-type-def type-id='type-id-2329' size-in-bits='64' id='type-id-2330'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/strstream.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/strstream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='max&lt;long int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -36359,7 +36359,7 @@
     <qualified-type-def type-id='type-id-2349' const='yes' id='type-id-2356'/>
     <pointer-type-def type-id='type-id-2356' size-in-bits='64' id='type-id-2351'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/tree.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/tree.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <enum-decl name='_Rb_tree_color' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_tree.h' line='88' column='1' id='type-id-2357'>
@@ -36469,7 +36469,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_PS3_' filepath='../../../.././libstdc++-v3/src/c++98/istream.cc' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_PS3_@@GLIBCXX_3.4'>
@@ -36506,7 +36506,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__copy_streambufs_eof&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZSt21__copy_streambufs_eofIcSt11char_traitsIcEElPSt15basic_streambufIT_T0_ES6_Rb' filepath='../../../.././libstdc++-v3/src/c++98/streambuf.cc' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt21__copy_streambufs_eofIcSt11char_traitsIcEElPSt15basic_streambufIT_T0_ES6_Rb@@GLIBCXX_3.4.9'>
@@ -36525,7 +36525,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/valarray.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/valarray.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__valarray_product&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/valarray_array.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38355,7 +38355,7 @@
       <return type-id='type-id-69'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='atomicity.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='atomicity.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__exchange_and_add' mangled-name='_ZN9__gnu_cxx18__exchange_and_addEPVii' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/atomicity.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx18__exchange_and_addEPVii@@GLIBCXX_3.4'>
         <parameter type-id='type-id-2490'/>
@@ -38371,7 +38371,7 @@
     <qualified-type-def type-id='type-id-78' volatile='yes' id='type-id-2491'/>
     <pointer-type-def type-id='type-id-2491' size-in-bits='64' id='type-id-2490'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='codecvt_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='codecvt_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
@@ -38399,7 +38399,7 @@
       <return type-id='type-id-511'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='collate_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='collate_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
@@ -38430,12 +38430,12 @@
       <return type-id='type-id-511'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ctype_configure_char.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='ctype_configure_char.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='ctype_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='ctype_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='ctype_byname&lt;char&gt;' size-in-bits='4608' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1484' column='1' id='type-id-2492'>
@@ -38512,7 +38512,7 @@
       <return type-id='type-id-138'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='messages_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='messages_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
     </namespace-decl>
@@ -38523,7 +38523,7 @@
       <return type-id='type-id-149'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='monetary_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='monetary_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
@@ -38534,12 +38534,12 @@
       <return type-id='type-id-149'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='numeric_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='numeric_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='time_members.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='time_members.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
@@ -38560,7 +38560,7 @@
       <return type-id='type-id-511'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='basic_file.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='basic_file.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='numeric_limits&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1121' column='1' id='type-id-2495'>
@@ -38787,7 +38787,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='c++locale.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='c++locale.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__convert_to_v&lt;float&gt;' mangled-name='_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98/c++locale.cc' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt14__convert_to_vIfEvPKcRT_RSt12_Ios_IostateRKP15__locale_struct@@GLIBCXX_3.4'>
@@ -39092,12 +39092,12 @@
       <return type-id='type-id-945'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/allocator-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/allocator-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/concept-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/concept-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='iterator_traits&lt;const char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='187' column='1' id='type-id-776'>
@@ -39750,7 +39750,7 @@
     <pointer-type-def type-id='type-id-2542' size-in-bits='64' id='type-id-2543'/>
     <pointer-type-def type-id='type-id-2544' size-in-bits='64' id='type-id-2545'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ext-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ext-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
     <namespace-decl name='__gnu_cxx'>
       <namespace-decl name='__detail'>
@@ -40788,7 +40788,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-2676' size-in-bits='64' id='type-id-2624'/>
     <pointer-type-def type-id='type-id-2609' size-in-bits='64' id='type-id-2617'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ios-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__check_facet&lt;std::ctype&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_ios.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -40847,7 +40847,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/iostream-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/iostream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <class-decl name='_Setfill&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='153' column='1' id='type-id-2681'>
@@ -40960,7 +40960,7 @@
 
     <pointer-type-def type-id='type-id-2683' size-in-bits='64' id='type-id-2684'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/istream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='operator~' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ios_base.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -41138,7 +41138,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/locale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__iterator_category&lt;const char*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -41957,7 +41957,7 @@
     </function-decl>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/misc-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/misc-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='getline&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/basic_string.h' line='2790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7getlineIcSt11char_traitsIcESaIcEERSt13basic_istreamIT_T0_ES7_RSbIS4_S5_T1_E@@GLIBCXX_3.4'>
@@ -42004,7 +42004,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ostream-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/ostream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__ostream_write&lt;char, std::char_traits&lt;char&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/ostream_insert.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -42190,7 +42190,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/sstream-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/sstream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='max&lt;long unsigned int&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_algobase.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -42712,14 +42712,14 @@
     <qualified-type-def type-id='type-id-2783' const='yes' id='type-id-2803'/>
     <pointer-type-def type-id='type-id-2803' size-in-bits='64' id='type-id-2788'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/streambuf-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
 
     <qualified-type-def type-id='type-id-39' const='yes' id='type-id-2804'/>
     <qualified-type-def type-id='type-id-123' const='yes' id='type-id-2805'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/wlocale-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/wlocale-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <function-decl name='__iterator_category&lt;const wchar_t*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_iterator_base_types.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -43278,7 +43278,7 @@
     <pointer-type-def type-id='type-id-2851' size-in-bits='64' id='type-id-2841'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/parallel_settings.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/parallel_settings.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++98' language='LANG_C_plus_plus'>
 
 
     <namespace-decl name='__gnu_parallel'>
@@ -43498,7 +43498,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-2852' size-in-bits='64' id='type-id-2861'/>
     <pointer-type-def type-id='type-id-2852' size-in-bits='64' id='type-id-2862'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/chrono.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/chrono.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <function-decl name='duration_cast&lt;std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt;, long int, std::ratio&lt;1l&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -43555,7 +43555,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/condition_variable.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/condition_variable.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -43628,7 +43628,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-2879' size-in-bits='64' id='type-id-2877'/>
     <reference-type-def kind='lvalue' type-id='type-id-2875' size-in-bits='64' id='type-id-2878'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/debug.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/debug.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='__gnu_debug'>
       <class-decl name='_Safe_iterator_base' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='51' column='1' id='type-id-2880'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -44436,7 +44436,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functexcept.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functexcept.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -46347,10 +46347,10 @@
     <qualified-type-def type-id='type-id-3075' const='yes' id='type-id-3138'/>
     <qualified-type-def type-id='type-id-3072' const='yes' id='type-id-3139'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functional.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functional.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -46412,7 +46412,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hash_c++0x.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hash_c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='hash&lt;long double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='193' column='1' id='type-id-3145'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3146'/>
@@ -46429,14 +46429,14 @@
     <qualified-type-def type-id='type-id-3145' const='yes' id='type-id-3148'/>
     <pointer-type-def type-id='type-id-3148' size-in-bits='64' id='type-id-3147'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hashtable_c++0x.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hashtable_c++0x.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <namespace-decl name='__detail'>
         <var-decl name='__prime_list' type-id='type-id-2290' mangled-name='_ZNSt8__detail12__prime_listE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/../shared/hashtable-aux.cc' line='30' column='1' elf-symbol-id='_ZNSt8__detail12__prime_listE@@GLIBCXX_3.4.10'/>
       </namespace-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/limits.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/limits.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
       <class-decl name='__numeric_limits_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='192' column='1' id='type-id-3149'>
         <data-member access='public' static='yes'>
@@ -47576,7 +47576,7 @@
       </class-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/mutex.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/mutex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -47590,7 +47590,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/placeholders.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/placeholders.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
       <namespace-decl name='placeholders'>
@@ -47684,7 +47684,7 @@
     <qualified-type-def type-id='type-id-3221' const='yes' id='type-id-3192'/>
     <qualified-type-def type-id='type-id-3222' const='yes' id='type-id-3193'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/regex.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/regex.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -47747,7 +47747,7 @@
     <qualified-type-def type-id='type-id-3223' const='yes' id='type-id-3226'/>
     <pointer-type-def type-id='type-id-3226' size-in-bits='64' id='type-id-3225'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/shared_ptr.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/shared_ptr.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -47788,7 +47788,7 @@
     <pointer-type-def type-id='type-id-3230' size-in-bits='64' id='type-id-3229'/>
     <pointer-type-def type-id='type-id-3227' size-in-bits='64' id='type-id-3228'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/system_error.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/system_error.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -47805,7 +47805,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/thread.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/thread.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -47845,7 +47845,7 @@
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/fstream-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/fstream-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -48885,7 +48885,7 @@
     <pointer-type-def type-id='type-id-3274' size-in-bits='64' id='type-id-3263'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/string-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/string-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
@@ -48961,7 +48961,7 @@
     <qualified-type-def type-id='type-id-154' const='yes' id='type-id-3278'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/wstring-inst.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/wstring-inst.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
 
 
diff --git a/tests/data/test-read-dwarf/test3.so.abi b/tests/data/test-read-dwarf/test3.so.abi
index e1ff9d70..7357a740 100644
--- a/tests/data/test-read-dwarf/test3.so.abi
+++ b/tests/data/test-read-dwarf/test3.so.abi
@@ -10,7 +10,7 @@
     <elf-symbol name='foo' type='func-type' binding='weak-binding' visibility='default-visibility' alias='foo__,__foo__,__foo' is-defined='yes'/>
     <elf-symbol name='foo__' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test3.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='test3.c' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C89'>
     <type-decl name='void' id='type-id-1'/>
     <function-decl name='__foo' mangled-name='foo' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test3.c' line='8' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='foo'>
       <return type-id='type-id-1'/>
diff --git a/tests/data/test-read-dwarf/test4.so.abi b/tests/data/test-read-dwarf/test4.so.abi
index 51cb2070..f7db6f38 100644
--- a/tests/data/test-read-dwarf/test4.so.abi
+++ b/tests/data/test-read-dwarf/test4.so.abi
@@ -5,7 +5,7 @@
   <elf-function-symbols>
     <elf-symbol name='cpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test4.c' language='LANG_C89'>
+  <abi-instr version='1.0' address-size='64' path='test4.c' comp-dir-path='/home/mark/src/tests' language='LANG_C89'>
     <type-decl name='char' size-in-bits='8' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
     <qualified-type-def type-id='type-id-2' restrict='yes' id='type-id-3'/>
diff --git a/tests/data/test-read-dwarf/test5.o.abi b/tests/data/test-read-dwarf/test5.o.abi
index 1c62a3bf..feee01ff 100644
--- a/tests/data/test-read-dwarf/test5.o.abi
+++ b/tests/data/test-read-dwarf/test5.o.abi
@@ -2,7 +2,7 @@
   <elf-function-symbols>
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test.cc' comp-dir-path='/home/dodji/libabigailtests' language='LANG_C_plus_plus'>
     <type-decl name='void' id='type-id-1'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
     <function-decl name='bar' mangled-name='_Z3barPv' filepath='/home/dodji/libabigailtests/test.cc' line='2' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3barPv'>
diff --git a/tests/data/test-read-dwarf/test6.so.abi b/tests/data/test-read-dwarf/test6.so.abi
index fa50f1d2..d3baea6d 100644
--- a/tests/data/test-read-dwarf/test6.so.abi
+++ b/tests/data/test-read-dwarf/test6.so.abi
@@ -16,7 +16,7 @@
     <elf-symbol name='_ZN1CIiE3barE' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZZN1B3fooEvE1a' size='4' type='object-type' binding='gnu-unique-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='test6.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test6.cc' comp-dir-path='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <class-decl name='B' size-in-bits='8' is-struct='yes' visibility='default' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test6.cc' line='9' column='1' id='type-id-1'>
       <member-function access='public'>
         <function-decl name='foo' mangled-name='_ZN1B3fooEv' filepath='/home/skumari/Tasks/source_repo/dodji/libabigail/tests/data/test-read-dwarf/test6.cc' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN1B3fooEv'>
diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi
index 66290c6f..bc919a82 100644
--- a/tests/data/test-read-dwarf/test7.so.abi
+++ b/tests/data/test-read-dwarf/test7.so.abi
@@ -2,7 +2,7 @@
   <elf-function-symbols>
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test7.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test7.cc' comp-dir-path='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <type-decl name='int' size-in-bits='32' id='type-id-1'/>
     <class-decl name='S' size-in-bits='2304' is-struct='yes' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='1' column='1' id='type-id-2'>
       <data-member access='public' layout-offset-in-bits='0'>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
index 38483896..ec4a1ce3 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
@@ -10,7 +10,7 @@
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
-  <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='test8-qualified-this-pointer.cc' comp-dir-path='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf' language='LANG_C_plus_plus'>
     <class-decl name='S' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf/test8-qualified-this-pointer.cc' line='1' column='1' id='type-id-1'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='i' type-id='type-id-2' visibility='default' filepath='/home/dodji/git/libabigail/master/tests/data/test-read-dwarf/test8-qualified-this-pointer.cc' line='3' column='1'/>
diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index d9cf5371..fb620ac0 100644
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -346,7 +346,7 @@
     <elf-symbol name='_ZTVN5boost6system12system_errorE' size='40' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_ZTVN5boost6system14error_categoryE' size='72' type='object-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <function-decl name='codecvt_error_category' mangled-name='_ZN5boost10filesystem22codecvt_error_categoryEv' filepath='src/third_party/boost-1.56.0/libs/filesystem/src/codecvt_error_category.cpp' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem22codecvt_error_categoryEv'>
@@ -2000,7 +2000,7 @@
       </class-decl>
     </namespace-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/operations.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
@@ -5849,7 +5849,7 @@
     </namespace-decl>
     <qualified-type-def type-id='type-id-336' const='yes' id='type-id-400'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
@@ -6326,7 +6326,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-406'/>
     <reference-type-def kind='lvalue' type-id='type-id-443' size-in-bits='64' id='type-id-405'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/path_traits.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
     <namespace-decl name='std'>
 
@@ -6518,7 +6518,7 @@
     <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-458'/>
     <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/portability.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
     <namespace-decl name='std'>
 
@@ -6565,7 +6565,7 @@
 
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/unique_path.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
@@ -6730,7 +6730,7 @@
     <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-485'/>
     <reference-type-def kind='lvalue' type-id='type-id-479' size-in-bits='64' id='type-id-486'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/utf8_codecvt_facet.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
@@ -6994,7 +6994,7 @@
     <qualified-type-def type-id='type-id-503' const='yes' id='type-id-501'/>
 
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' language='LANG_C_plus_plus'>
+  <abi-instr version='1.0' address-size='64' path='src/third_party/boost-1.56.0/libs/filesystem/src/windows_file_codecvt.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
 
   </abi-instr>