--- /srv/buildbot/worker/libabigail-centos-x86_64/build/libabigail-1.8/_build/../tests/data/test-annotate/test21-pr19092.so.abi	2020-07-28 15:08:06.000000000 +0000
+++ /srv/buildbot/worker/libabigail-centos-x86_64/build/libabigail-1.8/_build/tests/output/test-annotate/test21-pr19092.so.abi	2020-10-27 09:41:13.487429350 +0000
@@ -2700,7 +2700,7 @@
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
     <!-- struct {const char* format_spec; va_list* args_ptr; int err_no; location_t* locus; void** x_data;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/pretty-print.h' line='34' column='1' id='type-id-153'>
+    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/pretty-print.h' line='34' column='1' id='type-id-96'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* format_spec -->
         <var-decl name='format_spec' type-id='type-id-1' visibility='default' filepath='../.././gcc/pretty-print.h' line='35' column='1'/>
@@ -2723,17 +2723,17 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__1 expanded_location -->
-    <typedef-decl name='expanded_location' type-id='type-id-154' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-155'/>
+    <typedef-decl name='expanded_location' type-id='type-id-153' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-154'/>
     <!-- const line_map** -->
-    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-155'/>
     <!-- line_map* -->
     <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-149'/>
     <!-- line_maps* -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-156'/>
     <!-- typedef size_t (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-151'/>
     <!-- void* (void*, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-150'/>
     <!-- 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'>
       <!-- parameter of type 'diagnostic_context*' -->
@@ -3059,13 +3059,13 @@
     <!-- source_location linemap_resolve_location(line_maps*, source_location, location_resolution_kind, const line_map**) -->
     <function-decl name='linemap_resolve_location' mangled-name='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map' filepath='../.././gcc/../libcpp/include/line-map.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-156'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- parameter of type 'enum location_resolution_kind' -->
       <parameter type-id='type-id-152'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-156'/>
+      <parameter type-id='type-id-155'/>
       <!-- typedef source_location -->
       <return type-id='type-id-99'/>
     </function-decl>
@@ -3093,7 +3093,7 @@
     <!-- int linemap_compare_locations(line_maps*, source_location, source_location) -->
     <function-decl name='linemap_compare_locations' mangled-name='_Z25linemap_compare_locationsP9line_mapsjj' filepath='../.././gcc/../libcpp/include/line-map.h' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25linemap_compare_locationsP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-156'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -3106,7 +3106,7 @@
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-155'/>
+      <return type-id='type-id-154'/>
     </function-decl>
     <!-- unsigned long int concat_length(const char*, ...) -->
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3143,7 +3143,7 @@
     <!-- int linemap_location_in_system_header_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_in_system_header_p' mangled-name='_Z35linemap_location_in_system_header_pP9line_mapsj' filepath='../.././gcc/../libcpp/include/line-map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z35linemap_location_in_system_header_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-156'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- int -->
@@ -3159,14 +3159,14 @@
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- size_t (size_t) -->
-    <function-type size-in-bits='64' id='type-id-158'>
+    <function-type size-in-bits='64' id='type-id-157'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- typedef size_t -->
       <return type-id='type-id-31'/>
     </function-type>
     <!-- void* (void*, size_t) -->
-    <function-type size-in-bits='64' id='type-id-159'>
+    <function-type size-in-bits='64' id='type-id-158'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -3175,7 +3175,7 @@
       <return type-id='type-id-16'/>
     </function-type>
     <!-- struct {const char* file; int line; int column; bool sysp;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-155' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-154'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-154' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-153'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file -->
         <var-decl name='file' type-id='type-id-1' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
@@ -3196,7 +3196,7 @@
   </abi-instr>
   <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-160'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-159'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -3875,7 +3875,7 @@
       <enumerator name='gt_types_enum_last' value='674'/>
     </enum-decl>
     <!-- struct alloc_zone -->
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-161'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-160'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int alloc_zone::dummy -->
         <var-decl name='dummy' type-id='type-id-2' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
@@ -3884,7 +3884,7 @@
     <!-- void* ggc_alloc_typed_stat(gt_types_enum, size_t) -->
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
       <!-- parameter of type 'enum gt_types_enum' -->
-      <parameter type-id='type-id-160' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-159' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- void* -->
@@ -3905,15 +3905,15 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- alloc_zone rtl_zone -->
-    <var-decl name='rtl_zone' type-id='type-id-161' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-160' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
     <!-- alloc_zone tree_zone -->
-    <var-decl name='tree_zone' type-id='type-id-161' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-160' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
     <!-- alloc_zone tree_id_zone -->
-    <var-decl name='tree_id_zone' type-id='type-id-161' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-160' 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/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'>
     <!-- struct {const char* file; int line; int column; bool sysp;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-162'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-161'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file -->
         <var-decl name='file' type-id='type-id-1' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
@@ -3932,7 +3932,7 @@
       </data-member>
     </class-decl>
     <!-- struct linemap_stats -->
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-163'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-162'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int linemap_stats::num_ordinary_maps_allocated -->
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
@@ -3979,48 +3979,48 @@
       </data-member>
     </class-decl>
     <!-- linemap_stats* -->
-    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-163'/>
     <!-- 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'>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- line_maps* line_table -->
-    <var-decl name='line_table' type-id='type-id-157' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-156' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <!-- location_t input_location -->
     <var-decl name='input_location' type-id='type-id-74' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
     <!-- expanded_location linemap_expand_location(line_maps*, const line_map*, source_location) -->
     <function-decl name='linemap_expand_location' mangled-name='_Z23linemap_expand_locationP9line_mapsPK8line_mapj' filepath='../.././gcc/../libcpp/include/line-map.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23linemap_expand_locationP9line_mapsPK8line_mapj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-156'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-47'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-155'/>
+      <return type-id='type-id-154'/>
     </function-decl>
     <!-- void linemap_get_statistics(line_maps*, linemap_stats*) -->
     <function-decl name='linemap_get_statistics' mangled-name='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats' filepath='../.././gcc/../libcpp/include/line-map.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-156'/>
       <!-- parameter of type 'linemap_stats*' -->
-      <parameter type-id='type-id-164'/>
+      <parameter type-id='type-id-163'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
   </abi-instr>
   <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'>
     <!-- wchar_t -->
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-165'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-164'/>
     <!-- typedef int nl_item -->
-    <typedef-decl name='nl_item' type-id='type-id-2' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-166'/>
+    <typedef-decl name='nl_item' type-id='type-id-2' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-165'/>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-165' const='yes' id='type-id-167'/>
+    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-166'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
+    <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-167'/>
     <!-- wchar_t* -->
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-168'/>
     <!-- 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'>
       <!-- parameter of type 'const char*' -->
@@ -4071,7 +4071,7 @@
     <!-- char* nl_langinfo(nl_item) -->
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef nl_item' -->
-      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-165'/>
       <!-- char* -->
       <return type-id='type-id-50'/>
     </function-decl>
@@ -4087,7 +4087,7 @@
     <!-- size_t mbstowcs(wchar_t*, const char*, size_t) -->
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-169'/>
+      <parameter type-id='type-id-168'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4098,7 +4098,7 @@
     <!-- int wcswidth(const wchar_t*, size_t) -->
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-168'/>
+      <parameter type-id='type-id-167'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- int -->
@@ -4118,15 +4118,15 @@
   </abi-instr>
   <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'>
     <!-- typedef void* iconv_t -->
-    <typedef-decl name='iconv_t' type-id='type-id-16' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-170'/>
+    <typedef-decl name='iconv_t' type-id='type-id-16' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-169'/>
     <!-- const pretty_printer -->
-    <qualified-type-def type-id='type-id-95' const='yes' id='type-id-171'/>
+    <qualified-type-def type-id='type-id-95' const='yes' id='type-id-170'/>
     <!-- const pretty_printer* -->
-    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-171'/>
     <!-- size_t* -->
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-173'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-172'/>
     <!-- void* (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-173' size-in-bits='64' id='type-id-174'/>
     <!-- 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'>
       <!-- parameter of type 'pretty_printer*' -->
@@ -4160,7 +4160,7 @@
     <!-- const char* pp_base_last_position_in_text(const pretty_printer*) -->
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
       <!-- parameter of type 'const pretty_printer*' -->
-      <parameter type-id='type-id-172' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-171' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -4239,7 +4239,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void* (typedef size_t)* identifier_to_locale_alloc -->
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-175' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-174' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <!-- void (void*)* identifier_to_locale_free -->
     <var-decl name='identifier_to_locale_free' type-id='type-id-139' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <!-- char* xstrerror(int) -->
@@ -4273,22 +4273,22 @@
     <!-- size_t iconv(iconv_t, char**, size_t*, char**, size_t*) -->
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-169'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-119'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-172'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-119'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-172'/>
       <!-- typedef size_t -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int iconv_close(iconv_t) -->
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-169'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
@@ -4299,10 +4299,10 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- typedef iconv_t -->
-      <return type-id='type-id-170'/>
+      <return type-id='type-id-169'/>
     </function-decl>
     <!-- void* (size_t) -->
-    <function-type size-in-bits='64' id='type-id-174'>
+    <function-type size-in-bits='64' id='type-id-173'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- void* -->
@@ -4311,27 +4311,27 @@
   </abi-instr>
   <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'>
     <!-- struct symbol_stack_entry -->
-    <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-176'>
+    <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-175'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- symbol* symbol_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-177' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-176' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- symbol_stack_entry* symbol_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-178' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-177' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef symbol_hash_entry symbol -->
-    <typedef-decl name='symbol' type-id='type-id-179' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-180'/>
+    <typedef-decl name='symbol' type-id='type-id-178' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-179'/>
     <!-- struct symbol_hash_entry -->
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-179'>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-178'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* symbol_hash_entry::key -->
         <var-decl name='key' type-id='type-id-1' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_hash_entry* symbol_hash_entry::file -->
-        <var-decl name='file' type-id='type-id-181' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-180' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int symbol_hash_entry::chosen -->
@@ -4347,7 +4347,7 @@
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry -->
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-182'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-181'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file_hash_entry::key -->
         <var-decl name='key' type-id='type-id-1' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
@@ -4370,55 +4370,55 @@
       </data-member>
     </class-decl>
     <!-- struct file_stack_entry -->
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-183'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-182'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- file* file_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-184' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-183' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_stack_entry* file_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-185' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-184' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef file_hash_entry file -->
-    <typedef-decl name='file' type-id='type-id-182' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-186'/>
+    <typedef-decl name='file' type-id='type-id-181' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-185'/>
     <!-- typedef unsigned int hashval_t -->
-    <typedef-decl name='hashval_t' type-id='type-id-15' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-187'/>
+    <typedef-decl name='hashval_t' type-id='type-id-15' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-186'/>
     <!-- typedef htab* htab_t -->
-    <typedef-decl name='htab_t' type-id='type-id-188' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-189'/>
+    <typedef-decl name='htab_t' type-id='type-id-187' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-188'/>
     <!-- typedef typedef hashval_t (void*)* htab_hash -->
-    <typedef-decl name='htab_hash' type-id='type-id-190' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-191'/>
+    <typedef-decl name='htab_hash' type-id='type-id-189' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-190'/>
     <!-- typedef int (void*, void*)* htab_eq -->
-    <typedef-decl name='htab_eq' type-id='type-id-192' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-193'/>
+    <typedef-decl name='htab_eq' type-id='type-id-191' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-192'/>
     <!-- typedef void (void*)* htab_del -->
-    <typedef-decl name='htab_del' type-id='type-id-139' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-194'/>
+    <typedef-decl name='htab_del' type-id='type-id-139' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-193'/>
     <!-- typedef void* (typedef size_t, typedef size_t)* htab_alloc -->
-    <typedef-decl name='htab_alloc' type-id='type-id-195' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-196'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-194' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-195'/>
     <!-- typedef void (void*)* htab_free -->
-    <typedef-decl name='htab_free' type-id='type-id-139' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-197'/>
+    <typedef-decl name='htab_free' type-id='type-id-139' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-196'/>
     <!-- typedef void* (void*, typedef size_t, typedef size_t)* htab_alloc_with_arg -->
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-198' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-199'/>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-197' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-198'/>
     <!-- typedef void (void*, void*)* htab_free_with_arg -->
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-200' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-201'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-199' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-200'/>
     <!-- enum insert_option -->
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-202'>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-201'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
     </enum-decl>
     <!-- struct htab -->
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-203'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libcpp/../include/hashtab.h' line='100' column='1' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- htab_hash htab::hash_f -->
-        <var-decl name='hash_f' type-id='type-id-191' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-190' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- htab_eq htab::eq_f -->
-        <var-decl name='eq_f' type-id='type-id-193' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-192' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- htab_del htab::del_f -->
-        <var-decl name='del_f' type-id='type-id-194' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-193' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void** htab::entries -->
@@ -4446,11 +4446,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- htab_alloc htab::alloc_f -->
-        <var-decl name='alloc_f' type-id='type-id-196' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-195' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- htab_free htab::free_f -->
-        <var-decl name='free_f' type-id='type-id-197' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-196' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- void* htab::alloc_arg -->
@@ -4458,11 +4458,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- htab_alloc_with_arg htab::alloc_with_arg_f -->
-        <var-decl name='alloc_with_arg_f' type-id='type-id-199' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-198' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- htab_free_with_arg htab::free_with_arg_f -->
-        <var-decl name='free_with_arg_f' type-id='type-id-201' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-200' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- unsigned int htab::size_prime_index -->
@@ -4470,52 +4470,52 @@
       </data-member>
     </class-decl>
     <!-- file* -->
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-183'/>
     <!-- file_hash_entry* -->
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-180'/>
     <!-- file_stack_entry* -->
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-184'/>
     <!-- htab* -->
-    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-187'/>
     <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-192'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-191'/>
     <!-- symbol* -->
-    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-177'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-176'/>
     <!-- symbol_stack_entry* -->
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-178'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-177'/>
     <!-- typedef hashval_t (void*)* -->
-    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-189'/>
     <!-- void (void*, void*)* -->
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-200'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-199'/>
     <!-- void* (typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-194'/>
     <!-- void* (void*, typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-197'/>
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-57' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <!-- symbol_stack_entry* symbol_stack -->
-    <var-decl name='symbol_stack' type-id='type-id-178' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <var-decl name='symbol_stack' type-id='type-id-177' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <!-- obstack file_stack_obstack -->
     <var-decl name='file_stack_obstack' type-id='type-id-57' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
     <!-- file_stack_entry* file_stack -->
-    <var-decl name='file_stack' type-id='type-id-185' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <var-decl name='file_stack' type-id='type-id-184' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
     <!-- hashval_t htab_hash_string(void*) -->
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-186'/>
     </function-decl>
     <!-- void** htab_find_slot_with_hash(htab_t, void*, hashval_t, insert_option) -->
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-188'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-186'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-202'/>
+      <parameter type-id='type-id-201'/>
       <!-- void** -->
       <return type-id='type-id-143'/>
     </function-decl>
@@ -4564,13 +4564,13 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-191'/>
+      <parameter type-id='type-id-190'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-192'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-194'/>
+      <parameter type-id='type-id-193'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-189'/>
+      <return type-id='type-id-188'/>
     </function-decl>
     <!-- char* getpwd() -->
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4596,7 +4596,7 @@
       <return type-id='type-id-50'/>
     </function-decl>
     <!-- int (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-204'>
+    <function-type size-in-bits='64' id='type-id-203'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'void*' -->
@@ -4605,14 +4605,14 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hashval_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-205'>
+    <function-type size-in-bits='64' id='type-id-204'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-186'/>
     </function-type>
     <!-- void (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-206'>
+    <function-type size-in-bits='64' id='type-id-205'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'void*' -->
@@ -4621,7 +4621,7 @@
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void* (size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-207'>
+    <function-type size-in-bits='64' id='type-id-206'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4630,7 +4630,7 @@
       <return type-id='type-id-16'/>
     </function-type>
     <!-- void* (void*, size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-208'>
+    <function-type size-in-bits='64' id='type-id-207'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4821,89 +4821,89 @@
   </abi-instr>
   <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'>
     <!-- const char[31] -->
-    <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='248' id='type-id-209'>
+    <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='248' id='type-id-208'>
       <!-- <anonymous range>[31] -->
-      <subrange length='31' type-id='type-id-6' id='type-id-210'/>
+      <subrange length='31' type-id='type-id-6' id='type-id-209'/>
     </array-type-def>
     <!-- const char[6] -->
-    <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='48' id='type-id-211'>
+    <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='48' id='type-id-210'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-6' id='type-id-212'/>
+      <subrange length='6' type-id='type-id-6' id='type-id-211'/>
     </array-type-def>
     <!-- const char[7] -->
-    <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='56' id='type-id-213'>
+    <array-type-def dimensions='1' type-id='type-id-121' size-in-bits='56' id='type-id-212'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-6' id='type-id-214'/>
+      <subrange length='7' type-id='type-id-6' id='type-id-213'/>
     </array-type-def>
     <!-- const char version_string[6] -->
-    <var-decl name='version_string' type-id='type-id-211' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
+    <var-decl name='version_string' type-id='type-id-210' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
     <!-- const char pkgversion_string[7] -->
-    <var-decl name='pkgversion_string' type-id='type-id-213' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <var-decl name='pkgversion_string' type-id='type-id-212' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
     <!-- const char bug_report_url[31] -->
-    <var-decl name='bug_report_url' type-id='type-id-209' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <var-decl name='bug_report_url' type-id='type-id-208' 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/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'>
     <!-- const uchar** -->
-    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void _cpp_destroy_iconv(cpp_reader*) -->
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- cppchar_t cpp_host_to_exec_charset(cpp_reader*, cppchar_t) -->
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- parameter of type 'typedef cppchar_t' -->
-      <parameter type-id='type-id-218' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-217' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-218'/>
+      <return type-id='type-id-217'/>
     </function-decl>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const uchar**, const uchar*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar**' -->
-      <parameter type-id='type-id-216' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-215' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-215' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-214' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-219' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <parameter type-id='type-id-218' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-218'/>
+      <return type-id='type-id-217'/>
     </function-decl>
     <!-- bool cpp_interpret_string(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-219'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-220'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-221'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-215' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-214' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- cpp_hashnode* -->
@@ -4912,21 +4912,21 @@
     <!-- uchar* _cpp_convert_input(cpp_reader*, const char*, uchar*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-223' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-222' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-224' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-223' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-225' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-224' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-223'/>
+      <return type-id='type-id-222'/>
     </function-decl>
     <!-- const char* _cpp_default_encoding() -->
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
@@ -4936,13 +4936,13 @@
   </abi-instr>
   <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'>
     <!-- typedef void (cpp_reader*)* pragma_cb -->
-    <typedef-decl name='pragma_cb' type-id='type-id-226' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-227'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-225' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-226'/>
     <!-- typedef cpp_options cpp_options -->
-    <typedef-decl name='cpp_options' type-id='type-id-228' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-229'/>
+    <typedef-decl name='cpp_options' type-id='type-id-227' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-228'/>
     <!-- typedef cpp_callbacks cpp_callbacks -->
-    <typedef-decl name='cpp_callbacks' type-id='type-id-230' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-231'/>
+    <typedef-decl name='cpp_callbacks' type-id='type-id-229' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-230'/>
     <!-- enum include_type -->
-    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-232'>
+    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-231'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='IT_INCLUDE' value='0'/>
       <enumerator name='IT_INCLUDE_NEXT' value='1'/>
@@ -4950,28 +4950,28 @@
       <enumerator name='IT_CMDLINE' value='3'/>
     </enum-decl>
     <!-- typedef int (cpp_reader*, cpp_hashnode*, void*)* cpp_cb -->
-    <typedef-decl name='cpp_cb' type-id='type-id-233' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-234'/>
+    <typedef-decl name='cpp_cb' type-id='type-id-232' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-233'/>
     <!-- cpp_callbacks* -->
-    <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-235'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-234'/>
     <!-- cpp_options* -->
-    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-235'/>
     <!-- cpp_string* -->
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-221'/>
+    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-220'/>
     <!-- int (cpp_reader*, cpp_hashnode*, void*)* -->
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-232'/>
     <!-- unsigned int* -->
-    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-15' size-in-bits='64' id='type-id-238'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void _cpp_do_file_change(cpp_reader*, lc_reason, const char*, linenum_type, unsigned int) -->
     <function-decl name='_cpp_do_file_change' mangled-name='_cpp_do_file_change' filepath='../.././libcpp/directives.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do_file_change'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-104' name='reason' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -4986,13 +4986,13 @@
     <!-- void cpp_register_pragma(cpp_reader*, const char*, const char*, pragma_cb, bool) -->
     <function-decl name='cpp_register_pragma' mangled-name='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb' filepath='../.././libcpp/directives.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='space' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'typedef pragma_cb' -->
-      <parameter type-id='type-id-227' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
+      <parameter type-id='type-id-226' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-3' name='allow_expansion' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- void -->
@@ -5001,7 +5001,7 @@
     <!-- void cpp_register_deferred_pragma(cpp_reader*, const char*, const char*, unsigned int, bool, bool) -->
     <function-decl name='cpp_register_deferred_pragma' mangled-name='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb' filepath='../.././libcpp/directives.c' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='space' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -5018,21 +5018,21 @@
     <!-- void _cpp_init_internal_pragmas(cpp_reader*) -->
     <function-decl name='_cpp_init_internal_pragmas' mangled-name='_cpp_init_internal_pragmas' filepath='../.././libcpp/directives.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_internal_pragmas'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- char** _cpp_save_pragma_names(cpp_reader*) -->
     <function-decl name='_cpp_save_pragma_names' mangled-name='_cpp_save_pragma_names' filepath='../.././libcpp/directives.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
       <!-- char** -->
       <return type-id='type-id-119'/>
     </function-decl>
     <!-- void _cpp_restore_pragma_names(cpp_reader*, char**) -->
     <function-decl name='_cpp_restore_pragma_names' mangled-name='_cpp_restore_pragma_names' filepath='../.././libcpp/directives.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_restore_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-119' name='saved' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- void -->
@@ -5041,59 +5041,59 @@
     <!-- int _cpp_test_assertion(cpp_reader*, unsigned int*) -->
     <function-decl name='_cpp_test_assertion' mangled-name='_cpp_test_assertion' filepath='../.././libcpp/directives.c' line='2225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_test_assertion'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-239' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-238' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- cpp_options* cpp_get_options(cpp_reader*) -->
     <function-decl name='cpp_get_options' mangled-name='_Z15cpp_get_optionsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_get_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
       <!-- cpp_options* -->
-      <return type-id='type-id-236'/>
+      <return type-id='type-id-235'/>
     </function-decl>
     <!-- cpp_callbacks* cpp_get_callbacks(cpp_reader*) -->
     <function-decl name='cpp_get_callbacks' mangled-name='_Z17cpp_get_callbacksP10cpp_reader' filepath='../.././libcpp/directives.c' line='2499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_get_callbacksP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
       <!-- cpp_callbacks* -->
-      <return type-id='type-id-235'/>
+      <return type-id='type-id-234'/>
     </function-decl>
     <!-- void cpp_set_callbacks(cpp_reader*, cpp_callbacks*) -->
     <function-decl name='cpp_set_callbacks' mangled-name='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks' filepath='../.././libcpp/directives.c' line='2506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- parameter of type 'cpp_callbacks*' -->
-      <parameter type-id='type-id-235' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-234' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- deps* cpp_get_deps(cpp_reader*) -->
     <function-decl name='cpp_get_deps' mangled-name='_Z12cpp_get_depsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_depsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
       <!-- deps* -->
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const uchar*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/directives.c' line='2524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_push_bufferP10cpp_readerPKhmi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-215' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-214' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='from_stage3' filepath='../.././libcpp/directives.c' line='2525' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-241'/>
+      <return type-id='type-id-240'/>
     </function-decl>
     <!-- void cpp_unassert(cpp_reader*, const char*) -->
     <function-decl name='cpp_unassert' mangled-name='_Z12cpp_unassertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_unassertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5102,7 +5102,7 @@
     <!-- void cpp_assert(cpp_reader*, const char*) -->
     <function-decl name='cpp_assert' mangled-name='_Z10cpp_assertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_assertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5111,7 +5111,7 @@
     <!-- void cpp_undef(cpp_reader*, const char*) -->
     <function-decl name='cpp_undef' mangled-name='_Z9cpp_undefP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_undefP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5120,7 +5120,7 @@
     <!-- void _cpp_define_builtin(cpp_reader*, const char*) -->
     <function-decl name='_cpp_define_builtin' mangled-name='_cpp_define_builtin' filepath='../.././libcpp/directives.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_define_builtin'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5129,7 +5129,7 @@
     <!-- void cpp_define(cpp_reader*, const char*) -->
     <function-decl name='cpp_define' mangled-name='_Z10cpp_defineP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_defineP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5138,7 +5138,7 @@
     <!-- void cpp_define_formatted(cpp_reader*, const char*, ...) -->
     <function-decl name='cpp_define_formatted' mangled-name='_Z20cpp_define_formattedP10cpp_readerPKcz' filepath='../.././libcpp/directives.c' line='2364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_define_formattedP10cpp_readerPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fmt' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter is-variadic='yes'/>
@@ -5148,16 +5148,16 @@
     <!-- void _cpp_init_directives(cpp_reader*) -->
     <function-decl name='_cpp_init_directives' mangled-name='_cpp_init_directives' filepath='../.././libcpp/directives.c' line='2580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_directives'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- cpp_hashnode* cpp_lookup(cpp_reader*, const unsigned char*, unsigned int) -->
     <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/include/cpplib.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15'/>
       <!-- cpp_hashnode* -->
@@ -5166,16 +5166,16 @@
     <!-- unsigned char* cpp_output_line_to_string(cpp_reader*, const unsigned char*) -->
     <function-decl name='cpp_output_line_to_string' mangled-name='_Z25cpp_output_line_to_stringP10cpp_readerPKh' filepath='../.././libcpp/include/cpplib.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_output_line_to_stringP10cpp_readerPKh'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- bool cpp_warning_with_line_syshdr(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line_syshdr' mangled-name='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -5191,7 +5191,7 @@
     <!-- bool _cpp_parse_expr(cpp_reader*, bool) -->
     <function-decl name='_cpp_parse_expr' mangled-name='_cpp_parse_expr' filepath='../.././libcpp/internal.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_parse_expr'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-3'/>
       <!-- bool -->
@@ -5200,9 +5200,9 @@
     <!-- void _cpp_overlay_buffer(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' filepath='../.././libcpp/internal.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- void -->
@@ -5222,20 +5222,20 @@
     <!-- bool _cpp_stack_include(cpp_reader*, const char*, int, include_type) -->
     <function-decl name='_cpp_stack_include' mangled-name='_cpp_stack_include' filepath='../.././libcpp/internal.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'enum include_type' -->
-      <parameter type-id='type-id-232'/>
+      <parameter type-id='type-id-231'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int _cpp_compare_file_date(cpp_reader*, const char*, int) -->
     <function-decl name='_cpp_compare_file_date' mangled-name='_cpp_compare_file_date' filepath='../.././libcpp/internal.h' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_compare_file_date'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
@@ -5246,7 +5246,7 @@
     <!-- cpp_hashnode* _cpp_lex_identifier(cpp_reader*, const char*) -->
     <function-decl name='_cpp_lex_identifier' mangled-name='_cpp_lex_identifier' filepath='../.././libcpp/internal.h' line='655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- cpp_hashnode* -->
@@ -5255,16 +5255,16 @@
     <!-- void _cpp_mark_file_once_only(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_mark_file_once_only' mangled-name='_cpp_mark_file_once_only' filepath='../.././libcpp/internal.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_mark_file_once_only'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-243'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void cpp_make_system_header(cpp_reader*, int, int) -->
     <function-decl name='cpp_make_system_header' mangled-name='_Z22cpp_make_system_headerP10cpp_readerii' filepath='../.././libcpp/include/cpplib.h' line='1006' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_make_system_headerP10cpp_readerii'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'int' -->
@@ -5275,9 +5275,9 @@
     <!-- void cpp_forall_identifiers(cpp_reader*, cpp_cb, void*) -->
     <function-decl name='cpp_forall_identifiers' mangled-name='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_' filepath='../.././libcpp/include/cpplib.h' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef cpp_cb' -->
-      <parameter type-id='type-id-234'/>
+      <parameter type-id='type-id-233'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- void -->
@@ -5286,22 +5286,22 @@
     <!-- bool cpp_interpret_string_notranslate(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-219'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-220'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-221'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- void _cpp_fake_include(cpp_reader*, const char*) -->
     <function-decl name='_cpp_fake_include' mangled-name='_cpp_fake_include' filepath='../.././libcpp/internal.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_fake_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5310,14 +5310,14 @@
     <!-- deps* deps_init() -->
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/include/mkdeps.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
       <!-- deps* -->
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <!-- void _cpp_pop_file_buffer(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_pop_file_buffer' mangled-name='_cpp_pop_file_buffer' filepath='../.././libcpp/internal.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_file_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-243'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -5331,9 +5331,9 @@
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int (cpp_reader*, cpp_hashnode*, void*) -->
-    <function-type size-in-bits='64' id='type-id-238'>
+    <function-type size-in-bits='64' id='type-id-237'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile'/>
+      <parameter type-id='type-id-216' name='pfile'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='node'/>
       <!-- parameter of type 'void*' -->
@@ -5346,7 +5346,7 @@
     <!-- 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*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -5367,16 +5367,16 @@
   </abi-instr>
   <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'>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-245' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-246'/>
+    <typedef-decl name='cpp_num' type-id='type-id-244' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-245'/>
     <!-- struct cpp_num -->
-    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-245'>
+    <class-decl name='cpp_num' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='801' column='1' id='type-id-244'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_num_part cpp_num::high -->
-        <var-decl name='high' type-id='type-id-247' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-246' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num_part cpp_num::low -->
-        <var-decl name='low' type-id='type-id-247' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-246' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- bool cpp_num::unsignedp -->
@@ -5388,9 +5388,9 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned long int cpp_num_part -->
-    <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-247'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-28' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-246'/>
     <!-- typedef unsigned int cppchar_t -->
-    <typedef-decl name='cppchar_t' type-id='type-id-15' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-218'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-15' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-217'/>
     <!-- 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*' -->
@@ -5412,120 +5412,120 @@
     <!-- cpp_ttype cpp_userdef_string_remove_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_remove_type' mangled-name='_Z30cpp_userdef_string_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z30cpp_userdef_string_remove_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-222'/>
+      <return type-id='type-id-221'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_string_add_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_add_type' mangled-name='_Z27cpp_userdef_string_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_userdef_string_add_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-222'/>
+      <return type-id='type-id-221'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_char_remove_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_remove_type' mangled-name='_Z28cpp_userdef_char_remove_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_userdef_char_remove_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-222'/>
+      <return type-id='type-id-221'/>
     </function-decl>
     <!-- cpp_ttype cpp_userdef_char_add_type(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_add_type' mangled-name='_Z25cpp_userdef_char_add_type9cpp_ttype' filepath='../.././libcpp/expr.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_userdef_char_add_type9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-222'/>
+      <return type-id='type-id-221'/>
     </function-decl>
     <!-- bool cpp_userdef_string_p(cpp_ttype) -->
     <function-decl name='cpp_userdef_string_p' mangled-name='_Z20cpp_userdef_string_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_userdef_string_p9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- bool cpp_userdef_char_p(cpp_ttype) -->
     <function-decl name='cpp_userdef_char_p' mangled-name='_Z18cpp_userdef_char_p9cpp_ttype' filepath='../.././libcpp/expr.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_userdef_char_p9cpp_ttype'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- const char* cpp_get_userdef_suffix(const cpp_token*) -->
     <function-decl name='cpp_get_userdef_suffix' mangled-name='_Z22cpp_get_userdef_suffixPK9cpp_token' filepath='../.././libcpp/expr.c' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_get_userdef_suffixPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
+      <parameter type-id='type-id-247' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- unsigned int cpp_classify_number(cpp_reader*, const cpp_token*, const char**) -->
     <function-decl name='cpp_classify_number' mangled-name='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc' filepath='../.././libcpp/expr.c' line='364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_classify_numberP10cpp_readerPK9cpp_tokenPPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-247' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-249' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-248' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-15'/>
     </function-decl>
     <!-- cpp_num cpp_interpret_integer(cpp_reader*, const cpp_token*, unsigned int) -->
     <function-decl name='cpp_interpret_integer' mangled-name='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj' filepath='../.././libcpp/expr.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_interpret_integerP10cpp_readerPK9cpp_tokenj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-247' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-246'/>
+      <return type-id='type-id-245'/>
     </function-decl>
     <!-- op* _cpp_expand_op_stack(cpp_reader*) -->
     <function-decl name='_cpp_expand_op_stack' mangled-name='_cpp_expand_op_stack' filepath='../.././libcpp/expr.c' line='1396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expand_op_stack'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
       <!-- op* -->
-      <return type-id='type-id-250'/>
+      <return type-id='type-id-249'/>
     </function-decl>
     <!-- cpp_num cpp_num_sign_extend(cpp_num, size_t) -->
     <function-decl name='cpp_num_sign_extend' mangled-name='_Z19cpp_num_sign_extend7cpp_numm' filepath='../.././libcpp/expr.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_num_sign_extend7cpp_numm'>
       <!-- parameter of type 'typedef cpp_num' -->
-      <parameter type-id='type-id-246' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-245' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-246'/>
+      <return type-id='type-id-245'/>
     </function-decl>
     <!-- cppchar_t cpp_interpret_charconst(cpp_reader*, const cpp_token*, unsigned int*, int*) -->
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/include/cpplib.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-238'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-41'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-218'/>
+      <return type-id='type-id-217'/>
     </function-decl>
   </abi-instr>
   <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'>
     <!-- char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-251'>
+    <array-type-def dimensions='1' type-id='type-id-4' size-in-bits='2048' id='type-id-250'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-6' id='type-id-252'/>
+      <subrange length='256' type-id='type-id-6' id='type-id-251'/>
     </array-type-def>
     <!-- typedef __ssize_t ssize_t -->
-    <typedef-decl name='ssize_t' type-id='type-id-253' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-254'/>
+    <typedef-decl name='ssize_t' type-id='type-id-252' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-253'/>
     <!-- typedef long int __ssize_t -->
-    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-253'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-252'/>
     <!-- typedef __off_t off_t -->
-    <typedef-decl name='off_t' type-id='type-id-53' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-255'/>
+    <typedef-decl name='off_t' type-id='type-id-53' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-254'/>
     <!-- typedef __dirstream DIR -->
-    <typedef-decl name='DIR' type-id='type-id-256' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-257'/>
+    <typedef-decl name='DIR' type-id='type-id-255' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-256'/>
     <!-- struct dirent -->
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-258'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-257'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __ino_t dirent::d_ino -->
         <var-decl name='d_ino' type-id='type-id-63' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
@@ -5544,51 +5544,51 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
         <!-- char dirent::d_name[256] -->
-        <var-decl name='d_name' type-id='type-id-251' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
+        <var-decl name='d_name' type-id='type-id-250' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef int (void*, void*)* __compar_fn_t -->
-    <typedef-decl name='__compar_fn_t' type-id='type-id-192' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-259'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-191' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-258'/>
     <!-- typedef int (void**, void*)* htab_trav -->
-    <typedef-decl name='htab_trav' type-id='type-id-260' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-261'/>
+    <typedef-decl name='htab_trav' type-id='type-id-259' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-260'/>
     <!-- DIR* -->
-    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-261'/>
     <!-- const unsigned char** -->
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-223'/>
     <!-- dirent* -->
-    <pointer-type-def type-id='type-id-258' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-262'/>
     <!-- int (void**, void*)* -->
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-260'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-259'/>
     <!-- off_t* -->
-    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-224'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-244' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
+      <parameter type-id='type-id-243' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- _cpp_file* _cpp_find_file(cpp_reader*, const char*, cpp_dir*, bool, int) -->
     <function-decl name='_cpp_find_file' mangled-name='_cpp_find_file' filepath='../.././libcpp/files.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-265' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-264' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-3' name='fake' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='angle_brackets' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-244'/>
+      <return type-id='type-id-243'/>
     </function-decl>
     <!-- bool _cpp_stack_file(cpp_reader*, _cpp_file*, bool) -->
     <function-decl name='_cpp_stack_file' mangled-name='_cpp_stack_file' filepath='../.././libcpp/files.c' line='796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-243' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-3' name='import' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- bool -->
@@ -5597,7 +5597,7 @@
     <!-- bool cpp_included(cpp_reader*, const char*) -->
     <function-decl name='cpp_included' mangled-name='_Z12cpp_includedP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_includedP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -5606,7 +5606,7 @@
     <!-- bool cpp_included_before(cpp_reader*, const char*, source_location) -->
     <function-decl name='cpp_included_before' mangled-name='_Z19cpp_included_beforeP10cpp_readerPKcj' filepath='../.././libcpp/files.c' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_included_beforeP10cpp_readerPKcj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -5617,28 +5617,28 @@
     <!-- void _cpp_init_files(cpp_reader*) -->
     <function-decl name='_cpp_init_files' mangled-name='_cpp_init_files' filepath='../.././libcpp/files.c' line='1170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void _cpp_cleanup_files(cpp_reader*) -->
     <function-decl name='_cpp_cleanup_files' mangled-name='_cpp_cleanup_files' filepath='../.././libcpp/files.c' line='1187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_cleanup_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void cpp_clear_file_cache(cpp_reader*) -->
     <function-decl name='cpp_clear_file_cache' mangled-name='_Z20cpp_clear_file_cacheP10cpp_reader' filepath='../.././libcpp/files.c' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_clear_file_cacheP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void cpp_change_file(cpp_reader*, lc_reason, const char*) -->
     <function-decl name='cpp_change_file' mangled-name='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc' filepath='../.././libcpp/files.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-104' name='reason' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -5649,14 +5649,14 @@
     <!-- void _cpp_report_missing_guards(cpp_reader*) -->
     <function-decl name='_cpp_report_missing_guards' mangled-name='_cpp_report_missing_guards' filepath='../.././libcpp/files.c' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_report_missing_guards'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- bool cpp_push_include(cpp_reader*, const char*) -->
     <function-decl name='cpp_push_include' mangled-name='_Z16cpp_push_includeP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_push_includeP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -5665,11 +5665,11 @@
     <!-- void cpp_set_include_chains(cpp_reader*, cpp_dir*, cpp_dir*, int) -->
     <function-decl name='cpp_set_include_chains' mangled-name='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i' filepath='../.././libcpp/files.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-265' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-264' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-265' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-264' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='quote_ignores_source_dir' filepath='../.././libcpp/files.c' line='1394' column='1'/>
       <!-- void -->
@@ -5678,28 +5678,28 @@
     <!-- const char* cpp_get_path(_cpp_file*) -->
     <function-decl name='cpp_get_path' mangled-name='_Z12cpp_get_pathP9_cpp_file' filepath='../.././libcpp/files.c' line='1603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_pathP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-243'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- cpp_dir* cpp_get_dir(_cpp_file*) -->
     <function-decl name='cpp_get_dir' mangled-name='_Z11cpp_get_dirP9_cpp_file' filepath='../.././libcpp/files.c' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_get_dirP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
+      <parameter type-id='type-id-243' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
       <!-- cpp_dir* -->
-      <return type-id='type-id-265'/>
+      <return type-id='type-id-264'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_prev(cpp_buffer*) -->
     <function-decl name='cpp_get_prev' mangled-name='_Z12cpp_get_prevP10cpp_buffer' filepath='../.././libcpp/files.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_prevP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-241' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
+      <parameter type-id='type-id-240' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-241'/>
+      <return type-id='type-id-240'/>
     </function-decl>
     <!-- bool _cpp_save_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_save_file_entries' mangled-name='_cpp_save_file_entries' filepath='../.././libcpp/files.c' line='1684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -5708,7 +5708,7 @@
     <!-- bool _cpp_read_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_read_file_entries' mangled-name='_cpp_read_file_entries' filepath='../.././libcpp/files.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -5745,7 +5745,7 @@
     <!-- void deps_add_dep(deps*, const char*) -->
     <function-decl name='deps_add_dep' mangled-name='_Z12deps_add_depP4depsPKc' filepath='../.././libcpp/include/mkdeps.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_add_depP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-239'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -5780,56 +5780,56 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-254'/>
+      <return type-id='type-id-253'/>
     </function-decl>
     <!-- unsigned char* _cpp_convert_input(cpp_reader*, const char*, unsigned char*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' filepath='../.././libcpp/internal.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-243'/>
+      <parameter type-id='type-id-242'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-224'/>
+      <parameter type-id='type-id-223'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-225'/>
+      <parameter type-id='type-id-224'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- DIR* opendir(const char*) -->
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- DIR* -->
-      <return type-id='type-id-262'/>
+      <return type-id='type-id-261'/>
     </function-decl>
     <!-- dirent* readdir(DIR*) -->
     <function-decl name='readdir' filepath='/usr/include/dirent.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-261'/>
       <!-- dirent* -->
-      <return type-id='type-id-263'/>
+      <return type-id='type-id-262'/>
     </function-decl>
     <!-- int closedir(DIR*) -->
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-262'/>
+      <parameter type-id='type-id-261'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void* htab_find_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_find_with_hash' filepath='../.././libcpp/../include/hashtab.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-188'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-186'/>
       <!-- void* -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -5844,7 +5844,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void* -->
       <return type-id='type-id-16'/>
     </function-decl>
@@ -5853,22 +5853,22 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-191'/>
+      <parameter type-id='type-id-190'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-192'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-194'/>
+      <parameter type-id='type-id-193'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-196'/>
+      <parameter type-id='type-id-195'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-197'/>
+      <parameter type-id='type-id-196'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-189'/>
+      <return type-id='type-id-188'/>
     </function-decl>
     <!-- void htab_delete(htab_t) -->
     <function-decl name='htab_delete' filepath='../.././libcpp/../include/hashtab.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-188'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -5881,23 +5881,23 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-259'/>
+      <parameter type-id='type-id-258'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- size_t htab_elements(htab_t) -->
     <function-decl name='htab_elements' filepath='../.././libcpp/../include/hashtab.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-188'/>
       <!-- typedef size_t -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- void htab_traverse(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse' filepath='../.././libcpp/../include/hashtab.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-188'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-261'/>
+      <parameter type-id='type-id-260'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- void -->
@@ -5935,7 +5935,7 @@
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- int (void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-264'>
+    <function-type size-in-bits='64' id='type-id-263'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-143'/>
       <!-- parameter of type 'void*' -->
@@ -5944,35 +5944,35 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- struct __dirstream -->
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-256'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-255'/>
   </abi-instr>
   <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'>
     <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
-    <typedef-decl name='ht_cb' type-id='type-id-266' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-267'/>
+    <typedef-decl name='ht_cb' type-id='type-id-265' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-266'/>
     <!-- int (cpp_reader*, typedef hashnode, void*)* -->
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-265'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void _cpp_init_hashtable(cpp_reader*, hash_table*) -->
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-268' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int cpp_defined(cpp_reader*, const unsigned char*, int) -->
     <function-decl name='cpp_defined' mangled-name='_Z11cpp_definedP10cpp_readerPKhi' filepath='../.././libcpp/identifiers.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_definedP10cpp_readerPKhi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-241' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='len' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- int -->
@@ -5981,7 +5981,7 @@
     <!-- void ht_destroy(hash_table*) -->
     <function-decl name='ht_destroy' mangled-name='_Z10ht_destroyP2ht' filepath='../.././libcpp/include/symtab.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10ht_destroyP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -5990,25 +5990,25 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15'/>
       <!-- hash_table* -->
-      <return type-id='type-id-269'/>
+      <return type-id='type-id-268'/>
     </function-decl>
     <!-- void ht_forall(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_forall' mangled-name='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/include/symtab.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-267'/>
+      <parameter type-id='type-id-266'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int (cpp_reader*, hashnode, void*) -->
-    <function-type size-in-bits='64' id='type-id-268'>
+    <function-type size-in-bits='64' id='type-id-267'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef hashnode' -->
-      <parameter type-id='type-id-270'/>
+      <parameter type-id='type-id-269'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- int -->
@@ -6017,57 +6017,57 @@
   </abi-instr>
   <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'>
     <!-- const unsigned char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-271' size-in-bits='2048' id='type-id-272'>
+    <array-type-def dimensions='1' type-id='type-id-270' size-in-bits='2048' id='type-id-271'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-6' id='type-id-252'/>
+      <subrange length='256' type-id='type-id-6' id='type-id-251'/>
     </array-type-def>
     <!-- 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*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-273' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-272' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- cpp_reader* cpp_create_reader(c_lang, hash_table*, line_maps*) -->
     <function-decl name='cpp_create_reader' mangled-name='_Z17cpp_create_reader6c_langP2htP9line_maps' filepath='../.././libcpp/init.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_create_reader6c_langP2htP9line_maps'>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-273' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-272' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-268' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
+      <parameter type-id='type-id-156' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
       <!-- cpp_reader* -->
-      <return type-id='type-id-217'/>
+      <return type-id='type-id-216'/>
     </function-decl>
     <!-- void cpp_set_line_map(cpp_reader*, line_maps*) -->
     <function-decl name='cpp_set_line_map' mangled-name='_Z16cpp_set_line_mapP10cpp_readerP9line_maps' filepath='../.././libcpp/init.c' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_set_line_mapP10cpp_readerP9line_maps'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-156' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void cpp_destroy(cpp_reader*) -->
     <function-decl name='cpp_destroy' mangled-name='_Z11cpp_destroyP10cpp_reader' filepath='../.././libcpp/init.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_destroyP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void cpp_init_special_builtins(cpp_reader*) -->
     <function-decl name='cpp_init_special_builtins' mangled-name='_Z25cpp_init_special_builtinsP10cpp_reader' filepath='../.././libcpp/init.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_init_special_builtinsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void cpp_init_builtins(cpp_reader*, int) -->
     <function-decl name='cpp_init_builtins' mangled-name='_Z17cpp_init_builtinsP10cpp_readeri' filepath='../.././libcpp/init.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_init_builtinsP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
@@ -6076,14 +6076,14 @@
     <!-- void cpp_post_options(cpp_reader*) -->
     <function-decl name='cpp_post_options' mangled-name='_Z16cpp_post_optionsP10cpp_reader' filepath='../.././libcpp/init.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_post_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- const char* cpp_read_main_file(cpp_reader*, const char*) -->
     <function-decl name='cpp_read_main_file' mangled-name='_Z18cpp_read_main_fileP10cpp_readerPKc' filepath='../.././libcpp/init.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_read_main_fileP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='fname' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- const char* -->
@@ -6092,21 +6092,21 @@
     <!-- void cpp_finish(cpp_reader*, FILE*) -->
     <function-decl name='cpp_finish' mangled-name='_Z10cpp_finishP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/init.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_finishP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- const unsigned char _cpp_trigraph_map[256] -->
-    <var-decl name='_cpp_trigraph_map' type-id='type-id-272' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
+    <var-decl name='_cpp_trigraph_map' type-id='type-id-271' 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='../.././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'>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-274'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-275' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -6118,7 +6118,7 @@
       </data-member>
     </class-decl>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-276'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-275'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-50' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -6129,10 +6129,10 @@
       </data-member>
     </class-decl>
     <!-- struct normalize_state -->
-    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-277'>
+    <class-decl name='normalize_state' size-in-bits='96' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='706' column='1' id='type-id-276'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cppchar_t normalize_state::previous -->
-        <var-decl name='previous' type-id='type-id-218' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-217' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned char normalize_state::prev_class -->
@@ -6140,13 +6140,13 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_normalize_level normalize_state::level -->
-        <var-decl name='level' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_context cpp_context -->
-    <typedef-decl name='cpp_context' type-id='type-id-279' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-280'/>
+    <typedef-decl name='cpp_context' type-id='type-id-278' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-279'/>
     <!-- enum cpp_token_fld_kind -->
-    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-281'>
+    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-280'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_TOKEN_FLD_NODE' value='0'/>
       <enumerator name='CPP_TOKEN_FLD_SOURCE' value='1'/>
@@ -6157,13 +6157,13 @@
       <enumerator name='CPP_TOKEN_FLD_NONE' value='6'/>
     </enum-decl>
     <!-- cpp_comment_table* -->
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-283'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
     <!-- normalize_state* -->
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-218'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-248' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
+      <parameter type-id='type-id-247' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- int -->
@@ -6177,14 +6177,14 @@
     <!-- cpp_comment_table* cpp_get_comments(cpp_reader*) -->
     <function-decl name='cpp_get_comments' mangled-name='_Z16cpp_get_commentsP10cpp_reader' filepath='../.././libcpp/lex.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_get_commentsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
       <!-- cpp_comment_table* -->
-      <return type-id='type-id-283'/>
+      <return type-id='type-id-282'/>
     </function-decl>
     <!-- void _cpp_init_tokenrun(tokenrun*, unsigned int) -->
     <function-decl name='_cpp_init_tokenrun' mangled-name='_cpp_init_tokenrun' filepath='../.././libcpp/lex.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_tokenrun'>
       <!-- parameter of type 'tokenrun*' -->
-      <parameter type-id='type-id-284' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
+      <parameter type-id='type-id-283' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='count' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- void -->
@@ -6193,14 +6193,14 @@
     <!-- int _cpp_remaining_tokens_num_in_context(cpp_context*) -->
     <function-decl name='_cpp_remaining_tokens_num_in_context' mangled-name='_cpp_remaining_tokens_num_in_context' filepath='../.././libcpp/lex.c' line='1745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remaining_tokens_num_in_context'>
       <!-- parameter of type 'cpp_context*' -->
-      <parameter type-id='type-id-285' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
+      <parameter type-id='type-id-284' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- const char* cpp_type2name(cpp_ttype, unsigned char) -->
     <function-decl name='cpp_type2name' mangled-name='_Z13cpp_type2name9cpp_ttypeh' filepath='../.././libcpp/lex.c' line='2496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_type2name9cpp_ttypeh'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-221' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- parameter of type 'unsigned char' -->
       <parameter type-id='type-id-27' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- const char* -->
@@ -6209,7 +6209,7 @@
     <!-- void cpp_output_token(const cpp_token*, FILE*) -->
     <function-decl name='cpp_output_token' mangled-name='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
+      <parameter type-id='type-id-247' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- void -->
@@ -6218,18 +6218,18 @@
     <!-- int cpp_avoid_paste(cpp_reader*, const cpp_token*, const cpp_token*) -->
     <function-decl name='cpp_avoid_paste' mangled-name='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_' filepath='../.././libcpp/lex.c' line='2592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-247' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
+      <parameter type-id='type-id-247' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void cpp_output_line(cpp_reader*, FILE*) -->
     <function-decl name='cpp_output_line' mangled-name='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
@@ -6238,14 +6238,14 @@
     <!-- cpp_token_fld_kind cpp_token_val_index(cpp_token*) -->
     <function-decl name='cpp_token_val_index' mangled-name='_Z19cpp_token_val_indexP9cpp_token' filepath='../.././libcpp/lex.c' line='2879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_token_val_indexP9cpp_token'>
       <!-- parameter of type 'cpp_token*' -->
-      <parameter type-id='type-id-286' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <parameter type-id='type-id-285' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
       <!-- enum cpp_token_fld_kind -->
-      <return type-id='type-id-281'/>
+      <return type-id='type-id-280'/>
     </function-decl>
     <!-- void cpp_force_token_locations(cpp_reader*, source_location*) -->
     <function-decl name='cpp_force_token_locations' mangled-name='_Z25cpp_force_token_locationsP10cpp_readerPj' filepath='../.././libcpp/lex.c' line='2910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_force_token_locationsP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
+      <parameter type-id='type-id-216' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-113' name='p' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- void -->
@@ -6254,31 +6254,31 @@
     <!-- void cpp_stop_forcing_token_locations(cpp_reader*) -->
     <function-decl name='cpp_stop_forcing_token_locations' mangled-name='_Z32cpp_stop_forcing_token_locationsP10cpp_reader' filepath='../.././libcpp/lex.c' line='2918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_stop_forcing_token_locationsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const unsigned char**, const unsigned char*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' filepath='../.././libcpp/internal.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-224'/>
+      <parameter type-id='type-id-223'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-218'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-218'/>
+      <return type-id='type-id-217'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' filepath='../.././libcpp/internal.h' line='731' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- cpp_hashnode* -->
@@ -6287,17 +6287,17 @@
     <!-- hashnode ht_lookup_with_hash(hash_table*, const unsigned char*, size_t, unsigned int, ht_lookup_option) -->
     <function-decl name='ht_lookup_with_hash' mangled-name='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-287'/>
+      <parameter type-id='type-id-286'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-270'/>
+      <return type-id='type-id-269'/>
     </function-decl>
     <!-- void* memmove(void*, void*, size_t) -->
     <function-decl name='memmove' filepath='/usr/include/string.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6313,37 +6313,37 @@
     <!-- const char* cpp_named_operator2name(cpp_ttype) -->
     <function-decl name='cpp_named_operator2name' mangled-name='cpp_named_operator2name' filepath='../.././libcpp/internal.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpp_named_operator2name'>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-221'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <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'>
     <!-- cpp_token[1] -->
-    <array-type-def dimensions='1' type-id='type-id-288' size-in-bits='192' id='type-id-289'>
+    <array-type-def dimensions='1' type-id='type-id-287' size-in-bits='192' id='type-id-288'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-6' id='type-id-9'/>
     </array-type-def>
     <!-- struct cpp_token -->
-    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-288'>
+    <class-decl name='cpp_token' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='223' column='1' id='type-id-287'>
       <member-type access='public'>
         <!-- union cpp_token::cpp_token_u -->
-        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-290'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-289'>
           <data-member access='private'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
-            <var-decl name='node' type-id='type-id-291' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-290' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_token* cpp_token::cpp_token_u::source -->
-            <var-decl name='source' type-id='type-id-286' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-285' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_string cpp_token::cpp_token_u::str -->
-            <var-decl name='str' type-id='type-id-292' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-291' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_macro_arg cpp_token::cpp_token_u::macro_arg -->
-            <var-decl name='macro_arg' type-id='type-id-293' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-292' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- unsigned int cpp_token::cpp_token_u::token_no -->
@@ -6361,7 +6361,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
         <!-- cpp_ttype cpp_token::type -->
-        <var-decl name='type' type-id='type-id-222' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-221' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
         <!-- unsigned short int cpp_token::flags -->
@@ -6369,14 +6369,14 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_token::cpp_token_u cpp_token::val -->
-        <var-decl name='val' type-id='type-id-290' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-289' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct ht_identifier -->
     <class-decl name='ht_identifier' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='32' column='1' id='type-id-78'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* ht_identifier::str -->
-        <var-decl name='str' type-id='type-id-242' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
+        <var-decl name='str' type-id='type-id-241' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int ht_identifier::len -->
@@ -6398,15 +6398,15 @@
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-80'>
       <data-member access='private'>
         <!-- cpp_macro* _cpp_hashnode_value::macro -->
-        <var-decl name='macro' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-293' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- answer* _cpp_hashnode_value::answers -->
-        <var-decl name='answers' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- cpp_builtin_type _cpp_hashnode_value::builtin -->
-        <var-decl name='builtin' type-id='type-id-296' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- unsigned short int _cpp_hashnode_value::arg_index -->
@@ -6414,47 +6414,47 @@
       </data-member>
     </union-decl>
     <!-- typedef cpp_macro cpp_macro -->
-    <typedef-decl name='cpp_macro' type-id='type-id-297' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-298'/>
+    <typedef-decl name='cpp_macro' type-id='type-id-296' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-297'/>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-288' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-299'/>
+    <typedef-decl name='cpp_token' type-id='type-id-287' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-298'/>
     <!-- struct cpp_identifier -->
-    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-291'>
+    <class-decl name='cpp_identifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='212' column='1' id='type-id-290'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* cpp_identifier::node -->
         <var-decl name='node' type-id='type-id-112' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='218' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-77' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-300'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-77' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-299'/>
     <!-- struct cpp_macro_arg -->
-    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-293'>
+    <class-decl name='cpp_macro_arg' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='206' column='1' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_macro_arg::arg_no -->
         <var-decl name='arg_no' type-id='type-id-15' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='208' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_macro -->
-    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-297'>
+    <class-decl name='cpp_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='36' column='1' id='type-id-296'>
       <member-type access='public'>
         <!-- union cpp_macro::cpp_macro_u -->
-        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-301'>
+        <union-decl name='cpp_macro_u' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='47' column='1' id='type-id-300'>
           <data-member access='private'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
-            <var-decl name='tokens' type-id='type-id-286' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-285' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- const unsigned char* cpp_macro::cpp_macro_u::text -->
-            <var-decl name='text' type-id='type-id-242' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
+            <var-decl name='text' type-id='type-id-241' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode** cpp_macro::params -->
-        <var-decl name='params' type-id='type-id-302' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_macro::cpp_macro_u cpp_macro::exp -->
-        <var-decl name='exp' type-id='type-id-301' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-300' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- source_location cpp_macro::line -->
@@ -6494,7 +6494,7 @@
       </data-member>
     </class-decl>
     <!-- enum cpp_ttype -->
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-222'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-221'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -6585,10 +6585,10 @@
       <enumerator name='CPP_LAST_CPP_OP' value='26'/>
     </enum-decl>
     <!-- struct answer -->
-    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-303'>
+    <class-decl name='answer' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='28' column='1' id='type-id-302'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- answer* answer::next -->
-        <var-decl name='next' type-id='type-id-295' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-294' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int answer::count -->
@@ -6596,11 +6596,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token answer::first[1] -->
-        <var-decl name='first' type-id='type-id-289' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-288' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum cpp_builtin_type -->
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-296'>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-295'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -6616,46 +6616,46 @@
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
     <!-- struct cpp_string -->
-    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-292'>
+    <class-decl name='cpp_string' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='173' column='1' id='type-id-291'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_string::len -->
         <var-decl name='len' type-id='type-id-15' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const unsigned char* cpp_string::text -->
-        <var-decl name='text' type-id='type-id-242' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
+        <var-decl name='text' type-id='type-id-241' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
       </data-member>
     </class-decl>
     <!-- answer* -->
-    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-295'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-294'/>
     <!-- const unsigned char -->
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-270'/>
     <!-- const unsigned char* -->
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-241'/>
     <!-- cpp_hashnode** -->
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-301'/>
     <!-- cpp_macro* -->
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-293'/>
     <!-- cpp_token* -->
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-285'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void linemap_check_files_exited(line_maps*) -->
     <function-decl name='linemap_check_files_exited' mangled-name='_Z26linemap_check_files_exitedP9line_maps' filepath='../.././libcpp/line-map.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26linemap_check_files_exitedP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- const line_map* linemap_add(line_maps*, lc_reason, unsigned int, const char*, linenum_type) -->
     <function-decl name='linemap_add' mangled-name='_Z11linemap_addP9line_maps9lc_reasonjPKcj' filepath='../.././libcpp/line-map.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11linemap_addP9line_maps9lc_reasonjPKcj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-104' name='reason' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -6670,14 +6670,14 @@
     <!-- bool linemap_tracks_macro_expansion_locs_p(line_maps*) -->
     <function-decl name='linemap_tracks_macro_expansion_locs_p' mangled-name='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps' filepath='../.././libcpp/line-map.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- const line_map* linemap_enter_macro(line_maps*, cpp_hashnode*, source_location, unsigned int) -->
     <function-decl name='linemap_enter_macro' mangled-name='linemap_enter_macro' filepath='../.././libcpp/line-map.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_enter_macro'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='macro_node' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -6703,7 +6703,7 @@
     <!-- source_location linemap_line_start(line_maps*, linenum_type, unsigned int) -->
     <function-decl name='linemap_line_start' mangled-name='_Z18linemap_line_startP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18linemap_line_startP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-111' name='to_line' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -6714,7 +6714,7 @@
     <!-- source_location linemap_position_for_column(line_maps*, unsigned int) -->
     <function-decl name='linemap_position_for_column' mangled-name='_Z27linemap_position_for_columnP9line_mapsj' filepath='../.././libcpp/line-map.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27linemap_position_for_columnP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='to_column' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- typedef source_location -->
@@ -6734,7 +6734,7 @@
     <!-- const line_map* linemap_lookup(line_maps*, source_location) -->
     <function-decl name='linemap_lookup' mangled-name='_Z14linemap_lookupP9line_mapsj' filepath='../.././libcpp/line-map.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14linemap_lookupP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99' name='line' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- const line_map* -->
@@ -6750,7 +6750,7 @@
     <!-- int linemap_get_expansion_line(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_line' mangled-name='linemap_get_expansion_line' filepath='../.././libcpp/line-map.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_line'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-156'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- int -->
@@ -6759,7 +6759,7 @@
     <!-- const char* linemap_get_expansion_filename(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_filename' mangled-name='linemap_get_expansion_filename' filepath='../.././libcpp/line-map.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_filename'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99' name='location' filepath='../.././libcpp/line-map.c' line='720' column='1'/>
       <!-- const char* -->
@@ -6775,7 +6775,7 @@
     <!-- bool linemap_location_from_macro_expansion_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_from_macro_expansion_p' mangled-name='_Z39linemap_location_from_macro_expansion_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z39linemap_location_from_macro_expansion_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99' name='location' filepath='../.././libcpp/line-map.c' line='773' column='1'/>
       <!-- bool -->
@@ -6784,11 +6784,11 @@
     <!-- source_location linemap_unwind_toward_expansion(line_maps*, source_location, const line_map**) -->
     <function-decl name='linemap_unwind_toward_expansion' mangled-name='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map' filepath='../.././libcpp/line-map.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99' name='loc' filepath='../.././libcpp/line-map.c' line='1094' column='1'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-156' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
+      <parameter type-id='type-id-155' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
       <!-- typedef source_location -->
       <return type-id='type-id-99'/>
     </function-decl>
@@ -6797,7 +6797,7 @@
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='stream' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='ix' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'bool' -->
@@ -6808,7 +6808,7 @@
     <!-- void linemap_dump_location(line_maps*, source_location, FILE*) -->
     <function-decl name='linemap_dump_location' mangled-name='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE' filepath='../.././libcpp/line-map.c' line='1211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99' name='loc' filepath='../.././libcpp/line-map.c' line='1212' column='1'/>
       <!-- parameter of type 'FILE*' -->
@@ -6821,7 +6821,7 @@
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='stream' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-157' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
+      <parameter type-id='type-id-156' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='num_ordinary' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -6841,7 +6841,7 @@
   </abi-instr>
   <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_file -->
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-304'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-303'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* _cpp_file::name -->
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -6860,23 +6860,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_file* _cpp_file::next_file -->
-        <var-decl name='next_file' type-id='type-id-244' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-243' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const uchar* _cpp_file::buffer -->
-        <var-decl name='buffer' type-id='type-id-215' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-214' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const uchar* _cpp_file::buffer_start -->
-        <var-decl name='buffer_start' type-id='type-id-215' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-214' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- const cpp_hashnode* _cpp_file::cmacro -->
-        <var-decl name='cmacro' type-id='type-id-305' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-304' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_dir* _cpp_file::dir -->
-        <var-decl name='dir' type-id='type-id-265' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-264' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- stat _cpp_file::st -->
@@ -6912,21 +6912,21 @@
       </data-member>
     </class-decl>
     <!-- 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-306'>
+    <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-305'>
       <member-type access='public'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
-        <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-307'>
+        <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-306'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned char* base -->
-            <var-decl name='base' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- unsigned char* limit -->
-            <var-decl name='limit' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned char* cur -->
-            <var-decl name='cur' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- source_location first_line -->
@@ -6936,19 +6936,19 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_buffer* cpp_reader::buffer -->
-        <var-decl name='buffer' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_buffer* cpp_reader::overlaid_buffer -->
-        <var-decl name='overlaid_buffer' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- lexer_state cpp_reader::state -->
-        <var-decl name='state' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-307' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- line_maps* cpp_reader::line_table -->
-        <var-decl name='line_table' type-id='type-id-157' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-156' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- source_location cpp_reader::directive_line -->
@@ -6956,31 +6956,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- _cpp_buff* cpp_reader::a_buff -->
-        <var-decl name='a_buff' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- _cpp_buff* cpp_reader::u_buff -->
-        <var-decl name='u_buff' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_buff* cpp_reader::free_buffs -->
-        <var-decl name='free_buffs' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- cpp_context cpp_reader::base_context -->
-        <var-decl name='base_context' type-id='type-id-279' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-278' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- cpp_context* cpp_reader::context -->
-        <var-decl name='context' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- const directive* cpp_reader::directive -->
-        <var-decl name='directive' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- cpp_token cpp_reader::directive_result -->
-        <var-decl name='directive_result' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- source_location cpp_reader::invocation_location -->
@@ -6992,39 +6992,39 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- cpp_dir* cpp_reader::quote_include -->
-        <var-decl name='quote_include' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- cpp_dir* cpp_reader::bracket_include -->
-        <var-decl name='bracket_include' type-id='type-id-265' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-264' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- cpp_dir cpp_reader::no_search_path -->
-        <var-decl name='no_search_path' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <!-- _cpp_file* cpp_reader::all_files -->
-        <var-decl name='all_files' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- _cpp_file* cpp_reader::main_file -->
-        <var-decl name='main_file' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- htab* cpp_reader::file_hash -->
-        <var-decl name='file_hash' type-id='type-id-188' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- htab* cpp_reader::dir_hash -->
-        <var-decl name='dir_hash' type-id='type-id-188' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- file_hash_entry_pool* cpp_reader::file_hash_entries -->
-        <var-decl name='file_hash_entries' type-id='type-id-312' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <!-- htab* cpp_reader::nonexistent_file_hash -->
-        <var-decl name='nonexistent_file_hash' type-id='type-id-188' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-187' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <!-- obstack cpp_reader::nonexistent_file_ob -->
@@ -7040,11 +7040,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
         <!-- const cpp_hashnode* cpp_reader::mi_cmacro -->
-        <var-decl name='mi_cmacro' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <!-- const cpp_hashnode* cpp_reader::mi_ind_cmacro -->
-        <var-decl name='mi_ind_cmacro' type-id='type-id-305' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-304' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <!-- bool cpp_reader::mi_valid -->
@@ -7052,15 +7052,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
         <!-- cpp_token* cpp_reader::cur_token -->
-        <var-decl name='cur_token' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
         <!-- tokenrun cpp_reader::base_run -->
-        <var-decl name='base_run' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-312' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <!-- tokenrun* cpp_reader::cur_run -->
-        <var-decl name='cur_run' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <!-- unsigned int cpp_reader::lookaheads -->
@@ -7072,7 +7072,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <!-- unsigned char* cpp_reader::macro_buffer -->
-        <var-decl name='macro_buffer' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <!-- unsigned int cpp_reader::macro_buffer_len -->
@@ -7080,43 +7080,43 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
         <!-- cset_converter cpp_reader::narrow_cset_desc -->
-        <var-decl name='narrow_cset_desc' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <!-- cset_converter cpp_reader::utf8_cset_desc -->
-        <var-decl name='utf8_cset_desc' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <!-- cset_converter cpp_reader::char16_cset_desc -->
-        <var-decl name='char16_cset_desc' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
         <!-- cset_converter cpp_reader::char32_cset_desc -->
-        <var-decl name='char32_cset_desc' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
         <!-- cset_converter cpp_reader::wide_cset_desc -->
-        <var-decl name='wide_cset_desc' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <!-- const unsigned char* cpp_reader::date -->
-        <var-decl name='date' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
+        <var-decl name='date' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
         <!-- const unsigned char* cpp_reader::time -->
-        <var-decl name='time' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
+        <var-decl name='time' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
         <!-- cpp_token cpp_reader::avoid_paste -->
-        <var-decl name='avoid_paste' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
         <!-- cpp_token cpp_reader::eof -->
-        <var-decl name='eof' type-id='type-id-299' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-298' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
         <!-- deps* cpp_reader::deps -->
-        <var-decl name='deps' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <!-- obstack cpp_reader::hash_ob -->
@@ -7128,31 +7128,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
         <!-- pragma_entry* cpp_reader::pragmas -->
-        <var-decl name='pragmas' type-id='type-id-315' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <!-- cpp_callbacks cpp_reader::cb -->
-        <var-decl name='cb' type-id='type-id-230' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-229' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <!-- ht* cpp_reader::hash_table -->
-        <var-decl name='hash_table' type-id='type-id-316' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-315' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
         <!-- op* cpp_reader::op_stack -->
-        <var-decl name='op_stack' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- op* cpp_reader::op_limit -->
-        <var-decl name='op_limit' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
         <!-- cpp_options cpp_reader::opts -->
-        <var-decl name='opts' type-id='type-id-228' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-227' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
         <!-- spec_nodes cpp_reader::spec_nodes -->
-        <var-decl name='spec_nodes' type-id='type-id-317' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-316' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <!-- bool cpp_reader::our_hashtable -->
@@ -7160,23 +7160,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} cpp_reader::out -->
-        <var-decl name='out' type-id='type-id-307' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-306' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <!-- const unsigned char* cpp_reader::saved_cur -->
-        <var-decl name='saved_cur' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_cur' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
         <!-- const unsigned char* cpp_reader::saved_rlimit -->
-        <var-decl name='saved_rlimit' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_rlimit' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
         <!-- const unsigned char* cpp_reader::saved_line_base -->
-        <var-decl name='saved_line_base' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_line_base' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
         <!-- cpp_savedstate* cpp_reader::savedstate -->
-        <var-decl name='savedstate' type-id='type-id-318' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-317' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <!-- unsigned int cpp_reader::counter -->
@@ -7184,11 +7184,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <!-- cpp_comment_table cpp_reader::comments -->
-        <var-decl name='comments' type-id='type-id-282' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-281' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <!-- def_pragma_macro* cpp_reader::pushed_macros -->
-        <var-decl name='pushed_macros' type-id='type-id-319' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-318' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <!-- source_location* cpp_reader::forced_token_location_p -->
@@ -7196,10 +7196,10 @@
       </data-member>
     </class-decl>
     <!-- struct deps -->
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-320'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-319'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-249' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-248' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int deps::ntargets -->
@@ -7211,7 +7211,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-249' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-248' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned int deps::ndeps -->
@@ -7223,11 +7223,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-249' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-248' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- size_t* deps::vpathlv -->
-        <var-decl name='vpathlv' type-id='type-id-173' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-172' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int deps::nvpaths -->
@@ -7239,14 +7239,14 @@
       </data-member>
     </class-decl>
     <!-- typedef cpp_buffer cpp_buffer -->
-    <typedef-decl name='cpp_buffer' type-id='type-id-321' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-322'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-320' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-321'/>
     <!-- typedef _cpp_line_note _cpp_line_note -->
-    <typedef-decl name='_cpp_line_note' type-id='type-id-323' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-324'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-323'/>
     <!-- struct _cpp_line_note -->
-    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-323'>
+    <class-decl name='_cpp_line_note' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='284' column='1' id='type-id-322'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* _cpp_line_note::pos -->
-        <var-decl name='pos' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
+        <var-decl name='pos' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int _cpp_line_note::type -->
@@ -7254,10 +7254,10 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_dir -->
-    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-311'>
+    <class-decl name='cpp_dir' size-in-bits='512' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='553' column='1' id='type-id-310'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_dir* cpp_dir::next -->
-        <var-decl name='next' type-id='type-id-265' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-264' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* cpp_dir::name -->
@@ -7281,34 +7281,34 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** cpp_dir::name_map -->
-        <var-decl name='name_map' type-id='type-id-249' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-248' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
-        <var-decl name='construct' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-324' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- ino_t cpp_dir::ino -->
-        <var-decl name='ino' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-325' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- dev_t cpp_dir::dev -->
-        <var-decl name='dev' type-id='type-id-327' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-326' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-326'/>
+    <typedef-decl name='ino_t' type-id='type-id-63' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-325'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-62' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-327'/>
+    <typedef-decl name='dev_t' type-id='type-id-62' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-326'/>
     <!-- struct cset_converter -->
-    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-314'>
+    <class-decl name='cset_converter' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='47' column='1' id='type-id-313'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-328' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-327' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- iconv_t cset_converter::cd -->
-        <var-decl name='cd' type-id='type-id-170' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-169' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int cset_converter::width -->
@@ -7316,9 +7316,9 @@
       </data-member>
     </class-decl>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-329' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-328'/>
+    <typedef-decl name='convert_f' type-id='type-id-328' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-327'/>
     <!-- struct lexer_state -->
-    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-308'>
+    <class-decl name='lexer_state' size-in-bits='160' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='225' column='1' id='type-id-307'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char lexer_state::in_directive -->
         <var-decl name='in_directive' type-id='type-id-27' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -7377,22 +7377,22 @@
       </data-member>
     </class-decl>
     <!-- struct ht -->
-    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-330'>
+    <class-decl name='ht' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/symtab.h' line='47' column='1' id='type-id-329'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-57' visibility='default' filepath='../.././libcpp/include/symtab.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- hashnode* ht::entries -->
-        <var-decl name='entries' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
-        <var-decl name='alloc_node' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void* (typedef size_t)* ht::alloc_subobject -->
-        <var-decl name='alloc_subobject' type-id='type-id-175' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-174' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- unsigned int ht::nslots -->
@@ -7404,7 +7404,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- cpp_reader* ht::pfile -->
-        <var-decl name='pfile' type-id='type-id-217' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-216' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- unsigned int ht::searches -->
@@ -7420,53 +7420,53 @@
       </data-member>
     </class-decl>
     <!-- typedef _cpp_buff _cpp_buff -->
-    <typedef-decl name='_cpp_buff' type-id='type-id-333' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-334'/>
+    <typedef-decl name='_cpp_buff' type-id='type-id-332' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-333'/>
     <!-- struct _cpp_buff -->
-    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-333'>
+    <class-decl name='_cpp_buff' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='101' column='1' id='type-id-332'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _cpp_buff* _cpp_buff::next -->
-        <var-decl name='next' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char* _cpp_buff::base -->
-        <var-decl name='base' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* _cpp_buff::cur -->
-        <var-decl name='cur' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned char* _cpp_buff::limit -->
-        <var-decl name='limit' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct tokenrun -->
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-335'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-334'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- tokenrun* tokenrun::next -->
-        <var-decl name='next' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- tokenrun* tokenrun::prev -->
-        <var-decl name='prev' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-283' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
-        <var-decl name='base' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- cpp_token* tokenrun::limit -->
-        <var-decl name='limit' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_options -->
-    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-228'>
+    <class-decl name='cpp_options' size-in-bits='1024' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='290' column='1' id='type-id-227'>
       <member-type access='public'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-336'>
+        <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='451' column='1' id='type-id-335'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- bool missing_files -->
@@ -7492,7 +7492,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- c_lang cpp_options::lang -->
-        <var-decl name='lang' type-id='type-id-273' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-272' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char cpp_options::cplusplus -->
@@ -7660,7 +7660,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- cpp_normalize_level cpp_options::warn_normalize -->
-        <var-decl name='warn_normalize' type-id='type-id-278' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-277' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
         <!-- bool cpp_options::warn_invalid_pch -->
@@ -7672,7 +7672,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- struct {cpp_deps_style style; bool missing_files; bool phony_targets; bool ignore_main_file; bool need_preprocessor_output;} cpp_options::deps -->
-        <var-decl name='deps' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- size_t cpp_options::precision -->
@@ -7712,14 +7712,14 @@
       </data-member>
     </class-decl>
     <!-- struct op -->
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-338'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-337'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
-        <var-decl name='token' type-id='type-id-248' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-247' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num op::value -->
-        <var-decl name='value' type-id='type-id-246' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-245' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- source_location op::loc -->
@@ -7727,56 +7727,56 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- cpp_ttype op::op -->
-        <var-decl name='op' type-id='type-id-222' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-221' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct cpp_context -->
-    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-279'>
+    <class-decl name='cpp_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='177' column='1' id='type-id-278'>
       <member-type access='public'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} -->
-        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-339'>
+        <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='183' column='1' id='type-id-338'>
           <member-type access='private'>
             <!-- struct {utoken first; utoken last;} -->
-            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-340'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='188' column='1' id='type-id-339'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-340' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- utoken last -->
-                <var-decl name='last' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-340' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} -->
-            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-342'>
+            <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-341'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
-                <var-decl name='cur' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
+                <var-decl name='cur' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- const unsigned char* rlimit -->
-                <var-decl name='rlimit' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='197' column='1'/>
+                <var-decl name='rlimit' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='197' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-340' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-339' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- struct {const unsigned char* cur; const unsigned char* rlimit;} trad -->
-            <var-decl name='trad' type-id='type-id-342' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-341' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <member-type access='public'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} -->
-        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-343'>
+        <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-342'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-344' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-343' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -7786,44 +7786,44 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_context* cpp_context::next -->
-        <var-decl name='next' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_context* cpp_context::prev -->
-        <var-decl name='prev' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-284' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- union {struct {utoken first; utoken last;} iso; struct {const unsigned char* cur; const unsigned char* rlimit;} trad;} cpp_context::u -->
-        <var-decl name='u' type-id='type-id-339' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-338' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_buff* cpp_context::buff -->
-        <var-decl name='buff' type-id='type-id-309' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-308' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- union {macro_context* mc; cpp_hashnode* macro;} cpp_context::c -->
-        <var-decl name='c' type-id='type-id-343' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-342' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- context_tokens_kind cpp_context::tokens_kind -->
-        <var-decl name='tokens_kind' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-344' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
       </data-member>
     </class-decl>
     <!-- union utoken -->
-    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-341'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-340'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
-        <var-decl name='token' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- const cpp_token** utoken::ptoken -->
-        <var-decl name='ptoken' type-id='type-id-346' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-345' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-347' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-348'/>
+    <typedef-decl name='macro_context' type-id='type-id-346' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-347'/>
     <!-- struct {cpp_hashnode* macro_node; source_location* virt_locs; source_location* cur_virt_loc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-348' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-347'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-347' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-346'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-112' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -7838,112 +7838,112 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_callbacks -->
-    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-230'>
+    <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-229'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
-        <var-decl name='line_change' type-id='type-id-349' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-348' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
-        <var-decl name='file_change' type-id='type-id-350' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-349' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
-        <var-decl name='dir_change' type-id='type-id-351' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-350' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
-        <var-decl name='include' type-id='type-id-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-351' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
-        <var-decl name='define' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
-        <var-decl name='undef' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
-        <var-decl name='ident' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
-        <var-decl name='def_pragma' type-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
-        <var-decl name='valid_pch' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
-        <var-decl name='read_pch' type-id='type-id-357' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- missing_header_cb cpp_callbacks::missing_header -->
-        <var-decl name='missing_header' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-357' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
-        <var-decl name='macro_to_expand' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-358' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
-        <var-decl name='error' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-359' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
-        <var-decl name='used_define' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
-        <var-decl name='used_undef' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
-        <var-decl name='before_define' type-id='type-id-226' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-225' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
-        <var-decl name='used' type-id='type-id-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
-        <var-decl name='user_builtin_macro' type-id='type-id-361' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-360' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-345'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-344'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- struct cpp_buffer -->
-    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-321'>
+    <class-decl name='cpp_buffer' size-in-bits='1536' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='297' column='1' id='type-id-320'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
-        <var-decl name='cur' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
+        <var-decl name='cur' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const unsigned char* cpp_buffer::line_base -->
-        <var-decl name='line_base' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='300' column='1'/>
+        <var-decl name='line_base' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const unsigned char* cpp_buffer::next_line -->
-        <var-decl name='next_line' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='301' column='1'/>
+        <var-decl name='next_line' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- const unsigned char* cpp_buffer::buf -->
-        <var-decl name='buf' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='303' column='1'/>
+        <var-decl name='buf' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='303' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const unsigned char* cpp_buffer::rlimit -->
-        <var-decl name='rlimit' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
+        <var-decl name='rlimit' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- _cpp_line_note* cpp_buffer::notes -->
-        <var-decl name='notes' type-id='type-id-362' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-361' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int cpp_buffer::cur_note -->
@@ -7959,19 +7959,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_buffer* cpp_buffer::prev -->
-        <var-decl name='prev' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_file* cpp_buffer::file -->
-        <var-decl name='file' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- const unsigned char* cpp_buffer::timestamp -->
-        <var-decl name='timestamp' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
+        <var-decl name='timestamp' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- if_stack* cpp_buffer::if_stack -->
-        <var-decl name='if_stack' type-id='type-id-363' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-362' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- bool cpp_buffer::need_line -->
@@ -7995,36 +7995,36 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- cpp_dir cpp_buffer::dir -->
-        <var-decl name='dir' type-id='type-id-311' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-310' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- cset_converter cpp_buffer::input_cset_desc -->
-        <var-decl name='input_cset_desc' type-id='type-id-314' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-313' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef tokenrun tokenrun -->
-    <typedef-decl name='tokenrun' type-id='type-id-335' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-313'/>
+    <typedef-decl name='tokenrun' type-id='type-id-334' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-312'/>
     <!-- typedef cpp_reader cpp_reader -->
-    <typedef-decl name='cpp_reader' type-id='type-id-306' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-364'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-305' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-363'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-292' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-237'/>
+    <typedef-decl name='cpp_string' type-id='type-id-291' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-236'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-365' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-358'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-364' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-357'/>
     <!-- typedef cpp_dir cpp_dir -->
-    <typedef-decl name='cpp_dir' type-id='type-id-311' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-366'/>
+    <typedef-decl name='cpp_dir' type-id='type-id-310' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-365'/>
     <!-- typedef ht_identifier* hashnode -->
-    <typedef-decl name='hashnode' type-id='type-id-367' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-270'/>
+    <typedef-decl name='hashnode' type-id='type-id-366' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-269'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-330' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-368'/>
+    <typedef-decl name='hash_table' type-id='type-id-329' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-367'/>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-337'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-336'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEPS_NONE' value='0'/>
       <enumerator name='DEPS_USER' value='1'/>
       <enumerator name='DEPS_SYSTEM' value='2'/>
     </enum-decl>
     <!-- enum c_lang -->
-    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-273'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-272'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -8040,7 +8040,7 @@
       <enumerator name='CLK_ASM' value='11'/>
     </enum-decl>
     <!-- enum cpp_normalize_level -->
-    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-278'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-277'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -8048,7 +8048,7 @@
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
     <!-- struct spec_nodes -->
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-317'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-316'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* spec_nodes::n_defined -->
         <var-decl name='n_defined' type-id='type-id-112' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
@@ -8067,14 +8067,14 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__1 cpp_comment_table -->
-    <typedef-decl name='cpp_comment_table' type-id='type-id-369' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-282'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-368' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-281'/>
     <!-- typedef __anonymous_struct__2 cpp_comment -->
-    <typedef-decl name='cpp_comment' type-id='type-id-370' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-371'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-369' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-370'/>
     <!-- struct def_pragma_macro -->
-    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-372'>
+    <class-decl name='def_pragma_macro' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='358' column='1' id='type-id-371'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
-        <var-decl name='next' type-id='type-id-319' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-318' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* def_pragma_macro::name -->
@@ -8082,7 +8082,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* def_pragma_macro::definition -->
-        <var-decl name='definition' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- source_location def_pragma_macro::line -->
@@ -8102,11 +8102,11 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned char uchar -->
-    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-373'/>
+    <typedef-decl name='uchar' type-id='type-id-27' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-372'/>
     <!-- typedef __time_t time_t -->
-    <typedef-decl name='time_t' type-id='type-id-81' filepath='/usr/include/time.h' line='76' column='1' id='type-id-374'/>
+    <typedef-decl name='time_t' type-id='type-id-81' filepath='/usr/include/time.h' line='76' column='1' id='type-id-373'/>
     <!-- struct tm -->
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-375'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-374'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int tm::tm_sec -->
         <var-decl name='tm_sec' type-id='type-id-2' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -8153,137 +8153,137 @@
       </data-member>
     </class-decl>
     <!-- typedef _cpp_file _cpp_file -->
-    <typedef-decl name='_cpp_file' type-id='type-id-304' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-376'/>
+    <typedef-decl name='_cpp_file' type-id='type-id-303' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-375'/>
     <!-- _cpp_buff* -->
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-308'/>
     <!-- _cpp_buff** -->
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-377'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-376'/>
     <!-- _cpp_file* -->
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-243'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-361'/>
     <!-- _cpp_strbuf* -->
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-360'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-359'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-328'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-324'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-364'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-248'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-300' const='yes' id='type-id-385'/>
+    <qualified-type-def type-id='type-id-299' const='yes' id='type-id-384'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-304'/>
     <!-- const cpp_macro -->
-    <qualified-type-def type-id='type-id-298' const='yes' id='type-id-386'/>
+    <qualified-type-def type-id='type-id-297' const='yes' id='type-id-385'/>
     <!-- const cpp_macro* -->
-    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
     <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-388'/>
+    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-387'/>
     <!-- const cpp_string* -->
-    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-220'/>
+    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-219'/>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-299' const='yes' id='type-id-389'/>
+    <qualified-type-def type-id='type-id-298' const='yes' id='type-id-388'/>
     <!-- const cpp_token* -->
-    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-247'/>
     <!-- const cpp_token** -->
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-346'/>
+    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-345'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-391'/>
+    <qualified-type-def type-id='type-id-389' const='yes' id='type-id-390'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-309'/>
     <!-- const time_t -->
-    <qualified-type-def type-id='type-id-374' const='yes' id='type-id-392'/>
+    <qualified-type-def type-id='type-id-373' const='yes' id='type-id-391'/>
     <!-- const time_t* -->
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-393'/>
+    <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-392'/>
     <!-- const tm -->
-    <qualified-type-def type-id='type-id-375' const='yes' id='type-id-394'/>
+    <qualified-type-def type-id='type-id-374' const='yes' id='type-id-393'/>
     <!-- const tm* -->
-    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
     <!-- const uchar -->
-    <qualified-type-def type-id='type-id-373' const='yes' id='type-id-396'/>
+    <qualified-type-def type-id='type-id-372' const='yes' id='type-id-395'/>
     <!-- const uchar* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-214'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-240'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-274'/>
     <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-284'/>
     <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-264'/>
     <!-- cpp_dir** -->
-    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-397'/>
+    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-396'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-358'/>
     <!-- cpp_reader* -->
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-216'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-317'/>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-318'/>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-239'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-311'/>
     <!-- hash_table* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-269'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-268'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-330'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-315'/>
     <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-367'/>
+    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-366'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-362'/>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-355'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-343'/>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-249'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-314'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-403'/>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-374' size-in-bits='64' id='type-id-404'/>
     <!-- tokenrun* -->
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-283'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-331'/>
     <!-- uchar* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-222'/>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-242'/>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-407' size-in-bits='64' id='type-id-226'/>
+    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-225'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-351'/>
+    <pointer-type-def type-id='type-id-407' size-in-bits='64' id='type-id-350'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-357'/>
+    <pointer-type-def type-id='type-id-408' size-in-bits='64' id='type-id-356'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-349'/>
+    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-348'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-350'/>
+    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-349'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-355'/>
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-354'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-354'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-353'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-352'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-351'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-353'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-352'/>
     <!-- int _cpp_warn_if_unused_macro(cpp_reader*, cpp_hashnode*, void*) -->
     <function-decl name='_cpp_warn_if_unused_macro' mangled-name='_cpp_warn_if_unused_macro' filepath='../.././libcpp/macro.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_warn_if_unused_macro'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -8294,31 +8294,31 @@
     <!-- const uchar* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' mangled-name='_cpp_builtin_macro_text' filepath='../.././libcpp/macro.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_builtin_macro_text'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='node' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- const uchar* -->
-      <return type-id='type-id-215'/>
+      <return type-id='type-id-214'/>
     </function-decl>
     <!-- uchar* cpp_quote_string(uchar*, const uchar*, unsigned int) -->
     <function-decl name='cpp_quote_string' mangled-name='_Z16cpp_quote_stringPhPKhj' filepath='../.././libcpp/macro.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_quote_stringPhPKhj'>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-223' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-222' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-215' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-214' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='len' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-223'/>
+      <return type-id='type-id-222'/>
     </function-decl>
     <!-- bool _cpp_arguments_ok(cpp_reader*, cpp_macro*, const cpp_hashnode*, unsigned int) -->
     <function-decl name='_cpp_arguments_ok' mangled-name='_cpp_arguments_ok' filepath='../.././libcpp/macro.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_arguments_ok'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-294' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-293' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'const cpp_hashnode*' -->
-      <parameter type-id='type-id-305' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-304' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='argc' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- bool -->
@@ -8327,11 +8327,11 @@
     <!-- void _cpp_push_token_context(cpp_reader*, cpp_hashnode*, const cpp_token*, unsigned int) -->
     <function-decl name='_cpp_push_token_context' mangled-name='_cpp_push_token_context' filepath='../.././libcpp/macro.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_token_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='macro' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
+      <parameter type-id='type-id-247' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='count' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- void -->
@@ -8340,11 +8340,11 @@
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const uchar*, size_t) -->
     <function-decl name='_cpp_push_text_context' mangled-name='_cpp_push_text_context' filepath='../.././libcpp/macro.c' line='1830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_text_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='macro' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-215' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
+      <parameter type-id='type-id-214' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- void -->
@@ -8353,21 +8353,21 @@
     <!-- void _cpp_pop_context(cpp_reader*) -->
     <function-decl name='_cpp_pop_context' mangled-name='_cpp_pop_context' filepath='../.././libcpp/macro.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int cpp_sys_macro_p(cpp_reader*) -->
     <function-decl name='cpp_sys_macro_p' mangled-name='_Z15cpp_sys_macro_pP10cpp_reader' filepath='../.././libcpp/macro.c' line='2437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_sys_macro_pP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void _cpp_backup_tokens_direct(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -8376,7 +8376,7 @@
     <!-- void _cpp_backup_tokens(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -8385,23 +8385,23 @@
     <!-- const cpp_token* cpp_get_token_with_location(cpp_reader*, source_location*) -->
     <function-decl name='cpp_get_token_with_location' mangled-name='_Z27cpp_get_token_with_locationP10cpp_readerPj' filepath='../.././libcpp/macro.c' line='2424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_get_token_with_locationP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-113' name='loc' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <!-- const cpp_token* cpp_get_token(cpp_reader*) -->
     <function-decl name='cpp_get_token' mangled-name='_Z13cpp_get_tokenP10cpp_reader' filepath='../.././libcpp/macro.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_get_tokenP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <!-- void cpp_scan_nooutput(cpp_reader*) -->
     <function-decl name='cpp_scan_nooutput' mangled-name='_Z17cpp_scan_nooutputP10cpp_reader' filepath='../.././libcpp/macro.c' line='2447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_scan_nooutputP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -8415,9 +8415,9 @@
     <!-- bool _cpp_save_parameter(cpp_reader*, cpp_macro*, cpp_hashnode*) -->
     <function-decl name='_cpp_save_parameter' mangled-name='_cpp_save_parameter' filepath='../.././libcpp/macro.c' line='2590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_parameter'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-294' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-293' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='node' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- bool -->
@@ -8426,7 +8426,7 @@
     <!-- bool _cpp_create_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_create_definition' mangled-name='_cpp_create_definition' filepath='../.././libcpp/macro.c' line='2938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112'/>
       <!-- bool -->
@@ -8435,11 +8435,11 @@
     <!-- const unsigned char* cpp_macro_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='cpp_macro_definition' mangled-name='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode' filepath='../.././libcpp/macro.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <!-- unsigned int num_expanded_macros_counter -->
     <var-decl name='num_expanded_macros_counter' type-id='type-id-15' mangled-name='num_expanded_macros_counter' visibility='default' filepath='../.././libcpp/macro.c' line='170' column='1' elf-symbol-id='num_expanded_macros_counter'/>
@@ -8448,16 +8448,16 @@
     <!-- cpp_token* _cpp_temp_token(cpp_reader*) -->
     <function-decl name='_cpp_temp_token' mangled-name='_cpp_temp_token' filepath='../.././libcpp/internal.h' line='650' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_temp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-286'/>
+      <return type-id='type-id-285'/>
     </function-decl>
     <!-- void _cpp_extend_buff(cpp_reader*, _cpp_buff**, size_t) -->
     <function-decl name='_cpp_extend_buff' mangled-name='_cpp_extend_buff' filepath='../.././libcpp/internal.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type '_cpp_buff**' -->
-      <parameter type-id='type-id-377'/>
+      <parameter type-id='type-id-376'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- void -->
@@ -8466,7 +8466,7 @@
     <!-- bool cpp_error(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -8478,14 +8478,14 @@
     <!-- cpp_token* _cpp_lex_direct(cpp_reader*) -->
     <function-decl name='_cpp_lex_direct' mangled-name='_cpp_lex_direct' filepath='../.././libcpp/internal.h' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-286'/>
+      <return type-id='type-id-285'/>
     </function-decl>
     <!-- bool cpp_warning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line' mangled-name='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='932' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8501,14 +8501,14 @@
     <!-- time_t time(time_t*) -->
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'time_t*' -->
-      <parameter type-id='type-id-404'/>
+      <parameter type-id='type-id-403'/>
       <!-- typedef time_t -->
-      <return type-id='type-id-374'/>
+      <return type-id='type-id-373'/>
     </function-decl>
     <!-- bool cpp_errno(cpp_reader*, int, const char*) -->
     <function-decl name='cpp_errno' mangled-name='_Z9cpp_errnoP10cpp_readeriPKc' filepath='../.././libcpp/include/cpplib.h' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errnoP10cpp_readeriPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -8519,157 +8519,157 @@
     <!-- tm* localtime(const time_t*) -->
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const time_t*' -->
-      <parameter type-id='type-id-393'/>
+      <parameter type-id='type-id-392'/>
       <!-- tm* -->
-      <return type-id='type-id-405'/>
+      <return type-id='type-id-404'/>
     </function-decl>
     <!-- unsigned char* _cpp_unaligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_unaligned_alloc' mangled-name='_cpp_unaligned_alloc' filepath='../.././libcpp/internal.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_unaligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- const char* _cpp_get_file_name(_cpp_file*) -->
     <function-decl name='_cpp_get_file_name' mangled-name='_cpp_get_file_name' filepath='../.././libcpp/internal.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_name'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-243'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- char* asctime(const tm*) -->
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const tm*' -->
-      <parameter type-id='type-id-395'/>
+      <parameter type-id='type-id-394'/>
       <!-- char* -->
       <return type-id='type-id-50'/>
     </function-decl>
     <!-- stat* _cpp_get_file_stat(_cpp_file*) -->
     <function-decl name='_cpp_get_file_stat' mangled-name='_cpp_get_file_stat' filepath='../.././libcpp/internal.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_stat'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-243'/>
       <!-- stat* -->
       <return type-id='type-id-129'/>
     </function-decl>
     <!-- _cpp_file* cpp_get_file(cpp_buffer*) -->
     <function-decl name='cpp_get_file' mangled-name='_Z12cpp_get_fileP10cpp_buffer' filepath='../.././libcpp/include/cpplib.h' line='1012' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_fileP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-240'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-244'/>
+      <return type-id='type-id-243'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_buffer(cpp_reader*) -->
     <function-decl name='cpp_get_buffer' mangled-name='_Z14cpp_get_bufferP10cpp_reader' filepath='../.././libcpp/include/cpplib.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_get_bufferP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-241'/>
+      <return type-id='type-id-240'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const unsigned char*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/include/cpplib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-241'/>
+      <return type-id='type-id-240'/>
     </function-decl>
     <!-- void _cpp_clean_line(cpp_reader*) -->
     <function-decl name='_cpp_clean_line' mangled-name='_cpp_clean_line' filepath='../.././libcpp/internal.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_clean_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void _cpp_pop_buffer(cpp_reader*) -->
     <function-decl name='_cpp_pop_buffer' mangled-name='_cpp_pop_buffer' filepath='../.././libcpp/internal.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- int _cpp_do__Pragma(cpp_reader*) -->
     <function-decl name='_cpp_do__Pragma' mangled-name='_cpp_do__Pragma' filepath='../.././libcpp/internal.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do__Pragma'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void _cpp_free_buff(_cpp_buff*) -->
     <function-decl name='_cpp_free_buff' mangled-name='_cpp_free_buff' filepath='../.././libcpp/internal.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_buff'>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-309'/>
+      <parameter type-id='type-id-308'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- unsigned char* cpp_token_as_text(cpp_reader*, const cpp_token*) -->
     <function-decl name='cpp_token_as_text' mangled-name='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- unsigned int cpp_token_len(const cpp_token*) -->
     <function-decl name='cpp_token_len' mangled-name='_Z13cpp_token_lenPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_token_lenPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- unsigned int -->
       <return type-id='type-id-15'/>
     </function-decl>
     <!-- unsigned char* cpp_spell_token(cpp_reader*, const cpp_token*, unsigned char*, bool) -->
     <function-decl name='cpp_spell_token' mangled-name='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb' filepath='../.././libcpp/include/cpplib.h' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-243'/>
+      <parameter type-id='type-id-242'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-3'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_get_buff(cpp_reader*, size_t) -->
     <function-decl name='_cpp_get_buff' mangled-name='_cpp_get_buff' filepath='../.././libcpp/internal.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-309'/>
+      <return type-id='type-id-308'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_append_extend_buff(cpp_reader*, _cpp_buff*, size_t) -->
     <function-decl name='_cpp_append_extend_buff' mangled-name='_cpp_append_extend_buff' filepath='../.././libcpp/internal.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_append_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-309'/>
+      <parameter type-id='type-id-308'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-309'/>
+      <return type-id='type-id-308'/>
     </function-decl>
     <!-- void _cpp_release_buff(cpp_reader*, _cpp_buff*) -->
     <function-decl name='_cpp_release_buff' mangled-name='_cpp_release_buff' filepath='../.././libcpp/internal.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_release_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-309'/>
+      <parameter type-id='type-id-308'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- bool cpp_warning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning' mangled-name='_Z11cpp_warningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_warningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -8681,48 +8681,48 @@
     <!-- const cpp_token* cpp_peek_token(cpp_reader*, int) -->
     <function-decl name='cpp_peek_token' mangled-name='_Z14cpp_peek_tokenP10cpp_readeri' filepath='../.././libcpp/include/cpplib.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_peek_tokenP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <!-- const cpp_token* _cpp_lex_token(cpp_reader*) -->
     <function-decl name='_cpp_lex_token' mangled-name='_cpp_lex_token' filepath='../.././libcpp/internal.h' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <!-- bool _cpp_read_logical_line_trad(cpp_reader*) -->
     <function-decl name='_cpp_read_logical_line_trad' mangled-name='_cpp_read_logical_line_trad' filepath='../.././libcpp/internal.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_logical_line_trad'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int _cpp_equiv_tokens(const cpp_token*, const cpp_token*) -->
     <function-decl name='_cpp_equiv_tokens' mangled-name='_cpp_equiv_tokens' filepath='../.././libcpp/internal.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_equiv_tokens'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- bool _cpp_expansions_different_trad(const cpp_macro*, const cpp_macro*) -->
     <function-decl name='_cpp_expansions_different_trad' mangled-name='_cpp_expansions_different_trad' filepath='../.././libcpp/internal.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expansions_different_trad'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-386'/>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-386'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- bool cpp_pedwarning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_pedwarning_with_line' mangled-name='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8738,7 +8738,7 @@
     <!-- bool cpp_error_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_error_with_line' mangled-name='_Z19cpp_error_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_error_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8754,7 +8754,7 @@
     <!-- bool cpp_pedwarning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_pedwarning' mangled-name='_Z14cpp_pedwarningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_pedwarningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char*' -->
@@ -8766,50 +8766,50 @@
     <!-- bool _cpp_create_trad_definition(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_create_trad_definition' mangled-name='_cpp_create_trad_definition' filepath='../.././libcpp/internal.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_trad_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-294'/>
+      <parameter type-id='type-id-293'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- unsigned char* _cpp_aligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_aligned_alloc' mangled-name='_cpp_aligned_alloc' filepath='../.././libcpp/internal.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_aligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- size_t _cpp_replacement_text_len(const cpp_macro*) -->
     <function-decl name='_cpp_replacement_text_len' mangled-name='_cpp_replacement_text_len' filepath='../.././libcpp/internal.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_replacement_text_len'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-386'/>
       <!-- typedef size_t -->
       <return type-id='type-id-31'/>
     </function-decl>
     <!-- unsigned char* _cpp_copy_replacement_text(const cpp_macro*, unsigned char*) -->
     <function-decl name='_cpp_copy_replacement_text' filepath='../.././libcpp/internal.h' line='696' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-386'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-243'/>
+      <parameter type-id='type-id-242'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-243'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <!-- bool (cpp_reader*, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-380'>
+    <function-type size-in-bits='64' id='type-id-379'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-type>
     <!-- bool (cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
-    <function-type size-in-bits='64' id='type-id-381'>
+    <function-type size-in-bits='64' id='type-id-380'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'int' -->
@@ -8826,51 +8826,51 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- bool (iconv_t, const unsigned char*, size_t, _cpp_strbuf*) -->
-    <function-type size-in-bits='64' id='type-id-382'>
+    <function-type size-in-bits='64' id='type-id-381'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-170'/>
+      <parameter type-id='type-id-169'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type '_cpp_strbuf*' -->
-      <parameter type-id='type-id-379'/>
+      <parameter type-id='type-id-378'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-type>
     <!-- char* (const char*, cpp_dir*) -->
-    <function-type size-in-bits='64' id='type-id-383'>
+    <function-type size-in-bits='64' id='type-id-382'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-265'/>
+      <parameter type-id='type-id-264'/>
       <!-- char* -->
       <return type-id='type-id-50'/>
     </function-type>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**) -->
-    <function-type size-in-bits='64' id='type-id-384'>
+    <function-type size-in-bits='64' id='type-id-383'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'cpp_dir**' -->
-      <parameter type-id='type-id-397'/>
+      <parameter type-id='type-id-396'/>
       <!-- const char* -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*) -->
-    <function-type size-in-bits='64' id='type-id-398'>
+    <function-type size-in-bits='64' id='type-id-397'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- cpp_hashnode* -->
       <return type-id='type-id-112'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-402'>
+    <function-type size-in-bits='64' id='type-id-401'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
@@ -8879,32 +8879,32 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-406'>
+    <function-type size-in-bits='64' id='type-id-405'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-270'/>
+      <return type-id='type-id-269'/>
     </function-type>
     <!-- void (cpp_reader*) -->
-    <function-type size-in-bits='64' id='type-id-407'>
+    <function-type size-in-bits='64' id='type-id-406'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-408'>
+    <function-type size-in-bits='64' id='type-id-407'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, const char*, int, const char*) -->
-    <function-type size-in-bits='64' id='type-id-409'>
+    <function-type size-in-bits='64' id='type-id-408'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
@@ -8915,66 +8915,66 @@
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, const cpp_token*, int) -->
-    <function-type size-in-bits='64' id='type-id-410'>
+    <function-type size-in-bits='64' id='type-id-409'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, const line_map*) -->
-    <function-type size-in-bits='64' id='type-id-411'>
+    <function-type size-in-bits='64' id='type-id-410'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-47'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, source_location) -->
-    <function-type size-in-bits='64' id='type-id-412'>
+    <function-type size-in-bits='64' id='type-id-411'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const cpp_string*) -->
-    <function-type size-in-bits='64' id='type-id-413'>
+    <function-type size-in-bits='64' id='type-id-412'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-219'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
-    <function-type size-in-bits='64' id='type-id-414'>
+    <function-type size-in-bits='64' id='type-id-413'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const cpp_token**' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-415'>
+    <function-type size-in-bits='64' id='type-id-414'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-99'/>
       <!-- parameter of type 'cpp_hashnode*' -->
@@ -8983,19 +8983,19 @@
       <return type-id='type-id-30'/>
     </function-type>
     <!-- struct _cpp_strbuf -->
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-378'/>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-377'/>
     <!-- struct cpp_savedstate -->
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-399'/>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-398'/>
     <!-- struct directive -->
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-390'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-389'/>
     <!-- struct file_hash_entry_pool -->
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-399'/>
     <!-- struct if_stack -->
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-401'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-400'/>
     <!-- struct pragma_entry -->
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-403'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-402'/>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-371' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-370'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-370' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-369'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-50' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -9006,10 +9006,10 @@
       </data-member>
     </class-decl>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-282' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-369'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-281' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-368'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-275' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -9023,20 +9023,20 @@
   </abi-instr>
   <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'>
     <!-- const deps -->
-    <qualified-type-def type-id='type-id-320' const='yes' id='type-id-416'/>
+    <qualified-type-def type-id='type-id-319' const='yes' id='type-id-415'/>
     <!-- const deps* -->
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-416'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-240' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
+      <parameter type-id='type-id-239' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void deps_add_target(deps*, const char*, int) -->
     <function-decl name='deps_add_target' mangled-name='_Z15deps_add_targetP4depsPKci' filepath='../.././libcpp/mkdeps.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15deps_add_targetP4depsPKci'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-240' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
+      <parameter type-id='type-id-239' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='t' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9047,7 +9047,7 @@
     <!-- void deps_add_default_target(deps*, const char*) -->
     <function-decl name='deps_add_default_target' mangled-name='_Z23deps_add_default_targetP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23deps_add_default_targetP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-239'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -9056,7 +9056,7 @@
     <!-- void deps_add_vpath(deps*, const char*) -->
     <function-decl name='deps_add_vpath' mangled-name='_Z14deps_add_vpathP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14deps_add_vpathP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-239'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- void -->
@@ -9065,7 +9065,7 @@
     <!-- void deps_write(const deps*, FILE*, unsigned int) -->
     <function-decl name='deps_write' mangled-name='_Z10deps_writePK4depsP8_IO_FILEj' filepath='../.././libcpp/mkdeps.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10deps_writePK4depsP8_IO_FILEj'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-417' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
+      <parameter type-id='type-id-416' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9076,7 +9076,7 @@
     <!-- void deps_phony_targets(const deps*, FILE*) -->
     <function-decl name='deps_phony_targets' mangled-name='_Z18deps_phony_targetsPK4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18deps_phony_targetsPK4depsP8_IO_FILE'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-417' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
+      <parameter type-id='type-id-416' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fp' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- void -->
@@ -9085,7 +9085,7 @@
     <!-- int deps_save(deps*, FILE*) -->
     <function-decl name='deps_save' mangled-name='_Z9deps_saveP4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_saveP4depsP8_IO_FILE'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-240' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
+      <parameter type-id='type-id-239' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='f' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- int -->
@@ -9094,7 +9094,7 @@
     <!-- int deps_restore(deps*, FILE*, const char*) -->
     <function-decl name='deps_restore' mangled-name='_Z12deps_restoreP4depsP8_IO_FILEPKc' filepath='../.././libcpp/mkdeps.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_restoreP4depsP8_IO_FILEPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-240' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
+      <parameter type-id='type-id-239' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-88' name='fd' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -9107,9 +9107,9 @@
     <!-- 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*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-267'/>
+      <parameter type-id='type-id-266'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16'/>
       <!-- void -->
@@ -9118,9 +9118,9 @@
     <!-- void ht_load(hash_table*, hashnode*, unsigned int, unsigned int, bool) -->
     <function-decl name='ht_load' mangled-name='_Z7ht_loadP2htPP13ht_identifierjjb' filepath='../.././libcpp/symtab.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z7ht_loadP2htPP13ht_identifierjjb'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-268' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'hashnode*' -->
-      <parameter type-id='type-id-331' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-330' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-15' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9133,7 +9133,7 @@
     <!-- void ht_dump_statistics(hash_table*) -->
     <function-decl name='ht_dump_statistics' mangled-name='_Z18ht_dump_statisticsP2ht' filepath='../.././libcpp/symtab.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18ht_dump_statisticsP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -9147,7 +9147,7 @@
   </abi-instr>
   <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'>
     <!-- enum ht_lookup_option -->
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-287'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-286'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
@@ -9155,9 +9155,9 @@
     <!-- 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*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-215' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-214' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- void -->
@@ -9166,49 +9166,49 @@
     <!-- void _cpp_remove_overlay(cpp_reader*) -->
     <function-decl name='_cpp_remove_overlay' mangled-name='_cpp_remove_overlay' filepath='../.././libcpp/traditional.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remove_overlay'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- bool _cpp_scan_out_logical_line(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_scan_out_logical_line' mangled-name='_cpp_scan_out_logical_line' filepath='../.././libcpp/traditional.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_scan_out_logical_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-294'/>
+      <parameter type-id='type-id-293'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- uchar* _cpp_copy_replacement_text(const cpp_macro*, uchar*) -->
     <function-decl name='_cpp_copy_replacement_text' mangled-name='_cpp_copy_replacement_text' filepath='../.././libcpp/traditional.c' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_copy_replacement_text'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-387' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-386' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-223' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-222' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-223'/>
+      <return type-id='type-id-222'/>
     </function-decl>
     <!-- hashnode ht_lookup(hash_table*, const unsigned char*, size_t, ht_lookup_option) -->
     <function-decl name='ht_lookup' mangled-name='_Z9ht_lookupP2htPKhm16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_lookupP2htPKhm16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-269'/>
+      <parameter type-id='type-id-268'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-287'/>
+      <parameter type-id='type-id-286'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-270'/>
+      <return type-id='type-id-269'/>
     </function-decl>
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_push_text_context' filepath='../.././libcpp/internal.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- void -->
@@ -9217,23 +9217,23 @@
     <!-- const unsigned char* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' filepath='../.././libcpp/internal.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-216' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-112' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <!-- bool _cpp_skip_block_comment(cpp_reader*) -->
     <function-decl name='_cpp_skip_block_comment' mangled-name='_cpp_skip_block_comment' filepath='../.././libcpp/internal.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_skip_block_comment'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int _cpp_handle_directive(cpp_reader*, int) -->
     <function-decl name='_cpp_handle_directive' mangled-name='_cpp_handle_directive' filepath='../.././libcpp/internal.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_handle_directive'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- int -->
@@ -9242,7 +9242,7 @@
     <!-- void _cpp_process_line_notes(cpp_reader*, int) -->
     <function-decl name='_cpp_process_line_notes' mangled-name='_cpp_process_line_notes' filepath='../.././libcpp/internal.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_process_line_notes'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
@@ -9251,7 +9251,7 @@
     <!-- bool _cpp_get_fresh_line(cpp_reader*) -->
     <function-decl name='_cpp_get_fresh_line' mangled-name='_cpp_get_fresh_line' filepath='../.././libcpp/internal.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_fresh_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-216'/>
       <!-- bool -->
       <return type-id='type-id-3'/>
     </function-decl>
@@ -9382,30 +9382,30 @@
   </abi-instr>
   <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'>
     <!-- const demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-418' size-in-bits='8448' id='type-id-419'>
+    <array-type-def dimensions='1' type-id='type-id-417' size-in-bits='8448' id='type-id-418'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-6' id='type-id-420'/>
+      <subrange length='33' type-id='type-id-6' id='type-id-419'/>
     </array-type-def>
     <!-- const demangle_operator_info[58] -->
-    <array-type-def dimensions='1' type-id='type-id-421' size-in-bits='11136' id='type-id-422'>
+    <array-type-def dimensions='1' type-id='type-id-420' size-in-bits='11136' id='type-id-421'>
       <!-- <anonymous range>[58] -->
-      <subrange length='58' type-id='type-id-6' id='type-id-423'/>
+      <subrange length='58' type-id='type-id-6' id='type-id-422'/>
     </array-type-def>
     <!-- short int -->
-    <type-decl name='short int' size-in-bits='16' id='type-id-424'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-423'/>
     <!-- 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-425'>
+    <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-424'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component_type demangle_component::type -->
-        <var-decl name='type' type-id='type-id-426' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
+        <var-decl name='type' type-id='type-id-425' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} demangle_component::u -->
-        <var-decl name='u' type-id='type-id-427' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
+        <var-decl name='u' type-id='type-id-426' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum demangle_component_type -->
-    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-426'>
+    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-425'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='DEMANGLE_COMPONENT_NAME' value='0'/>
       <enumerator name='DEMANGLE_COMPONENT_QUAL_NAME' value='1'/>
@@ -9480,58 +9480,58 @@
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='70'/>
     </enum-decl>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-427'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-426'>
       <data-member access='private'>
         <!-- struct {const char* s; int len;} s_name -->
-        <var-decl name='s_name' type-id='type-id-428' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
+        <var-decl name='s_name' type-id='type-id-427' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_operator_info* op;} s_operator -->
-        <var-decl name='s_operator' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
+        <var-decl name='s_operator' type-id='type-id-428' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int args; demangle_component* name;} s_extended_operator -->
-        <var-decl name='s_extended_operator' type-id='type-id-430' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
+        <var-decl name='s_extended_operator' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* length; short int accum; short int sat;} s_fixed -->
-        <var-decl name='s_fixed' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
+        <var-decl name='s_fixed' type-id='type-id-430' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor -->
-        <var-decl name='s_ctor' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
+        <var-decl name='s_ctor' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor -->
-        <var-decl name='s_dtor' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
+        <var-decl name='s_dtor' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_builtin_type_info* type;} s_builtin -->
-        <var-decl name='s_builtin' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
+        <var-decl name='s_builtin' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const char* string; int len;} s_string -->
-        <var-decl name='s_string' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
+        <var-decl name='s_string' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {long int number;} s_number -->
-        <var-decl name='s_number' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
+        <var-decl name='s_number' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int character;} s_character -->
-        <var-decl name='s_character' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
+        <var-decl name='s_character' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* left; demangle_component* right;} s_binary -->
-        <var-decl name='s_binary' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
+        <var-decl name='s_binary' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* sub; int num;} s_unary_num -->
-        <var-decl name='s_unary_num' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
+        <var-decl name='s_unary_num' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {const char* s; int len;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-428'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-427'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* s -->
         <var-decl name='s' type-id='type-id-1' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='446' column='1'/>
@@ -9542,14 +9542,14 @@
       </data-member>
     </class-decl>
     <!-- struct {const demangle_operator_info* op;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-429'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-428'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_operator_info* op -->
-        <var-decl name='op' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
+        <var-decl name='op' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_operator_info -->
-    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-441'>
+    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-440'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_operator_info::code -->
         <var-decl name='code' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='40' column='1'/>
@@ -9568,44 +9568,44 @@
       </data-member>
     </class-decl>
     <!-- struct {int args; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-430'>
+    <class-decl name='__anonymous_struct__2' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-429'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int args -->
         <var-decl name='args' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
+        <var-decl name='name' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* length; short int accum; short int sat;} -->
-    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-431'>
+    <class-decl name='__anonymous_struct__3' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-430'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* length -->
-        <var-decl name='length' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
+        <var-decl name='length' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- short int accum -->
-        <var-decl name='accum' type-id='type-id-424' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
+        <var-decl name='accum' type-id='type-id-423' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
         <!-- short int sat -->
-        <var-decl name='sat' type-id='type-id-424' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
+        <var-decl name='sat' type-id='type-id-423' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-432'>
+    <class-decl name='__anonymous_struct__4' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-431'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_ctor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-443' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
+        <var-decl name='kind' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
+        <var-decl name='name' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_ctor_kinds -->
-    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-443'>
+    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-442'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gnu_v3_complete_object_ctor' value='1'/>
       <enumerator name='gnu_v3_base_object_ctor' value='2'/>
@@ -9613,18 +9613,18 @@
       <enumerator name='gnu_v3_object_ctor_group' value='4'/>
     </enum-decl>
     <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-433'>
+    <class-decl name='__anonymous_struct__5' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-432'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_dtor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
+        <var-decl name='kind' type-id='type-id-443' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
+        <var-decl name='name' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_dtor_kinds -->
-    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-444'>
+    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-443'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='gnu_v3_deleting_dtor' value='1'/>
       <enumerator name='gnu_v3_complete_object_dtor' value='2'/>
@@ -9632,14 +9632,14 @@
       <enumerator name='gnu_v3_object_dtor_group' value='4'/>
     </enum-decl>
     <!-- struct {const demangle_builtin_type_info* type;} -->
-    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-434'>
+    <class-decl name='__anonymous_struct__6' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-433'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_builtin_type_info* type -->
-        <var-decl name='type' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
+        <var-decl name='type' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_builtin_type_info -->
-    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-446'>
+    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-445'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_builtin_type_info::name -->
         <var-decl name='name' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='80' column='1'/>
@@ -9658,11 +9658,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- d_builtin_type_print demangle_builtin_type_info::print -->
-        <var-decl name='print' type-id='type-id-447' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
+        <var-decl name='print' type-id='type-id-446' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum d_builtin_type_print -->
-    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-447'>
+    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-446'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='D_PRINT_DEFAULT' value='0'/>
       <enumerator name='D_PRINT_INT' value='1'/>
@@ -9676,7 +9676,7 @@
       <enumerator name='D_PRINT_VOID' value='9'/>
     </enum-decl>
     <!-- struct {const char* string; int len;} -->
-    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-435'>
+    <class-decl name='__anonymous_struct__7' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-434'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* string -->
         <var-decl name='string' type-id='type-id-1' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='506' column='1'/>
@@ -9687,35 +9687,35 @@
       </data-member>
     </class-decl>
     <!-- struct {long int number;} -->
-    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-436'>
+    <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-435'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int number -->
         <var-decl name='number' type-id='type-id-21' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {int character;} -->
-    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-437'>
+    <class-decl name='__anonymous_struct__9' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-436'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int character -->
         <var-decl name='character' type-id='type-id-2' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='521' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* left; demangle_component* right;} -->
-    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-438'>
+    <class-decl name='__anonymous_struct__10' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-437'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* left -->
-        <var-decl name='left' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
+        <var-decl name='left' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* right -->
-        <var-decl name='right' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
+        <var-decl name='right' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* sub; int num;} -->
-    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-439'>
+    <class-decl name='__anonymous_struct__11' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-438'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* sub -->
-        <var-decl name='sub' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
+        <var-decl name='sub' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int num -->
@@ -9723,7 +9723,7 @@
       </data-member>
     </class-decl>
     <!-- struct d_info -->
-    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-448'>
+    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-447'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* d_info::s -->
         <var-decl name='s' type-id='type-id-1' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='96' column='1'/>
@@ -9742,7 +9742,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- demangle_component* d_info::comps -->
-        <var-decl name='comps' type-id='type-id-442' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
+        <var-decl name='comps' type-id='type-id-441' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int d_info::next_comp -->
@@ -9754,7 +9754,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- demangle_component** d_info::subs -->
-        <var-decl name='subs' type-id='type-id-449' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
+        <var-decl name='subs' type-id='type-id-448' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int d_info::next_sub -->
@@ -9770,7 +9770,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- demangle_component* d_info::last_name -->
-        <var-decl name='last_name' type-id='type-id-442' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
+        <var-decl name='last_name' type-id='type-id-441' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- int d_info::expansion -->
@@ -9778,31 +9778,31 @@
       </data-member>
     </class-decl>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
-    <typedef-decl name='demangle_callbackref' type-id='type-id-450' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-451'/>
+    <typedef-decl name='demangle_callbackref' type-id='type-id-449' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-450'/>
     <!-- const demangle_builtin_type_info -->
-    <qualified-type-def type-id='type-id-446' const='yes' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-445' const='yes' id='type-id-417'/>
     <!-- const demangle_builtin_type_info* -->
-    <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-444'/>
     <!-- const demangle_component -->
-    <qualified-type-def type-id='type-id-425' const='yes' id='type-id-452'/>
+    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-451'/>
     <!-- const demangle_component* -->
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-452'/>
     <!-- const demangle_operator_info -->
-    <qualified-type-def type-id='type-id-441' const='yes' id='type-id-421'/>
+    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-420'/>
     <!-- const demangle_operator_info* -->
-    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-440'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-439'/>
     <!-- d_info* -->
-    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-453'/>
     <!-- demangle_component* -->
-    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-441'/>
     <!-- demangle_component** -->
-    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-448'/>
     <!-- void (const char*, typedef size_t, void*)* -->
-    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-454' size-in-bits='64' id='type-id-449'/>
     <!-- int cplus_demangle_fill_name(demangle_component*, const char*, int) -->
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
+      <parameter type-id='type-id-441' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='s' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9813,60 +9813,60 @@
     <!-- int cplus_demangle_fill_extended_operator(demangle_component*, int, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_extended_operator' mangled-name='cplus_demangle_fill_extended_operator' filepath='../.././libiberty/cp-demangle.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_extended_operator'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
+      <parameter type-id='type-id-441' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='args' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
+      <parameter type-id='type-id-441' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int cplus_demangle_fill_ctor(demangle_component*, gnu_v3_ctor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_ctor' mangled-name='cplus_demangle_fill_ctor' filepath='../.././libiberty/cp-demangle.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_ctor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
+      <parameter type-id='type-id-441' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
       <!-- parameter of type 'enum gnu_v3_ctor_kinds' -->
-      <parameter type-id='type-id-443' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
+      <parameter type-id='type-id-442' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
+      <parameter type-id='type-id-441' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int cplus_demangle_fill_dtor(demangle_component*, gnu_v3_dtor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_dtor' mangled-name='cplus_demangle_fill_dtor' filepath='../.././libiberty/cp-demangle.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_dtor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
+      <parameter type-id='type-id-441' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
       <!-- parameter of type 'enum gnu_v3_dtor_kinds' -->
-      <parameter type-id='type-id-444' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
+      <parameter type-id='type-id-443' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-442' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
+      <parameter type-id='type-id-441' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_type(d_info*) -->
     <function-decl name='cplus_demangle_type' mangled-name='cplus_demangle_type' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_type'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
+      <parameter type-id='type-id-453' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-442'/>
+      <return type-id='type-id-441'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_mangled_name(d_info*, int) -->
     <function-decl name='cplus_demangle_mangled_name' mangled-name='cplus_demangle_mangled_name' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_mangled_name'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
+      <parameter type-id='type-id-453' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='top_level' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-442'/>
+      <return type-id='type-id-441'/>
     </function-decl>
     <!-- int cplus_demangle_print_callback(int, const demangle_component*, demangle_callbackref, void*) -->
     <function-decl name='cplus_demangle_print_callback' mangled-name='cplus_demangle_print_callback' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print_callback'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-453' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
+      <parameter type-id='type-id-452' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-451' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
+      <parameter type-id='type-id-450' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- int -->
@@ -9877,11 +9877,11 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-453' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
+      <parameter type-id='type-id-452' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='estimate' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-173' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
+      <parameter type-id='type-id-172' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- char* -->
       <return type-id='type-id-50'/>
     </function-decl>
@@ -9894,7 +9894,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
+      <parameter type-id='type-id-453' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -9905,7 +9905,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='options' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-451' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
+      <parameter type-id='type-id-450' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- int -->
@@ -9916,7 +9916,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-451' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
+      <parameter type-id='type-id-450' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- int -->
@@ -9927,19 +9927,19 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1'/>
       <!-- enum gnu_v3_ctor_kinds -->
-      <return type-id='type-id-443'/>
+      <return type-id='type-id-442'/>
     </function-decl>
     <!-- gnu_v3_dtor_kinds is_gnu_v3_mangled_dtor(const char*) -->
     <function-decl name='is_gnu_v3_mangled_dtor' mangled-name='is_gnu_v3_mangled_dtor' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_dtor'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1'/>
       <!-- enum gnu_v3_dtor_kinds -->
-      <return type-id='type-id-444'/>
+      <return type-id='type-id-443'/>
     </function-decl>
     <!-- const demangle_operator_info cplus_demangle_operators[58] -->
-    <var-decl name='cplus_demangle_operators' type-id='type-id-422' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
+    <var-decl name='cplus_demangle_operators' type-id='type-id-421' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
     <!-- const demangle_builtin_type_info cplus_demangle_builtin_types[33] -->
-    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-419' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
+    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-418' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
     <!-- void* realloc(void*, size_t) -->
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -9950,7 +9950,7 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <!-- void (const char*, size_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-455'>
+    <function-type size-in-bits='64' id='type-id-454'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -9963,12 +9963,12 @@
   </abi-instr>
   <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'>
     <!-- const demangler_engine[11] -->
-    <array-type-def dimensions='1' type-id='type-id-456' size-in-bits='2112' id='type-id-457'>
+    <array-type-def dimensions='1' type-id='type-id-455' size-in-bits='2112' id='type-id-456'>
       <!-- <anonymous range>[11] -->
-      <subrange length='11' type-id='type-id-6' id='type-id-458'/>
+      <subrange length='11' type-id='type-id-6' id='type-id-457'/>
     </array-type-def>
     <!-- enum demangling_styles -->
-    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-459'>
+    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-458'>
       <underlying-type type-id='type-id-26'/>
       <enumerator name='no_demangling' value='-1'/>
       <enumerator name='unknown_demangling' value='0'/>
@@ -9983,26 +9983,26 @@
       <enumerator name='gnat_demangling' value='32768'/>
     </enum-decl>
     <!-- struct demangler_engine -->
-    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-460'>
+    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-459'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* const demangler_engine::demangling_style_name -->
-        <var-decl name='demangling_style_name' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
+        <var-decl name='demangling_style_name' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const demangling_styles demangler_engine::demangling_style -->
-        <var-decl name='demangling_style' type-id='type-id-462' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
+        <var-decl name='demangling_style' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char* const demangler_engine::demangling_style_doc -->
-        <var-decl name='demangling_style_doc' type-id='type-id-461' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
+        <var-decl name='demangling_style_doc' type-id='type-id-460' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
       </data-member>
     </class-decl>
     <!-- const char* const -->
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-461'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-460'/>
     <!-- const demangler_engine -->
-    <qualified-type-def type-id='type-id-460' const='yes' id='type-id-456'/>
+    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-455'/>
     <!-- const demangling_styles -->
-    <qualified-type-def type-id='type-id-459' const='yes' id='type-id-462'/>
+    <qualified-type-def type-id='type-id-458' const='yes' id='type-id-461'/>
     <!-- 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' -->
@@ -10022,16 +10022,16 @@
     <!-- demangling_styles cplus_demangle_set_style(demangling_styles) -->
     <function-decl name='cplus_demangle_set_style' mangled-name='cplus_demangle_set_style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_set_style'>
       <!-- parameter of type 'enum demangling_styles' -->
-      <parameter type-id='type-id-459' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
+      <parameter type-id='type-id-458' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-459'/>
+      <return type-id='type-id-458'/>
     </function-decl>
     <!-- demangling_styles cplus_demangle_name_to_style(const char*) -->
     <function-decl name='cplus_demangle_name_to_style' mangled-name='cplus_demangle_name_to_style' filepath='../.././libiberty/cplus-dem.c' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_name_to_style'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='name' filepath='../.././libiberty/cplus-dem.c' line='802' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-459'/>
+      <return type-id='type-id-458'/>
     </function-decl>
     <!-- char* ada_demangle(const char*, int) -->
     <function-decl name='ada_demangle' mangled-name='ada_demangle' filepath='../.././libiberty/cplus-dem.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ada_demangle'>
@@ -10054,9 +10054,9 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- demangling_styles current_demangling_style -->
-    <var-decl name='current_demangling_style' type-id='type-id-459' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
+    <var-decl name='current_demangling_style' type-id='type-id-458' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
     <!-- const demangler_engine libiberty_demanglers[11] -->
-    <var-decl name='libiberty_demanglers' type-id='type-id-457' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
+    <var-decl name='libiberty_demanglers' type-id='type-id-456' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
     <!-- int __builtin_strcmp(const char*, const char*) -->
     <function-decl name='__builtin_strcmp' mangled-name='strcmp' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
@@ -10240,11 +10240,11 @@
   </abi-instr>
   <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'>
     <!-- double -->
-    <type-decl name='double' size-in-bits='64' id='type-id-463'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-462'/>
     <!-- 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' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='224' column='1'/>
       <!-- typedef size_t -->
       <return type-id='type-id-31'/>
     </function-decl>
@@ -10253,55 +10253,55 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='size' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-191' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-190' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-193' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-192' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-194' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
+      <parameter type-id='type-id-193' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-199' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
+      <parameter type-id='type-id-198' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-201' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
+      <parameter type-id='type-id-200' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-189'/>
+      <return type-id='type-id-188'/>
     </function-decl>
     <!-- htab_t htab_create_typed_alloc(size_t, htab_hash, htab_eq, htab_del, htab_alloc, htab_alloc, htab_free) -->
     <function-decl name='htab_create_typed_alloc' mangled-name='htab_create_typed_alloc' filepath='../.././libiberty/hashtab.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_typed_alloc'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='size' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-191' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-190' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-193' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-192' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-194' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-193' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-196' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-195' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-196' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-195' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-197' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-196' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-189'/>
+      <return type-id='type-id-188'/>
     </function-decl>
     <!-- void htab_set_functions_ex(htab_t, htab_hash, htab_eq, htab_del, void*, htab_alloc_with_arg, htab_free_with_arg) -->
     <function-decl name='htab_set_functions_ex' mangled-name='htab_set_functions_ex' filepath='../.././libiberty/hashtab.c' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_set_functions_ex'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-191' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-190' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-193' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-192' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-194' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
+      <parameter type-id='type-id-193' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-199' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-198' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-201' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-200' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -10310,25 +10310,25 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='size' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-191' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-190' name='hash_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-193' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-192' name='eq_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-194' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
+      <parameter type-id='type-id-193' name='del_f' filepath='../.././libiberty/hashtab.c' line='412' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-189'/>
+      <return type-id='type-id-188'/>
     </function-decl>
     <!-- void htab_empty(htab_t) -->
     <function-decl name='htab_empty' mangled-name='htab_empty' filepath='../.././libiberty/hashtab.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_empty'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void* htab_find(htab_t, void*) -->
     <function-decl name='htab_find' mangled-name='htab_find' filepath='../.././libiberty/hashtab.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='element' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- void* -->
@@ -10337,29 +10337,29 @@
     <!-- void** htab_find_slot(htab_t, void*, insert_option) -->
     <function-decl name='htab_find_slot' mangled-name='htab_find_slot' filepath='../.././libiberty/hashtab.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='element' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-202' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-201' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- void** -->
       <return type-id='type-id-143'/>
     </function-decl>
     <!-- void htab_remove_elt_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_remove_elt_with_hash' mangled-name='htab_remove_elt_with_hash' filepath='../.././libiberty/hashtab.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt_with_hash'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='element' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-187' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-186' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void htab_remove_elt(htab_t, void*) -->
     <function-decl name='htab_remove_elt' mangled-name='htab_remove_elt' filepath='../.././libiberty/hashtab.c' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='element' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- void -->
@@ -10368,7 +10368,7 @@
     <!-- void htab_clear_slot(htab_t, void**) -->
     <function-decl name='htab_clear_slot' mangled-name='htab_clear_slot' filepath='../.././libiberty/hashtab.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_clear_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-143' name='slot' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- void -->
@@ -10377,9 +10377,9 @@
     <!-- void htab_traverse_noresize(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse_noresize' mangled-name='htab_traverse_noresize' filepath='../.././libiberty/hashtab.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_traverse_noresize'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-261' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-260' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='info' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- void -->
@@ -10388,9 +10388,9 @@
     <!-- double htab_collisions(htab_t) -->
     <function-decl name='htab_collisions' mangled-name='htab_collisions' filepath='../.././libiberty/hashtab.c' line='807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_collisions'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-189' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
+      <parameter type-id='type-id-188' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
       <!-- double -->
-      <return type-id='type-id-463'/>
+      <return type-id='type-id-462'/>
     </function-decl>
     <!-- hashval_t iterative_hash(void*, size_t, hashval_t) -->
     <function-decl name='iterative_hash' mangled-name='iterative_hash' filepath='../.././libiberty/hashtab.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterative_hash'>
@@ -10399,14 +10399,14 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='length' filepath='../.././libiberty/hashtab.c' line='932' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-187' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
+      <parameter type-id='type-id-186' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-187'/>
+      <return type-id='type-id-186'/>
     </function-decl>
     <!-- htab_hash htab_hash_pointer -->
-    <var-decl name='htab_hash_pointer' type-id='type-id-191' 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_hash_pointer' type-id='type-id-190' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
     <!-- htab_eq htab_eq_pointer -->
-    <var-decl name='htab_eq_pointer' type-id='type-id-193' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
+    <var-decl name='htab_eq_pointer' type-id='type-id-192' 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' 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() -->
@@ -10415,7 +10415,7 @@
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- const unsigned char _hex_value[256] -->
-    <var-decl name='_hex_value' type-id='type-id-272' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
+    <var-decl name='_hex_value' type-id='type-id-271' 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' 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*) -->
@@ -10451,35 +10451,35 @@
   </abi-instr>
   <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'>
     <!-- md5_uint32[2] -->
-    <array-type-def dimensions='1' type-id='type-id-464' size-in-bits='64' id='type-id-465'>
+    <array-type-def dimensions='1' type-id='type-id-463' size-in-bits='64' id='type-id-464'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-6' id='type-id-466'/>
+      <subrange length='2' type-id='type-id-6' id='type-id-465'/>
     </array-type-def>
     <!-- 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-467'>
+    <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-466'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- md5_uint32 md5_ctx::A -->
-        <var-decl name='A' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
+        <var-decl name='A' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- md5_uint32 md5_ctx::B -->
-        <var-decl name='B' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
+        <var-decl name='B' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- md5_uint32 md5_ctx::C -->
-        <var-decl name='C' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
+        <var-decl name='C' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- md5_uint32 md5_ctx::D -->
-        <var-decl name='D' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
+        <var-decl name='D' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- md5_uint32 md5_ctx::total[2] -->
-        <var-decl name='total' type-id='type-id-465' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
+        <var-decl name='total' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- md5_uint32 md5_ctx::buflen -->
-        <var-decl name='buflen' type-id='type-id-464' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
+        <var-decl name='buflen' type-id='type-id-463' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- char md5_ctx::buffer[128] -->
@@ -10487,26 +10487,26 @@
       </data-member>
     </class-decl>
     <!-- typedef uint32_t md5_uint32 -->
-    <typedef-decl name='md5_uint32' type-id='type-id-468' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-464'/>
+    <typedef-decl name='md5_uint32' type-id='type-id-467' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-463'/>
     <!-- typedef unsigned int uint32_t -->
-    <typedef-decl name='uint32_t' type-id='type-id-15' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-468'/>
+    <typedef-decl name='uint32_t' type-id='type-id-15' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-467'/>
     <!-- const md5_ctx -->
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-469'/>
+    <qualified-type-def type-id='type-id-466' const='yes' id='type-id-468'/>
     <!-- const md5_ctx* -->
-    <pointer-type-def type-id='type-id-469' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-469'/>
     <!-- md5_ctx* -->
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-470'/>
     <!-- void md5_init_ctx(md5_ctx*) -->
     <function-decl name='md5_init_ctx' mangled-name='md5_init_ctx' filepath='../.././libiberty/md5.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_init_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
+      <parameter type-id='type-id-470' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void* md5_read_ctx(const md5_ctx*, void*) -->
     <function-decl name='md5_read_ctx' mangled-name='md5_read_ctx' filepath='../.././libiberty/md5.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_read_ctx'>
       <!-- parameter of type 'const md5_ctx*' -->
-      <parameter type-id='type-id-470' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
+      <parameter type-id='type-id-469' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='resbuf' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- void* -->
@@ -10519,7 +10519,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
+      <parameter type-id='type-id-470' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
@@ -10530,14 +10530,14 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31' name='len' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
+      <parameter type-id='type-id-470' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- void -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void* md5_finish_ctx(md5_ctx*, void*) -->
     <function-decl name='md5_finish_ctx' mangled-name='md5_finish_ctx' filepath='../.././libiberty/md5.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_finish_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
+      <parameter type-id='type-id-470' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-16' name='resbuf' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- void* -->
@@ -10601,7 +10601,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- pid_t* pex_obj::children -->
-        <var-decl name='children' type-id='type-id-472' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+        <var-decl name='children' type-id='type-id-471' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- int* pex_obj::status -->
@@ -10609,7 +10609,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- pex_time* pex_obj::time -->
-        <var-decl name='time' type-id='type-id-473' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+        <var-decl name='time' type-id='type-id-472' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- int pex_obj::number_waited -->
@@ -10637,7 +10637,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- const pex_funcs* pex_obj::funcs -->
-        <var-decl name='funcs' type-id='type-id-474' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+        <var-decl name='funcs' type-id='type-id-473' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- void* pex_obj::sysdep -->
@@ -10645,11 +10645,11 @@
       </data-member>
     </class-decl>
     <!-- typedef __pid_t pid_t -->
-    <typedef-decl name='pid_t' type-id='type-id-475' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-476'/>
+    <typedef-decl name='pid_t' type-id='type-id-474' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-475'/>
     <!-- typedef int __pid_t -->
-    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-475'/>
+    <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-474'/>
     <!-- struct pex_time -->
-    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-477'>
+    <class-decl name='pex_time' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='559' column='1' id='type-id-476'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned long int pex_time::user_seconds -->
         <var-decl name='user_seconds' type-id='type-id-28' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
@@ -10668,66 +10668,66 @@
       </data-member>
     </class-decl>
     <!-- struct pex_funcs -->
-    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-478'>
+    <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-477'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
-        <var-decl name='open_read' type-id='type-id-479' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-478' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
-        <var-decl name='open_write' type-id='type-id-479' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-478' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
-        <var-decl name='exec_child' type-id='type-id-480' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-479' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- int (pex_obj*, int)* pex_funcs::close -->
-        <var-decl name='close' type-id='type-id-481' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-480' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
-        <var-decl name='wait' type-id='type-id-482' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-481' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
-        <var-decl name='pipe' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-482' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
-        <var-decl name='fdopenr' type-id='type-id-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
-        <var-decl name='fdopenw' type-id='type-id-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-483' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- void (pex_obj*)* pex_funcs::cleanup -->
-        <var-decl name='cleanup' type-id='type-id-485' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
     <!-- FILE* (pex_obj*, int, int)* -->
-    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-483'/>
     <!-- const pex_funcs -->
-    <qualified-type-def type-id='type-id-478' const='yes' id='type-id-487'/>
+    <qualified-type-def type-id='type-id-477' const='yes' id='type-id-486'/>
     <!-- const pex_funcs* -->
-    <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-473'/>
     <!-- int (pex_obj*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-478'/>
     <!-- int (pex_obj*, int)* -->
-    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-481'/>
+    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-480'/>
     <!-- int (pex_obj*, int*, int)* -->
-    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-482'/>
     <!-- pex_time* -->
-    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-473'/>
-    <!-- pid_t* -->
     <pointer-type-def type-id='type-id-476' size-in-bits='64' id='type-id-472'/>
+    <!-- pid_t* -->
+    <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-471'/>
     <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-480'/>
+    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-479'/>
     <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-481'/>
     <!-- void (pex_obj*)* -->
-    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-485'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-484'/>
     <!-- pex_obj* pex_init_common(int, const char*, const char*, const pex_funcs*) -->
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <!-- parameter of type 'int' -->
@@ -10737,7 +10737,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-1' name='tempbase' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <!-- parameter of type 'const pex_funcs*' -->
-      <parameter type-id='type-id-474' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
+      <parameter type-id='type-id-473' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
       <!-- pex_obj* -->
       <return type-id='type-id-128'/>
     </function-decl>
@@ -10798,12 +10798,12 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2' name='count' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <!-- parameter of type 'pex_time*' -->
-      <parameter type-id='type-id-473' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
+      <parameter type-id='type-id-472' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- FILE* (pex_obj*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-486'>
+    <function-type size-in-bits='64' id='type-id-485'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- parameter of type 'int' -->
@@ -10814,7 +10814,7 @@
       <return type-id='type-id-88'/>
     </function-type>
     <!-- int (pex_obj*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-488'>
+    <function-type size-in-bits='64' id='type-id-487'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- parameter of type 'const char*' -->
@@ -10825,7 +10825,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- int (pex_obj*, int) -->
-    <function-type size-in-bits='64' id='type-id-489'>
+    <function-type size-in-bits='64' id='type-id-488'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- parameter of type 'int' -->
@@ -10834,7 +10834,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- int (pex_obj*, int*, int) -->
-    <function-type size-in-bits='64' id='type-id-490'>
+    <function-type size-in-bits='64' id='type-id-489'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- parameter of type 'int*' -->
@@ -10845,7 +10845,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-491'>
+    <function-type size-in-bits='64' id='type-id-490'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- parameter of type 'int' -->
@@ -10865,33 +10865,33 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-248'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-41'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-476'/>
+      <return type-id='type-id-475'/>
     </function-type>
     <!-- pid_t (pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-492'>
+    <function-type size-in-bits='64' id='type-id-491'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- parameter of type 'typedef pid_t' -->
-      <parameter type-id='type-id-476'/>
+      <parameter type-id='type-id-475'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-41'/>
       <!-- parameter of type 'pex_time*' -->
-      <parameter type-id='type-id-473'/>
+      <parameter type-id='type-id-472'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-248'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-41'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-476'/>
+      <return type-id='type-id-475'/>
     </function-type>
     <!-- void (pex_obj*) -->
-    <function-type size-in-bits='64' id='type-id-493'>
+    <function-type size-in-bits='64' id='type-id-492'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-128'/>
       <!-- void -->
@@ -10900,12 +10900,12 @@
   </abi-instr>
   <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'>
     <!-- typedef __anonymous_union__ __WAIT_STATUS -->
-    <typedef-decl name='__WAIT_STATUS' type-id='type-id-494' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-495'/>
+    <typedef-decl name='__WAIT_STATUS' type-id='type-id-493' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-494'/>
     <!-- union {wait* __uptr; int* __iptr;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-494'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-493'>
       <data-member access='private'>
         <!-- wait* __uptr -->
-        <var-decl name='__uptr' type-id='type-id-496' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
+        <var-decl name='__uptr' type-id='type-id-495' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- int* __iptr -->
@@ -10913,22 +10913,22 @@
       </data-member>
     </union-decl>
     <!-- union wait -->
-    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-497'>
+    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-496'>
       <data-member access='private'>
         <!-- int wait::w_status -->
         <var-decl name='w_status' type-id='type-id-2' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='69' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} wait::__wait_terminated -->
-        <var-decl name='__wait_terminated' type-id='type-id-498' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
+        <var-decl name='__wait_terminated' type-id='type-id-497' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} wait::__wait_stopped -->
-        <var-decl name='__wait_stopped' type-id='type-id-499' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
+        <var-decl name='__wait_stopped' type-id='type-id-498' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-498'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-497'>
       <data-member access='public' layout-offset-in-bits='25'>
         <!-- unsigned int __w_termsig -->
         <var-decl name='__w_termsig' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='73' column='1'/>
@@ -10943,7 +10943,7 @@
       </data-member>
     </class-decl>
     <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} -->
-    <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-499'>
+    <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-498'>
       <data-member access='public' layout-offset-in-bits='24'>
         <!-- unsigned int __w_stopval -->
         <var-decl name='__w_stopval' type-id='type-id-15' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='88' column='1'/>
@@ -10954,14 +10954,14 @@
       </data-member>
     </class-decl>
     <!-- struct rusage -->
-    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-500'>
+    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-499'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- timeval rusage::ru_utime -->
-        <var-decl name='ru_utime' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
+        <var-decl name='ru_utime' type-id='type-id-500' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- timeval rusage::ru_stime -->
-        <var-decl name='ru_stime' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
+        <var-decl name='ru_stime' type-id='type-id-500' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- long int rusage::ru_maxrss -->
@@ -11021,24 +11021,24 @@
       </data-member>
     </class-decl>
     <!-- struct timeval -->
-    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-501'>
+    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-500'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __time_t timeval::tv_sec -->
         <var-decl name='tv_sec' type-id='type-id-81' visibility='default' filepath='/usr/include/bits/time.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- __suseconds_t timeval::tv_usec -->
-        <var-decl name='tv_usec' type-id='type-id-502' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
+        <var-decl name='tv_usec' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef long int __suseconds_t -->
-    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-502'/>
+    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-501'/>
     <!-- rusage* -->
-    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-503'/>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-502'/>
     <!-- wait* -->
-    <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-495'/>
     <!-- const pex_funcs funcs -->
-    <var-decl name='funcs' type-id='type-id-487' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
+    <var-decl name='funcs' type-id='type-id-486' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <!-- int fcntl(int, int, ...) -->
     <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -11059,31 +11059,31 @@
     <!-- __pid_t wait4(__pid_t, __WAIT_STATUS, int, rusage*) -->
     <function-decl name='wait4' filepath='/usr/include/sys/wait.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-475'/>
+      <parameter type-id='type-id-474'/>
       <!-- parameter of type 'typedef __WAIT_STATUS' -->
-      <parameter type-id='type-id-495'/>
+      <parameter type-id='type-id-494'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'rusage*' -->
-      <parameter type-id='type-id-503'/>
+      <parameter type-id='type-id-502'/>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-475'/>
+      <return type-id='type-id-474'/>
     </function-decl>
     <!-- __pid_t waitpid(__pid_t, int*, int) -->
     <function-decl name='waitpid' filepath='/usr/include/sys/wait.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-475'/>
+      <parameter type-id='type-id-474'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-41'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-475'/>
+      <return type-id='type-id-474'/>
     </function-decl>
     <!-- int kill(__pid_t, int) -->
     <function-decl name='kill' filepath='/usr/include/signal.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-475'/>
+      <parameter type-id='type-id-474'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- int -->
@@ -11098,7 +11098,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-31'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-254'/>
+      <return type-id='type-id-253'/>
     </function-decl>
     <!-- void _exit(int) -->
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11117,7 +11117,7 @@
     <!-- __pid_t vfork() -->
     <function-decl name='vfork' filepath='/usr/include/unistd.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-475'/>
+      <return type-id='type-id-474'/>
     </function-decl>
     <!-- int dup2(int, int) -->
     <function-decl name='dup2' filepath='/usr/include/unistd.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11149,18 +11149,18 @@
   </abi-instr>
   <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'>
     <!-- const unsigned short int[256] -->
-    <array-type-def dimensions='1' type-id='type-id-504' size-in-bits='4096' id='type-id-505'>
+    <array-type-def dimensions='1' type-id='type-id-503' size-in-bits='4096' id='type-id-504'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-6' id='type-id-252'/>
+      <subrange length='256' type-id='type-id-6' id='type-id-251'/>
     </array-type-def>
     <!-- const unsigned short int -->
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-504'/>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-503'/>
     <!-- const unsigned short int _sch_istable[256] -->
-    <var-decl name='_sch_istable' type-id='type-id-505' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
+    <var-decl name='_sch_istable' type-id='type-id-504' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
     <!-- const unsigned char _sch_toupper[256] -->
-    <var-decl name='_sch_toupper' type-id='type-id-272' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
+    <var-decl name='_sch_toupper' type-id='type-id-271' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
     <!-- const unsigned char _sch_tolower[256] -->
-    <var-decl name='_sch_tolower' type-id='type-id-272' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
+    <var-decl name='_sch_tolower' type-id='type-id-271' 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' 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*) -->
@@ -11181,9 +11181,9 @@
   </abi-instr>
   <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'>
     <!-- typedef __intptr_t intptr_t -->
-    <typedef-decl name='intptr_t' type-id='type-id-506' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-507'/>
+    <typedef-decl name='intptr_t' type-id='type-id-505' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-506'/>
     <!-- typedef long int __intptr_t -->
-    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-506'/>
+    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-505'/>
     <!-- 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' -->
@@ -11194,7 +11194,7 @@
     <!-- void* sbrk(intptr_t) -->
     <function-decl name='sbrk' filepath='/usr/include/unistd.h' line='1053' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef intptr_t' -->
-      <parameter type-id='type-id-507'/>
+      <parameter type-id='type-id-506'/>
       <!-- void* -->
       <return type-id='type-id-16'/>
     </function-decl>