diff options
author | Derek Mauro <761129+derekmauro@users.noreply.github.com> | 2021-06-01 10:52:49 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-01 10:52:49 -0400 |
commit | 278e0a071885a22dcd2fd1b5576cc44757299343 (patch) | |
tree | 2f50d910df44a77d0ace291ce84e13c9fbdc0162 /absl/debugging | |
parent | e1d388e7e74803050423d035e4374131b9b57919 (diff) |
Abseil LTS 20210324, Patch 220210324.2
* Fixes build with glibc 2.34 (#952)
* Fixes "illegal thread local variable" on some Apple platforms (#954, #965)
Diffstat (limited to 'absl/debugging')
-rw-r--r-- | absl/debugging/failure_signal_handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc index a9ed6ef9..3ddebd74 100644 --- a/absl/debugging/failure_signal_handler.cc +++ b/absl/debugging/failure_signal_handler.cc @@ -136,7 +136,8 @@ 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. |