aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc22
1 files changed, 22 insertions, 0 deletions
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
new file mode 100644
index 000000000000..465425556ca7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -0,0 +1,22 @@
+--- chrome/browser/chrome_browser_main_posix.cc.orig 2016-03-25 13:04:45 UTC
++++ chrome/browser/chrome_browser_main_posix.cc
+@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMa
+ g_pipe_pid = getpid();
+ g_shutdown_pipe_read_fd = pipefd[0];
+ g_shutdown_pipe_write_fd = pipefd[1];
++#if defined(OS_FREEBSD)
++ // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
++ // we request the default pthread stack size by specifying 0 here.
++ const size_t kShutdownDetectorThreadStackSize = 0;
++#else
+ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
+ #else
+@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMa
+ // size to avoid hitting the guard page.
+ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+ #endif
++#endif // OS_FREEBSD
+ // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
+ // if you change this, you'll probably need to change the suppression.
+ if (!base::PlatformThread::CreateNonJoinable(