diff options
| author | Dodji Seketeli <dodji@seketeli.org> | 2013-08-14 17:31:29 +0200 |
|---|---|---|
| committer | Dodji Seketeli <dodji@seketeli.org> | 2013-08-14 17:31:29 +0200 |
| commit | 0a40a2f5bd0205ab01a25c300d032a796c6a3ff1 (patch) | |
| tree | 2c99ccc53b2a940fe237db14700f8667fde10df6 | |
| parent | 0232218eeb6f2554aa05c76684dbb9263631011a (diff) | |
| download | gcc-0a40a2f5bd0205ab01a25c300d032a796c6a3ff1.tar.gz | |
Update abi-instr.cc wrt include dir layout and writer api changes
* cp/abi-instr.cc: Use libabigail headers without specifying the
libabigail sub-directory. That now works when using libabigail as
(a library copied into the GCC tree (ugly but some GCC developers
likes doing that) and when libabigail is used as a dependency that
is make install-ed (that's my preferred usage case because that is
what we will encounter in distributions' related usage cases)
provided -I $includedir/libabigail is given on the command line.
For non GCC usage case though, I'd recommend that user just write
#include libabigail/abg-*.h.
(abi_instr_dump_file): Use the new
translation_unit::write.
| -rw-r--r-- | gcc/cp/abi-instr.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/abi-instr.cc b/gcc/cp/abi-instr.cc index 1814c13c614..35f43c7d1bf 100644 --- a/gcc/cp/abi-instr.cc +++ b/gcc/cp/abi-instr.cc @@ -32,8 +32,8 @@ along with GCC; see the file COPYING3. If not see #include "cgraph.h" #include "cp-tree.h" #include "abi-instr.h" -#include "libabigail/abg-writer.h" -#include "libabigail/abg-config.h" +#include "abg-ir.h" +#include "abg-config.h" using std::tr1::shared_ptr; using std::tr1::static_pointer_cast; @@ -1192,7 +1192,7 @@ abi_instr_dump_file () if (!of.is_open ()) fatal_error ("can%'t open %s for writing: %m", out_path.c_str ()); - bool is_ok = abigail::writer::write_to_ostream (get_cur_tu (), of); + bool is_ok = get_cur_tu ().write (of); of.close (); if (!is_ok) error ("could not dump abi instrumentation to file %s: %m", |