| From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 |
| From: Khem Raj <raj.khem@gmail.com> |
| Date: Fri, 5 Jun 2015 19:55:05 -0700 |
| Subject: [PATCH] Exclude backtrace() API for non-glibc libraries |
| |
| It was excluding musl with current checks, so lets make it such that it |
| considers only glibc when using backtrace API |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| Downloaded from: |
| https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ |
| 0003-Exclude-backtrace-API-for-non-glibc-libraries.patch |
| |
| Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> |
| --- |
| Source/WTF/wtf/Assertions.cpp | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp |
| index 1b2091f..ba03a28 100644 |
| --- a/Source/WTF/wtf/Assertions.cpp |
| +++ b/Source/WTF/wtf/Assertions.cpp |
| @@ -61,7 +61,7 @@ |
| #include <windows.h> |
| #endif |
| |
| -#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| +#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| #include <cxxabi.h> |
| #include <dlfcn.h> |
| #include <execinfo.h> |
| @@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f |
| |
| void WTFGetBacktrace(void** stack, int* size) |
| { |
| -#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| +#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) |
| *size = backtrace(stack, *size); |
| #elif OS(WINDOWS) && !OS(WINCE) |
| // The CaptureStackBackTrace function is available in XP, but it is not defined |
| -- |
| 2.7.0 |
| |
