diff options
Diffstat (limited to 'community/chromium/no-execinfo.patch')
| -rw-r--r-- | community/chromium/no-execinfo.patch | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch index 4bfda6638c..5e1a1652ba 100644 --- a/community/chromium/no-execinfo.patch +++ b/community/chromium/no-execinfo.patch @@ -1,4 +1,4 @@ ---- ./base/debug/stack_trace_posix.cc.orig +--- ./base/debug/stack_trace_posix.cc +++ ./base/debug/stack_trace_posix.cc @@ -27,7 +27,7 @@ #if !defined(USE_SYMBOLIZE) @@ -9,7 +9,7 @@ #include <execinfo.h> #endif -@@ -86,7 +86,7 @@ +@@ -88,7 +88,7 @@ // Note: code in this function is NOT async-signal safe (std::string uses // malloc internally). @@ -18,16 +18,7 @@ std::string::size_type search_from = 0; while (search_from < text->size()) { // Look for the start of a mangled symbol, from search_from. -@@ -121,7 +121,7 @@ - search_from = mangled_start + 2; - } - } --#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // defined(__GLIBC__) && !defined(_AIX) - } - #endif // !defined(USE_SYMBOLIZE) - -@@ -133,7 +133,7 @@ +@@ -135,7 +135,7 @@ virtual ~BacktraceOutputHandler() = default; }; @@ -36,16 +27,7 @@ void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { // This should be more than enough to store a 64-bit number in hex: // 16 hex digits + 1 for null-terminator. -@@ -216,7 +216,7 @@ - } - #endif // defined(USE_SYMBOLIZE) - } --#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // defined(__GLIBC__) && !defined(_AIX) - - void PrintToStderr(const char* output) { - // NOTE: This code MUST be async-signal safe (it's used by in-process -@@ -812,7 +812,7 @@ +@@ -834,7 +834,7 @@ // NOTE: This code MUST be async-signal safe (it's used by in-process // stack dumping signal handler). NO malloc or stdio is allowed here. @@ -54,7 +36,7 @@ // Though the backtrace API man page does not list any possible negative // return values, we take no chance. return base::saturated_cast<size_t>(backtrace(trace, count)); -@@ -825,13 +825,13 @@ +@@ -847,13 +847,13 @@ // NOTE: This code MUST be async-signal safe (it's used by in-process // stack dumping signal handler). NO malloc or stdio is allowed here. |