From: Paul Eggert Date: Sat, 29 May 2021 17:14:01 +0000 (-0700) Subject: sigsegv: Port to Solaris 11 X-Git-Tag: v1.0~2872 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=33613b780e3d350ba81954982def9aed4166d26b;p=gnulib.git sigsegv: Port to Solaris 11 Problem reported by Kiyoshi KANAZAWA in: https://lists.gnu.org/r/bug-m4/2021-05/msg00020.html * lib/stackvma.c (_FILE_OFFSET_BITS): #undef on Solaris and Android. --- diff --git a/ChangeLog b/ChangeLog index 43056adcb6..2f145fc02f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-05-29 Paul Eggert + + sigsegv: Port to Solaris 11 + Problem reported by Kiyoshi KANAZAWA in: + https://lists.gnu.org/r/bug-m4/2021-05/msg00020.html + * lib/stackvma.c (_FILE_OFFSET_BITS): #undef on Solaris and Android. + 2021-05-24 Bruno Haible c-stack: Document another restriction. diff --git a/lib/stackvma.c b/lib/stackvma.c index faa99238e3..ba3c7d305b 100644 --- a/lib/stackvma.c +++ b/lib/stackvma.c @@ -17,6 +17,21 @@ #include +/* On Solaris in 32-bit mode, when gnulib module 'largefile' is in use, + prevent a compilation error + "Cannot use procfs in the large file compilation environment" + On Android, when targeting Android 4.4 or older with a GCC toolchain, + prevent a compilation error + "error: call to 'mmap' declared with attribute error: mmap is not + available with _FILE_OFFSET_BITS=64 when using GCC until android-21. + Either raise your minSdkVersion, disable _FILE_OFFSET_BITS=64, or + switch to Clang." + The files that we access in this compilation unit are less than 2 GB + large. */ +#if defined __sun || defined __ANDROID__ +# undef _FILE_OFFSET_BITS +#endif + /* Specification. */ #include "stackvma.h"