78 lines
3 KiB
Diff
78 lines
3 KiB
Diff
--- qtwebengine/src/3rdparty/chromium/third_party/webrtc/base/checks.cc 2016-03-03 15:48:36.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/webrtc/base/checks.cc 2016-03-17 01:56:11.685588906 +0100
|
|
@@ -16,7 +16,7 @@
|
|
#include <cstdio>
|
|
#include <cstdlib>
|
|
|
|
-#if defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
|
+#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
|
#include <cxxabi.h>
|
|
#include <execinfo.h>
|
|
#endif
|
|
@@ -55,7 +55,7 @@
|
|
// 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(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__)
|
|
void* trace[100];
|
|
int size = backtrace(trace, sizeof(trace) / sizeof(*trace));
|
|
char** symbols = backtrace_symbols(trace, size);
|
|
--- qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2016-03-03 15:48:36.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/base/debug/stack_trace_posix.cc 2016-03-17 02:23:45.442708132 +0100
|
|
@@ -22,7 +22,7 @@
|
|
#if defined(__GLIBCXX__)
|
|
#include <cxxabi.h>
|
|
#endif
|
|
-#if !defined(__UCLIBC__)
|
|
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
|
|
#include <execinfo.h>
|
|
#endif
|
|
|
|
@@ -169,7 +169,7 @@
|
|
|
|
handler->HandleOutput("\n");
|
|
}
|
|
-#elif !defined(__UCLIBC__)
|
|
+#elif defined(__GLIBC__) && !defined(__UCLIBC__)
|
|
bool printed = false;
|
|
|
|
// Below part is async-signal unsafe (uses malloc), so execute it only
|
|
@@ -738,7 +738,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.
|
|
|
|
-#if !defined(__UCLIBC__)
|
|
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
|
|
// Though the backtrace API man page does not list any possible negative
|
|
// return values, we take no chance.
|
|
count_ = base::saturated_cast<size_t>(backtrace(trace_, arraysize(trace_)));
|
|
--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/Assertions.cpp 2016-03-03 15:48:36.000000000 +0100
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/wtf/Assertions.cpp 2016-03-17 05:47:32.637589639 +0100
|
|
@@ -61,7 +61,7 @@
|
|
#define HAVE_ISDEBUGGERPRESENT 1
|
|
#endif
|
|
|
|
-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
|
|
+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__))
|
|
#include <cxxabi.h>
|
|
#include <dlfcn.h>
|
|
#include <execinfo.h>
|
|
@@ -222,7 +222,7 @@
|
|
|
|
void WTFGetBacktrace(void** stack, int* size)
|
|
{
|
|
-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
|
|
+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__))
|
|
*size = backtrace(stack, *size);
|
|
#elif OS(WIN)
|
|
// The CaptureStackBackTrace function is available in XP, but it is not defined
|
|
@@ -260,7 +260,7 @@
|
|
: m_name(0)
|
|
, m_cxaDemangled(0)
|
|
{
|
|
-#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__))
|
|
+#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__) && defined(__GLIBC__))
|
|
Dl_info info;
|
|
if (!dladdr(addr, &info) || !info.dli_sname)
|
|
return;
|