mirror of
https://github.com/thead-yocto-mirror/meta-qt5
synced 2026-09-18 05:01:56 +02:00
eedb3e6413
Make backtrace() API conditional to glibc Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From b345a3414a7d09b47586aac437d79e2bbfa52fb8 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>
|
|
---
|
|
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.1.4
|
|
|