aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Rupp <rupp@adacore.com>2018-01-11 08:51:43 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2018-01-11 08:51:43 +0000
commit19fb043958578d5802565162d90ccea952dd0504 (patch)
tree5d73f25d8bc3611923d6c6ff53b7a6d81464f526
parent806312986f95213e4321f4a282ff1738fe72c1ea (diff)
downloadgcc-19fb043958578d5802565162d90ccea952dd0504.zip
gcc-19fb043958578d5802565162d90ccea952dd0504.tar.gz
gcc-19fb043958578d5802565162d90ccea952dd0504.tar.bz2
[Ada] Enable sigtramp for aarch64-vx7
2018-01-11 Doug Rupp <rupp@adacore.com> gcc/ada/ * init.c (vxworks): Add macro checks for __aarch64__. From-SVN: r256494
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/init.c4
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