aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Rupp <rupp@adacore.com>2018-05-22 13:27:06 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2018-05-22 13:27:06 +0000
commit143a4acd3b7005718e2501f30ecc32018032d854 (patch)
tree20cc096da6a2116fe65080963a3ecc3fd2bae6af
parentf6904af09df7f0318e2da64e68944cca1c8e454e (diff)
downloadgcc-143a4acd3b7005718e2501f30ecc32018032d854.zip
gcc-143a4acd3b7005718e2501f30ecc32018032d854.tar.gz
gcc-143a4acd3b7005718e2501f30ecc32018032d854.tar.bz2
[Ada] Don't define HAVE_ADJUST_CONTEXT_FOR_RAISE on VxWorks7 for AArch64
2018-05-22 Doug Rupp <rupp@adacore.com> gcc/ada/ * init.c (HAVE_ADJUST_CONTEXT_FOR_RAISE): Don't define on VxWorks7 for AArch64. From-SVN: r260534
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/init.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a5b1dc6..1f7cba9 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2018-05-22 Doug Rupp <rupp@adacore.com>
+
+ * init.c (HAVE_ADJUST_CONTEXT_FOR_RAISE): Don't define on VxWorks7 for
+ AArch64.
+
2018-05-22 Olivier Hainque <hainque@adacore.com>
* libgnat/a-except.adb (Exception_Propagation.Propagate_Exception):
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 5088ecf..7db330a 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) || defined (__aarch64__)
+#if defined (ARMEL) && (_WRS_VXWORKS_MAJOR >= 7) && !defined (__aarch64__)
/* ARM-vx7 case with arm unwinding exceptions */
#define HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE