Differential D18757 Diff 55427 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_stack__trace__posix.cc
| --- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/base/debug/stack_trace_posix.cc.orig 2018-11-13 18:25:11 UTC | ||||
| +++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc | +++ src/3rdparty/chromium/base/debug/stack_trace_posix.cc | ||||
| @@ -571,6 +571,10 @@ class SandboxSymbolizeHelper { | @@ -35,7 +35,7 @@ | ||||
| #include <AvailabilityMacros.h> | |||||
| #endif | |||||
| -#if defined(OS_LINUX) | |||||
| +#if defined(OS_LINUX) || defined(OS_BSD) | |||||
| #include "base/debug/proc_maps_linux.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(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) | |||||
| std::string::size_type search_from = 0; | |||||
| while (search_from < text->size()) { | |||||
| // Look for the start of a mangled symbol, from search_from. | |||||
| @@ -647,6 +647,11 @@ class SandboxSymbolizeHelper { | |||||
| // for the modules that are loaded in the current process. | // for the modules that are loaded in the current process. | ||||
| // Returns true on success. | // Returns true on success. | ||||
| bool CacheMemoryRegions() { | bool CacheMemoryRegions() { | ||||
| +#if defined(OS_FREEBSD) | +#if defined(OS_BSD) | ||||
| + // TODO (rene) avoid link error, implement something? | + // TODO (rene) avoid link error, implement something? | ||||
| + NOTIMPLEMENTED(); | |||||
| + return false; | + return false; | ||||
| +#else | +#else | ||||
| // Reads /proc/self/maps. | // Reads /proc/self/maps. | ||||
| std::string contents; | std::string contents; | ||||
| if (!ReadProcMaps(&contents)) { | if (!ReadProcMaps(&contents)) { | ||||
| @@ -586,6 +590,7 @@ class SandboxSymbolizeHelper { | @@ -664,6 +669,7 @@ class SandboxSymbolizeHelper { | ||||
| is_initialized_ = true; | is_initialized_ = true; | ||||
| return true; | return true; | ||||
| +#endif | +#endif | ||||
| } | } | ||||
| // Opens all object files and caches their file descriptors. | // Opens all object files and caches their file descriptors. | ||||