From 3808a9c7296e110a2ba0b40248445f043547b826 Mon Sep 17 00:00:00 2001
From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Tue, 29 Jul 2014 15:48:13 +0200
Subject: [multiple changes]

2014-07-29  Doug Rupp  <rupp@adacore.com>

	* sigtramp-armvxw.c: Enhance to handle RTP trampolining.
	* init.c: Remove guard on sigtramp for ARM VxWorks RTP.

2014-07-29  Vincent Celier  <celier@adacore.com>

	* switch-c.adb (Scan_Front_End_Switches): Do not fail when two
	runtime directorie specified with two switches --RTS= designate
	the same directory, even when there are no literarily the same.

2014-07-29  Robert Dewar  <dewar@adacore.com>

	* gnat_ugn.texi: Minor documentation clarification.
	* switch-c.adb: Minor reformatting.

From-SVN: r213187
---
 gcc/ada/init.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'gcc/ada/init.c')

diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 587638b..41156ce 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -1703,7 +1703,9 @@ __gnat_install_handler ()
 #include <signal.h>
 #include <taskLib.h>
 
-#ifndef __RTP__
+#ifdef __RTP__
+#include <base/b_ucontext_t.h>
+#else
 #include <intLib.h>
 #include <iv.h>
 #endif
@@ -1911,7 +1913,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(_WRS_KERNEL)
+#if defined (__ARMEL__) || (defined (__PPC__) && defined (_WRS_KERNEL))
   /* On PowerPC, 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
-- 
cgit v1.1