diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2022-03-11 04:22:34 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-05-16 08:42:05 +0000 |
| commit | 839e7f16abda3fd8bd46d59ff1521d402d328a24 (patch) | |
| tree | 48ea4aac57af73f537c49ad07d7a266d28e58597 /gcc/ada/init.c | |
| parent | 9abb17d9fad628a237136b3348ca33f189d2ad2b (diff) | |
| download | gcc-839e7f16abda3fd8bd46d59ff1521d402d328a24.zip gcc-839e7f16abda3fd8bd46d59ff1521d402d328a24.tar.gz gcc-839e7f16abda3fd8bd46d59ff1521d402d328a24.tar.bz2 | |
[Ada] Fix thinko in QNX's implementation of __gnat_install_handler
On QNX, the sigaction handler is incorrectly installed via the
sa_handler field of struct sigaction, rather than the sa_sigaction
field. This triggers a compilation warning due to a mismatch between the
function's signature and the field's type.
| init.c:2614:18: warning: assignment to 'void (*)(int)'
| from incompatible pointer type 'void (*)(int, siginfo_t *, void *)'
| {aka 'void (*)(int, struct _siginfo *, void *)'}
| [-Wincompatible-pointer-types]
In practice, using the sa_handler field actually works, but only because
those two fields are inside a union:
From target/qnx7/usr/include/signal.h:
| union { \
| __handler_type _sa_handler; \
| __action_type _sa_sigaction; \
| } __sa_un; \
This commit fixes this.
gcc/ada/
* init.c (__gnat_install_handler) [__QNX__]: Set
act.sa_sigaction rather than act.sa_handler.
Diffstat (limited to 'gcc/ada/init.c')
| -rw-r--r-- | gcc/ada/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 9eedffc..4615cc1 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -2611,7 +2611,7 @@ __gnat_install_handler (void) struct sigaction act; int err; - act.sa_handler = __gnat_error_handler; + act.sa_sigaction = __gnat_error_handler; act.sa_flags = SA_NODEFER | SA_SIGINFO; sigemptyset (&act.sa_mask); |