upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-05-13 15:13:36 +00:00
Code Activity

sigsegv: Fix compilation error on Android 4.3.

Browse Source 
* lib/sigsegv.in.h: For Android, don't include <ucontext.h> and don't
reference ucontext_t.
* lib/sigsegv.c (SIGSEGV_FAULT_): For Android, use a plain POSIX fault
handler (cf. libsigsegv/src/fault-posix.h).
This commit is contained in:
Bruno Haible
2023-01-02 16:57:31 +01:00
parent 8805a44cf0
commit ccc756ce80
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2023-01-02 Bruno Haible <bruno@clisp.org>
sigsegv: Fix compilation error on Android 4.3.
* lib/sigsegv.in.h: For Android, don't include <ucontext.h> and don't
reference ucontext_t.
* lib/sigsegv.c (SIGSEGV_FAULT_): For Android, use a plain POSIX fault
handler (cf. libsigsegv/src/fault-posix.h).
2023-01-01 Paul Eggert <eggert@cs.ucla.edu>
dfa: work around Clang 15 bug

13
lib/sigsegv.c
View File

@@ -61,7 +61,7 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
occurred.
*/
#if defined __linux__ || defined __ANDROID__ /* Linux */
#if defined __linux__ && !defined __ANDROID__ /* Linux */
# define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, siginfo_t *sip, void *ucp
# define SIGSEGV_FAULT_ADDRESS sip->si_addr
@@ -348,6 +348,17 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
#endif
#if defined __ANDROID__ /* Android */
/* A platform that supports the POSIX:2008 (XPG 7) way, without
'struct sigcontext' nor 'ucontext_t'. */
# define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, siginfo_t *sip, void *context
# define SIGSEGV_FAULT_ADDRESS sip->si_addr
# define SIGSEGV_FAULT_CONTEXT context
# define SIGSEGV_FAULT_ADDRESS_FROM_SIGINFO
#endif
#if defined __GNU__ /* Hurd */
# define SIGSEGV_FAULT_HANDLER_ARGLIST int sig, int code, struct sigcontext *scp

4
lib/sigsegv.in.h
View File

@@ -23,7 +23,7 @@
#include <stddef.h>
/* Define the fault context structure. */
#if defined __linux__ || defined __ANDROID__ \
#if (defined __linux__ && !defined __ANDROID__) \
|| (defined __FreeBSD__ && (defined __arm__ || defined __armhf__ || defined __arm64__)) \
|| defined __NetBSD__ \
|| defined _AIX || defined __sun \
@@ -180,7 +180,7 @@ extern int sigsegv_leave_handler (void (*continuation) (void*, void*, void*), vo
* on some platforms it is a 'struct sigcontext *', on others merely an
* opaque 'void *'.
*/
# if defined __linux__ || defined __ANDROID__ \
# if (defined __linux__ && !defined __ANDROID__) \
|| (defined __FreeBSD__ && (defined __arm__ || defined __armhf__ || defined __arm64__)) \
|| defined __NetBSD__ \
|| (defined __APPLE__ && defined __MACH__) \