From: Doug Rupp <rupp@adacore.com>
Date: Wed, 10 Jul 2019 09:02:51 +0000 (+0000)
Subject: [Ada] Do not attempt to re-arm guard page on x86_64-vx7(r2)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ccba4bf136ef7012e7387119a86da56575802c4f;p=gcc.git

[Ada] Do not attempt to re-arm guard page on x86_64-vx7(r2)

A change in the API prohibits accessing Tcb fields directly. The bug in
VxWorks7 (failure to re-arm the guard page) now appears to be fixed, so
this is no long necessary.

2019-07-10  Doug Rupp  <rupp@adacore.com>

gcc/ada/

	* init.c: Do not attempt to re-arm guard page on x86_64-vx7(r2).

From-SVN: r273351
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6e9ba85f136..996dd18d2ba 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2019-07-10  Doug Rupp  <rupp@adacore.com>
+
+	* init.c: Do not attempt to re-arm guard page on x86_64-vx7(r2).
+
 2019-07-10  Ed Schonberg  <schonberg@adacore.com>
 
 	* sem_ch8.adb (Check_Constrained_Object): A record that is
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 00f32e5e02a..300a7e1c1dd 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -1725,7 +1725,7 @@ __gnat_install_handler (void)
 #include <iv.h>
 #endif
 
-#if ((defined (ARMEL) && (_WRS_VXWORKS_MAJOR == 6)) || defined (__x86_64__)) && !defined(__RTP__)
+#if ((defined (ARMEL) && (_WRS_VXWORKS_MAJOR == 6))) && !defined(__RTP__)
 #define VXWORKS_FORCE_GUARD_PAGE 1
 #include <vmLib.h>
 extern size_t vxIntStackOverflowSize;