| Index: base/debug/stack_trace_posix.cc
|
| diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
|
| index db999b783f22f9e733e8cde3f88870bad8f4c6da..da86bdc059b303634fb4db5e9eb957cc7a10e6a7 100644
|
| --- a/base/debug/stack_trace_posix.cc
|
| +++ b/base/debug/stack_trace_posix.cc
|
| @@ -22,7 +22,7 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#if defined(__GLIBCXX__)
|
| +#if !defined(USE_SYMBOLIZE)
|
| #include <cxxabi.h>
|
| #endif
|
| #if !defined(__UCLIBC__)
|
| @@ -58,7 +58,7 @@ namespace {
|
|
|
| volatile sig_atomic_t in_signal_handler = 0;
|
|
|
| -#if !defined(USE_SYMBOLIZE) && defined(__GLIBCXX__)
|
| +#if !defined(USE_SYMBOLIZE)
|
| // The prefix used for mangled symbols, per the Itanium C++ ABI:
|
| // http://www.codesourcery.com/cxx-abi/abi.html#mangling
|
| const char kMangledSymbolPrefix[] = "_Z";
|
| @@ -67,7 +67,7 @@ const char kMangledSymbolPrefix[] = "_Z";
|
| // (('a'..'z').to_a+('A'..'Z').to_a+('0'..'9').to_a + ['_']).join
|
| const char kSymbolCharacters[] =
|
| "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
|
| -#endif // !defined(USE_SYMBOLIZE) && defined(__GLIBCXX__)
|
| +#endif // !defined(USE_SYMBOLIZE)
|
|
|
| #if !defined(USE_SYMBOLIZE)
|
| // Demangles C++ symbols in the given text. Example:
|
| @@ -79,7 +79,7 @@ void DemangleSymbols(std::string* text) {
|
| // Note: code in this function is NOT async-signal safe (std::string uses
|
| // malloc internally).
|
|
|
| -#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
| +#if !defined(__UCLIBC__)
|
|
|
| std::string::size_type search_from = 0;
|
| while (search_from < text->size()) {
|
| @@ -115,8 +115,7 @@ void DemangleSymbols(std::string* text) {
|
| search_from = mangled_start + 2;
|
| }
|
| }
|
| -
|
| -#endif // defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
| +#endif // !defined(__UCLIBC__)
|
| }
|
| #endif // !defined(USE_SYMBOLIZE)
|
|
|
|
|