From 143a4acd3b7005718e2501f30ecc32018032d854 Mon Sep 17 00:00:00 2001 From: Doug Rupp Date: Tue, 22 May 2018 13:27:06 +0000 Subject: [PATCH] [Ada] Don't define HAVE_ADJUST_CONTEXT_FOR_RAISE on VxWorks7 for AArch64 2018-05-22 Doug Rupp gcc/ada/ * init.c (HAVE_ADJUST_CONTEXT_FOR_RAISE): Don't define on VxWorks7 for AArch64. From-SVN: r260534 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/init.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * init.c (HAVE_ADJUST_CONTEXT_FOR_RAISE): Don't define on VxWorks7 for + AArch64. + 2018-05-22 Olivier Hainque * 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 -- 2.7.4