Merge branch 'jankratochvil/abicfi-retval' into pending

diff --cc libebl/ebl-hooks.h
index 5651dd6af7368bed4ce7289dbb2f744f72ad198e,d3cf3e62c7d9aed3f0650db3286d51bb3cb14681..b39131d5513d1730a1f386b63726b29d67ccbe98
--- 1/libebl/ebl-hooks.h
--- 2/libebl/ebl-hooks.h
+++ b/libebl/ebl-hooks.h
@@@ -151,14 -151,9 +151,15 @@@ int EBLHOOK(disasm) (const uint8_t **st
                     GElf_Addr addr, const char *fmt, DisasmOutputCB_t outcb,
                     DisasmGetSymCB_t symcb, void *outcbarg, void *symcbarg);
  
- /* Supply the machine-specific state of CFI before CIE initial programs.  */
+ /* Supply the machine-specific state of CFI before CIE initial programs.
+    Function returns 0 on success and -1 on error.  */
  int EBLHOOK(abi_cfi) (Ebl *ebl, Dwarf_CIE *abi_info);
  
 +/* *SYM must be STT_FUNC.  Then if it describes a function descriptor (PPC64)
 +   convert in-place its data and return a possibly different new name for it.
 +   The name is valid as long as EBL is valid.  */
 +const char *EBLHOOK(get_func_pc) (Ebl *ebl, struct Dwfl_Module *mod,
 +                                GElf_Sym *sym);
 +
  /* Destructor for ELF backend handle.  */
  void EBLHOOK(destr) (struct ebl *);

diff --cc libebl/libebl.h
Simple merge