external/breakpad/SIGSTKSZ.patch | 11 +++++++++++
external/breakpad/UnpackedTarball_breakpad.mk | 1 +
2 files changed, 12 insertions(+)
New commits:
commit c90cb1b3c265c1f81e614e47652fe24137d7928c
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Oct 12 14:42:05 2021 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Tue Oct 12 17:07:08 2021 +0200
external/breakpad: Adpat to SIGSTKSZ type in glibc 2.34
<https://sourceware.org/git/?p=glibc.git;a=commit;h=6c57d320484988e87e446e2e60ce42816bf51d53>
"sysconf: Add _SC_MINSIGSTKSZ/_SC_SIGSTKSZ [BZ #20305]" introduced
sysdeps/unix/sysv/linux/bits/sigstksz.h containing
> # define SIGSTKSZ sysconf (_SC_SIGSTKSZ)
so that SIGSTKSZ would have type long, causing
> src/client/linux/handler/exception_handler.cc: In function ‘void
google_breakpad::{anonymous}::InstallAlternateStackLocked()’:
> src/client/linux/handler/exception_handler.cc:141:49: error: no matching
function for call to ‘max(int, long int)’
> 141 | static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
> | ~~~~~~~~^~~~~~~~~~~~~~~~~
when building ExternalProject_breakpad. At least SuS4 appears to be silent
about a required type of SIGSTKSZ defined in signal.h.
Change-Id: I4d87017e10825ef051721f4e9ca751a77bb0d5c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123455
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/breakpad/SIGSTKSZ.patch b/external/breakpad/SIGSTKSZ.patch
new file mode 100644
index 000000000000..d37c58a2f84b
--- /dev/null
+++ b/external/breakpad/SIGSTKSZ.patch
@@ -0,0 +1,11 @@
+--- src/client/linux/handler/exception_handler.cc
++++ src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@
+ // 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<decltype(SIGSTKSZ)>(16384,
SIGSTKSZ);
+
+ // Only set an alternative stack if there isn't already one, or if the
current
+ // one is too small.
diff --git a/external/breakpad/UnpackedTarball_breakpad.mk
b/external/breakpad/UnpackedTarball_breakpad.mk
index 1b92728946cd..a44cb91e62bf 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
external/breakpad/c++20-allocator.patch \
external/breakpad/breakpad-dump_syms.patch.1 \
external/breakpad/breakpad-no-env.patch.1 \
+ external/breakpad/SIGSTKSZ.patch \
))
$(eval $(call
gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\
