dwarf-reader,abidiff: Fix compilation with --enable-debug-type-canonicalization

When looking at something else, I configured the package with
--enable-debug-type-canonicalization and surprise, there were some
compilation errors.  Fixed thus.

	* src/abg-dwarf-reader.cc (reader::initialize): Use env(). rather
	than environment->.
	* tools/abidiff.cc (options::options): Initialize
	do_debug_type_canonicalization() before use_btf.

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

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 113dbdcb3591426f631494db272d32d6126b9c49..037538afe3d28186f619242d3e6827073f7501db 100644 (file)
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -1976,7 +1976,7 @@ public:
     options().load_all_types = load_all_types;
 #ifdef WITH_DEBUG_TYPE_CANONICALIZATION
     debug_die_canonicalization_is_on_ =
-      environment->debug_die_canonicalization_is_on();
+      env().debug_die_canonicalization_is_on();
     use_canonical_die_comparison_ = true;
 #endif
     compare_count_ = 0;

diff --git a/tools/abidiff.cc b/tools/abidiff.cc
index 3613a4a39d4cb3fcc66d1198d019c3f2054a357a..d2fa5b63b854548ed3fa2d7745046198dff2dc79 100644 (file)
--- a/tools/abidiff.cc
+++ b/tools/abidiff.cc
@@ -175,6 +175,10 @@ struct options
       dump_diff_tree(),
       show_stats(),
       do_log()
+#ifdef WITH_DEBUG_TYPE_CANONICALIZATION
+    ,
+      do_debug_type_canonicalization()
+#endif
 #ifdef WITH_CTF
     ,
       use_ctf()
@@ -186,10 +190,6 @@ struct options
 #ifdef WITH_DEBUG_SELF_COMPARISON
     ,
       do_debug_self_comparison()
-#endif
-#ifdef WITH_DEBUG_TYPE_CANONICALIZATION
-    ,
-      do_debug_type_canonicalization()
 #endif
   {}