diff options
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/init.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7b55c10..cb7014e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2018-01-11 Doug Rupp <rupp@adacore.com> + + * init.c (vxworks): Add macro checks for __aarch64__. + 2018-01-11 Hristian Kirtchev <kirtchev@adacore.com> * exp_util.adb (Add_Failure_Expression): New routine. diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 608f41f..611a6f3 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -1937,7 +1937,7 @@ __gnat_map_signal (int sig, Raise_From_Signal_Handler (exception, msg); } -#if defined (ARMEL) && (_WRS_VXWORKS_MAJOR >= 7) +#if defined (ARMEL) && (_WRS_VXWORKS_MAJOR >= 7) || defined (__aarch64__) /* ARM-vx7 case with arm unwinding exceptions */ #define HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE @@ -2005,7 +2005,7 @@ __gnat_error_handler (int sig, siginfo_t *si, void *sc) sigdelset (&mask, sig); sigprocmask (SIG_SETMASK, &mask, NULL); -#if defined (__ARMEL__) || defined (__PPC__) || defined (__i386__) || defined (__x86_64__) +#if defined (__ARMEL__) || defined (__PPC__) || defined (__i386__) || defined (__x86_64__) || defined (__aarch64__) /* On certain targets, kernel mode, we process signals through a Call Frame Info trampoline, voiding the need for myriads of fallback_frame_state variants in the ZCX runtime. We have no simple way to distinguish ZCX |