97 lines
4.0 KiB
Diff
97 lines
4.0 KiB
Diff
|
diff --git a/base/debug/stack_trace_posix.cc b/base/debug/stack_trace_posix.cc
|
||
|
|
index de2f356..f697c66 100644
|
||
|
|
--- a/base/debug/stack_trace_posix.cc
|
||
|
|
+++ b/base/debug/stack_trace_posix.cc
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
#if !defined(USE_SYMBOLIZE)
|
||
|
|
#include <cxxabi.h>
|
||
|
|
#endif
|
||
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
#include <execinfo.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -86,7 +86,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__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
std::string::size_type search_from = 0;
|
||
|
|
while (search_from < text->size()) {
|
||
|
|
// Look for the start of a mangled symbol, from search_from.
|
||
|
|
@@ -121,7 +121,7 @@ void DemangleSymbols(std::string* text) {
|
||
|
|
search_from = mangled_start + 2;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
}
|
||
|
|
#endif // !defined(USE_SYMBOLIZE)
|
||
|
|
|
||
|
|
@@ -133,7 +133,7 @@ class BacktraceOutputHandler {
|
||
|
|
virtual ~BacktraceOutputHandler() = default;
|
||
|
|
};
|
||
|
|
|
||
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
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.
|
||
|
|
@@ -216,7 +216,7 @@ void ProcessBacktrace(void* const* trace,
|
||
|
|
}
|
||
|
|
#endif // defined(USE_SYMBOLIZE)
|
||
|
|
}
|
||
|
|
-#endif // !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
+#endif // defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
|
||
|
|
void PrintToStderr(const char* output) {
|
||
|
|
// NOTE: This code MUST be async-signal safe (it's used by in-process
|
||
|
|
@@ -828,7 +828,7 @@ size_t CollectStackTrace(void** trace, 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__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
// Though the backtrace API man page does not list any possible negative
|
||
|
|
// return values, we take no chance.
|
||
|
|
return base::saturated_cast<size_t>(backtrace(trace, count));
|
||
|
|
@@ -841,13 +841,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) 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__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
PrintBacktraceOutputHandler handler;
|
||
|
|
ProcessBacktrace(trace_, count_, prefix_string, &handler);
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(_AIX)
|
||
|
|
void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
|
||
|
|
const char* prefix_string) const {
|
||
|
|
StreamBacktraceOutputHandler handler(os);
|
||
|
|
diff --git a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
|
||
|
|
index 798f150..97acc7c 100644
|
||
|
|
--- a/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
|
||
|
|
+++ b/third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
|
||
|
|
@@ -14,7 +14,7 @@
|
||
|
|
#define ENABLE_CRASH_OVERRIDES 1
|
||
|
|
|
||
|
|
/* Define to 1 if you have the `backtrace' function. */
|
||
|
|
-#define HAVE_BACKTRACE 1
|
||
|
|
+/* #undef HAVE_BACKTRACE */
|
||
|
|
|
||
|
|
/* Define to 1 if you have the <CrashReporterClient.h> header file. */
|
||
|
|
/* #undef HAVE_CRASHREPORTERCLIENT_H */
|
||
|
|
@@ -55,7 +55,7 @@
|
||
|
|
#define HAVE_ERRNO_H 1
|
||
|
|
|
||
|
|
/* Define to 1 if you have the <execinfo.h> header file. */
|
||
|
|
-#define HAVE_EXECINFO_H 1
|
||
|
|
+/* #undef HAVE_EXECINFO_H */
|
||
|
|
|
||
|
|
/* Define to 1 if you have the <fcntl.h> header file. */
|
||
|
|
#define HAVE_FCNTL_H 1
|