mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-06 05:47:13 +02:00
d183e852a7
to fix tab crashes, use patch from https://github.com/lluixhi/musl-extras/issues/10#issuecomment-328272349 use various patches from fedora
111 lines
3.9 KiB
Diff
111 lines
3.9 KiB
Diff
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
|
|
index 7696be8..20ebe67 100644
|
|
--- a/base/debug/stack_trace_posix.cc
|
|
+++ base/debug/stack_trace_posix.cc
|
|
@@ -26,7 +26,7 @@
|
|
#if !defined(USE_SYMBOLIZE)
|
|
#include <cxxabi.h>
|
|
#endif
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
|
+#if defined(__GLIBC__)
|
|
#include <execinfo.h>
|
|
#endif
|
|
|
|
@@ -82,7 +82,7 @@ void DemangleSymbols(std::string* text) {
|
|
// Note: code in this function is NOT async-signal safe (std::string uses
|
|
// malloc internally).
|
|
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
|
+#if defined(__GLIBC__)
|
|
std::string::size_type search_from = 0;
|
|
while (search_from < text->size()) {
|
|
// Look for the start of a mangled symbol, from search_from.
|
|
@@ -129,7 +129,7 @@ class BacktraceOutputHandler {
|
|
virtual ~BacktraceOutputHandler() {}
|
|
};
|
|
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
|
+#if defined(__GLIBC__)
|
|
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.
|
|
@@ -705,6 +705,10 @@ class SandboxSymbolizeHelper {
|
|
} // namespace
|
|
|
|
bool EnableInProcessStackDumping() {
|
|
+#if defined(OS_LINUX) && !defined(__GLIBC__)
|
|
+// let system handler deal with the dumps
|
|
+ return true;
|
|
+#else
|
|
#if defined(USE_SYMBOLIZE)
|
|
SandboxSymbolizeHelper::GetInstance();
|
|
#endif // USE_SYMBOLIZE
|
|
@@ -738,6 +742,7 @@ bool EnableInProcessStackDumping() {
|
|
#endif // !defined(OS_LINUX)
|
|
|
|
return success;
|
|
+#endif
|
|
}
|
|
|
|
void SetStackDumpFirstChanceCallback(bool (*handler)(int, void*, void*)) {
|
|
@@ -749,7 +754,7 @@ StackTrace::StackTrace(size_t count) {
|
|
// 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.
|
|
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
|
+#if defined(__GLIBC__)
|
|
count = std::min(arraysize(trace_), count);
|
|
|
|
// Though the backtrace API man page does not list any possible negative
|
|
@@ -764,13 +769,13 @@ void StackTrace::Print() const {
|
|
// 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.
|
|
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
|
+#if defined(__GLIBC__)
|
|
PrintBacktraceOutputHandler handler;
|
|
ProcessBacktrace(trace_, count_, &handler);
|
|
#endif
|
|
}
|
|
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
|
+#if defined(__GLIBC__)
|
|
void StackTrace::OutputToStream(std::ostream* os) const {
|
|
StreamBacktraceOutputHandler handler(os);
|
|
ProcessBacktrace(trace_, count_, &handler);
|
|
diff --git a/third_party/WebKit/Source/platform/wtf/Assertions.cpp b/third_party/WebKit/Source/platform/wtf/Assertions.cpp
|
|
index 9bdece7..0c76188 100644
|
|
--- a/third_party/WebKit/Source/platform/wtf/Assertions.cpp
|
|
+++ third_party/WebKit/Source/platform/wtf/Assertions.cpp
|
|
@@ -56,7 +56,7 @@
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__))
|
|
+#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(__GLIBC__))
|
|
#include <cxxabi.h>
|
|
#include <dlfcn.h>
|
|
#include <execinfo.h>
|
|
diff --git a/third_party/webrtc/rtc_base/checks.cc b/third_party/webrtc/rtc_base/checks.cc
|
|
index 533240f..08b3f3e 100644
|
|
--- a/third_party/webrtc/rtc_base/checks.cc
|
|
+++ third_party/webrtc/rtc_base/checks.cc
|
|
@@ -16,7 +16,7 @@
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
|
|
-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
|
+#if defined(__GLIBCXX__) && defined(__GLIBC__)
|
|
#include <cxxabi.h>
|
|
#include <execinfo.h>
|
|
#endif
|
|
@@ -60,7 +60,7 @@ void PrintError(const char* format, ...) {
|
|
// to get usable symbols on Linux. This is copied from V8. Chromium has a more
|
|
// advanced stace trace system; also more difficult to copy.
|
|
void DumpBacktrace() {
|
|
-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
|
+#if defined(__GLIBCXX__) && defined(__GLIBC__)
|
|
void* trace[100];
|
|
int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
|
|
char** symbols = backtrace_symbols(trace, size);
|