[applied] dwarf-reader,abidiff: Fix compilation with --enable-debug-type-canonicalization
Commit Message
Hello,
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>
---
src/abg-dwarf-reader.cc | 2 +-
tools/abidiff.cc | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
@@ -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;
@@ -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
{}