Bug 855081: Make jprof compile for me by switching from cplus_demangle (which doesn't link) to abi::__cxa_demangle. r=jesup

tools/jprof/bfd.cpp

@@ -12,10 +12,7 @@
 #include <unistd.h>
 #include <libgen.h>
 #include <bfd.h>
-
-extern "C" {
-  char *cplus_demangle (const char *mangled, int options);
-}
+#include <cxxabi.h>
 
 static bfd *try_debug_file(const char *filename, unsigned long crc32)
 {
@@ -204,9 +201,12 @@ void leaky::ReadSymbols(const char *aFileName, u_long aBaseAddress)
       if (nm && nm[0]) {
         char* dnm = NULL;
         if (strncmp("__thunk", nm, 7)) {
-          dnm = cplus_demangle(nm, 1);
+          dnm = abi::__cxa_demangle(nm, 0, 0, 0);
         }
         (*sp)->Init(dnm ? dnm : nm, syminfo.value + aBaseAddress);
+        if (dnm) {
+          free(dnm);
+        }
         NEXT_SYMBOL;
       }
 //    }