You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
2.2 KiB
25 lines
2.2 KiB
4 years ago
|
diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.SIGSTKSZ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc
|
||
|
|
--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.SIGSTKSZ 2021-05-28 07:05:45.000000000 -0500
|
||
|
|
+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-06-24 09:14:27.365186590 -0500
|
||
|
|
@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() {
|
||
|
|
#else
|
||
|
|
const size_t page_mask = sysconf(_SC_PAGESIZE) - 1;
|
||
|
|
#endif
|
||
|
|
- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
|
||
|
|
+ size_t stack_size = (std::max<size_t>(SIGSTKSZ, 65536) + page_mask) & ~page_mask;
|
||
|
|
#if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \
|
||
|
|
defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER)
|
||
|
|
// Account for sanitizer instrumentation requiring additional stack space.
|
||
|
|
diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||
|
|
--- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.SIGSTKSZ 2021-05-28 07:05:45.000000000 -0500
|
||
|
|
+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-06-24 09:15:54.012558815 -0500
|
||
|
|
@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
|
||
|
|
// SIGSTKSZ may be too small to prevent the signal handlers from overrunning
|
||
|
|
// the alternative stack. Ensure that the size of the alternative stack is
|
||
|
|
// large enough.
|
||
|
|
- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
|
||
|
|
+ static const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
|
||
|
|
|
||
|
|
// Only set an alternative stack if there isn't already one, or if the current
|
||
|
|
// one is too small.
|