aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_debug_stack__trace__posix.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_debug_stack__trace__posix.cc')
-rw-r--r--www/chromium/files/patch-base_debug_stack__trace__posix.cc20
1 files changed, 15 insertions, 5 deletions
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
index 6b2420bb7915..c7f4c8235310 100644
--- a/www/chromium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,5 +1,5 @@
---- base/debug/stack_trace_posix.cc.orig 2017-04-19 19:06:28 UTC
-+++ base/debug/stack_trace_posix.cc
+--- base/debug/stack_trace_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200
++++ base/debug/stack_trace_posix.cc 2017-08-02 18:45:42.071358000 +0200
@@ -34,7 +34,7 @@
#include <AvailabilityMacros.h>
#endif
@@ -9,18 +9,19 @@
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper {
+@@ -574,6 +574,11 @@
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
-+#if defined(OS_FREEBSD)
++#if defined(OS_BSD)
+ // TODO (rene) avoid link error, implement something?
++ NOTIMPLEMENTED();
+ return false;
+#else
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper {
+@@ -589,6 +594,7 @@
is_initialized_ = true;
return true;
@@ -28,3 +29,12 @@
}
// Opens all object files and caches their file descriptors.
+@@ -721,7 +727,7 @@
+ // 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(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD)
+ count = std::min(arraysize(trace_), count);
+
+ // Though the backtrace API man page does not list any possible negative