[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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a5b1dc6a14432c23b56e5bce12b15d41ddfeff7b..1f7cba903c765debc932ddeada2e64a1ec554efa 100644 (file)
--- 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 5088ecffc4f1843e2944d1f79e4d4fbe2b0ea878..7db330afab3ddaa1e4b9d3daa8f3e5cfa18a2349 100644 (file)
--- 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