diff options
Diffstat (limited to 'community/chromium/no-execinfo.patch')
| -rw-r--r-- | community/chromium/no-execinfo.patch | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/community/chromium/no-execinfo.patch b/community/chromium/no-execinfo.patch index fd4ced7deb..0c345e2eff 100644 --- a/community/chromium/no-execinfo.patch +++ b/community/chromium/no-execinfo.patch @@ -1,5 +1,5 @@ ---- a/base/debug/stack_trace_posix.cc.orig 2016-05-08 07:59:51.749087517 +0200 -+++ b/base/debug/stack_trace_posix.cc 2016-05-08 08:01:24.988950619 +0200 +--- base/debug/stack_trace_posix.cc.orig 2016-05-08 07:59:51.749087517 +0200 ++++ base/debug/stack_trace_posix.cc 2016-05-08 08:01:24.988950619 +0200 @@ -24,7 +24,7 @@ #if defined(__GLIBCXX__) #include <cxxabi.h> @@ -70,8 +70,8 @@ void StackTrace::OutputToStream(std::ostream* os) const { StreamBacktraceOutputHandler handler(os); ProcessBacktrace(trace_, count_, &handler); ---- a/third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-05-08 08:02:03.230553120 +0200 -+++ b/third_party/WebKit/Source/wtf/Assertions.cpp 2016-05-08 08:02:35.822504255 +0200 +--- third_party/WebKit/Source/wtf/Assertions.cpp.orig 2016-12-02 00:02:32.000000000 +0100 ++++ third_party/WebKit/Source/wtf/Assertions.cpp 2016-12-06 10:58:11.183147846 +0100 @@ -60,7 +60,7 @@ #include <windows.h> #endif @@ -81,26 +81,26 @@ #include <cxxabi.h> #include <dlfcn.h> #include <execinfo.h> -@@ -220,7 +220,7 @@ void WTFReportArgumentAssertionFailure(c +@@ -164,7 +164,7 @@ + } - void WTFGetBacktrace(void** stack, int* size) - { + void WTFGetBacktrace(void** stack, int* size) { -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) +#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__)) - *size = backtrace(stack, *size); + *size = backtrace(stack, *size); #elif OS(WIN) - // The CaptureStackBackTrace function is available in XP, but it is not defined -@@ -258,7 +258,7 @@ FrameToNameScope::FrameToNameScope(void* - : m_name(0) - , m_cxaDemangled(0) - { + // The CaptureStackBackTrace function is available in XP, but it is not +@@ -215,7 +215,7 @@ + }; + + FrameToNameScope::FrameToNameScope(void* addr) : m_name(0), m_cxaDemangled(0) { -#if OS(MACOSX) || (OS(LINUX) && !defined(__UCLIBC__)) +#if OS(MACOSX) || (OS(LINUX) && defined(__GLIBC__)) - Dl_info info; - if (!dladdr(addr, &info) || !info.dli_sname) - return; ---- a/third_party/webrtc/base/checks.cc.orig 2016-05-08 08:03:04.398461275 +0200 -+++ b/third_party/webrtc/base/checks.cc 2016-05-08 08:03:24.254431362 +0200 + Dl_info info; + if (!dladdr(addr, &info) || !info.dli_sname) + return; +--- third_party/webrtc/base/checks.cc.orig 2016-05-08 08:03:04.398461275 +0200 ++++ third_party/webrtc/base/checks.cc 2016-05-08 08:03:24.254431362 +0200 @@ -16,7 +16,7 @@ #include <cstdio> #include <cstdlib> @@ -119,3 +119,14 @@ void* trace[100]; int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); char** symbols = backtrace_symbols(trace, size); +--- ./base/debug/stack_trace.cc.orig ++++ ./base/debug/stack_trace.cc +@@ -33,7 +33,7 @@ + + std::string StackTrace::ToString() const { + std::stringstream stream; +-#if !defined(__UCLIBC__) ++#if defined(__GLIBC__) + OutputToStream(&stream); + #endif + return stream.str(); |