> The way this works is:
>   - We only care if the symbol starts with _Z.  Do it in the same
> place we check for _Z now, instead of the switch_to_cp_abi call.
>
>   - You just want to call cplus_demangle; be sure to free the result
> if it returns non-NULL.
>

Diff attached.  Seems to work quite nicely.  Thank you very much.  As
always, you are most helpful.

cheers,

Kris