diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-02 16:57:31 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-02 16:57:31 +0100 |
| commit | ccc756ce80c9dcb5a506559a53dae8083c33723c (patch) | |
| tree | c446a5b37697f13eaf43719dab7f881d0b79fdd5 | |
| parent | 8805a44cf04253f63bce160054e2fbf21ab9beb1 (diff) | |
| download | gnulib-ccc756ce80c9dcb5a506559a53dae8083c33723c.tar.gz | |
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).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/sigsegv.c | 13 | ||||
| -rw-r--r-- | lib/sigsegv.in.h | 4 |
3 files changed, 22 insertions, 3 deletions
@@ -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 diff --git a/lib/sigsegv.c b/lib/sigsegv.c index 14f3a4650b..29c452dbe0 100644 --- a/lib/sigsegv.c +++ b/lib/sigsegv.c @@ -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 diff --git a/lib/sigsegv.in.h b/lib/sigsegv.in.h index 097041f1ba..40b453e67b 100644 --- a/lib/sigsegv.in.h +++ b/lib/sigsegv.in.h @@ -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__) \ |