From 6da2ca7d777504705c984379a2d0376d194b9dbf Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 28 Jul 2011 13:40:51 +0000 Subject: [PATCH] init.c (__gnat_error_handler): Cast reason to int. * init.c (__gnat_error_handler): Cast reason to int. (__gnat_install_handler): Explain sa_sigaction use. From-SVN: r176870 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/init.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index d91f54f98ab..3ca191c5769 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2011-07-28 Rainer Orth + + * init.c (__gnat_error_handler): Cast reason to int. + (__gnat_install_handler): Explain sa_sigaction use. + 2011-07-24 Eric Botcazou * gcc-interface/decl.c (gnat_to_gnu_entity) : If the diff --git a/gcc/ada/init.c b/gcc/ada/init.c index b46cafdbbc8..52d775586d2 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -787,7 +787,11 @@ extern struct Exception_Data _abort_signal; static void __gnat_error_handler (int sig, siginfo_t *reason, void *uc ATTRIBUTE_UNUSED) { - int code = reason == NULL ? 0 : reason->si_code; + /* This handler is installed with SA_SIGINFO cleared, but there's no + prototype for the resulting alternative three-argument form, so we + have to hack around this by casting reason to the int actually + passed. */ + int code = (int) reason; struct Exception_Data *exception; const char *msg; @@ -872,7 +876,11 @@ __gnat_install_handler (void) /* Setup signal handler to map synchronous signals to appropriate exceptions. Make sure that the handler isn't interrupted by another - signal that might cause a scheduling event! */ + signal that might cause a scheduling event! + + The handler is installed with SA_SIGINFO cleared, but there's no + C++ prototype for the three-argument form, so fake it by using + sa_sigaction and casting the arguments instead. */ act.sa_sigaction = __gnat_error_handler; act.sa_flags = SA_NODEFER + SA_RESTART; -- 2.30.2