Mercurial > hg > truffle
diff src/os/linux/vm/decoder_linux.cpp @ 4970:33df1aeaebbf
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Mon, 27 Feb 2012 13:10:13 +0100 |
parents | d7e3846464d0 |
children | b9a9ed0f8eeb |
line wrap: on
line diff
--- a/src/os/linux/vm/decoder_linux.cpp Fri Feb 24 18:30:42 2012 -0800 +++ b/src/os/linux/vm/decoder_linux.cpp Mon Feb 27 13:10:13 2012 +0100 @@ -23,11 +23,11 @@ */ #include "prims/jvm.h" -#include "utilities/decoder.hpp" +#include "utilities/decoder_elf.hpp" #include <cxxabi.h> -bool Decoder::demangle(const char* symbol, char *buf, int buflen) { +bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) { int status; char* result; size_t size = (size_t)buflen; @@ -43,3 +43,4 @@ } return false; } +