[multiple changes]

2015-11-13  Eric Botcazou  <ebotcazou@adacore.com>

	* sigtramp-ios.c, init.c: Minor cosmetic tweaks.

2015-11-13  Hristian Kirtchev  <kirtchev@adacore.com>

	* s-gloloc.adb, g-debpoo.adb: Minor reformatting.

2015-11-13  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch5.adb (Analyze_Iterator_Specification): Improve error
	message for the case the iterable name (array or container)
	is a component that depends on a discriminant.

2015-11-13  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch4.adb (Indicate_Name_And_Type): If the analysis of
	one interpretation succeeds, set type of name in call, for
	completeness.
	(Try_Container_Indexing): If there are multiple indexing
	functions, collect possible interpretations that are compatible
	with given parameters, and add implicit dereference types when
	present.
	* sem_util.adb (Build_Explicit_Dereference): If the expression
	is an overloaded function call use the given discriminant to
	resolve the call, and set properly the type of the call and of
	the resulting dereference.

2015-11-13  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_prag.adb (Analyze_Pragma): Pragma Constant_After_Elaboration can
	now apply to a variable without an initialization expression.

2015-11-13  Hristian Kirtchev  <kirtchev@adacore.com>

	* exp_ch9.adb (Add_Matching_Formals): Parameter Actuals is now of mode
	IN OUT. Create a new list when list Actuals is not present.
	(Build_Contract_Wrapper): Create the wrapper
	only when the entry has at least on checked contract case or
	pre/postcondition. Ensure that the call to the original entry
	lacks an actual parameter list when the entry appears without
	formal parameters.
	(Expand_Entry_Declaration): Code cleanup.

2015-11-13  Hristian Kirtchev  <kirtchev@adacore.com>

	* sem_ch13.adb (Analyze_Aspect_Specifications): Continue the analysis
	after encountering an illegal aspect Part_Of.

2015-11-13  Ed Schonberg  <schonberg@adacore.com>

	* exp_attr.adb (Expand_N_Attribute_Reference, case
	Overlaps_Storage): Add copies for nodes that represent the integer
	addresses of the two actuals, to prevent identical nodes in the
	tree, which the backend cannot handle properly.

From-SVN: r230316

1 files changed, 11 insertions, 16 deletions

diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 4e95614..4f7341e 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -324,9 +324,7 @@ __gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED, void *ucontext)
    propagation after the required low level adjustments.  */
 
 static void
-__gnat_error_handler (int sig,
-		      siginfo_t *si ATTRIBUTE_UNUSED,
-		      void *ucontext ATTRIBUTE_UNUSED)
+__gnat_error_handler (int sig, siginfo_t *si ATTRIBUTE_UNUSED, void *ucontext)
 {
   struct Exception_Data *exception;
   const char *msg;
@@ -683,7 +681,7 @@ __gnat_error_handler (int sig)
 }
 
 void
-__gnat_install_handler(void)
+__gnat_install_handler (void)
 {
   struct sigaction act;
 
@@ -1930,10 +1928,9 @@ __gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED,
 				 void *sc ATTRIBUTE_UNUSED)
 {
   /* In case of ARM exceptions, the registers context have the PC pointing
-     to the instruction that raised the signal. However the Unwinder expects
-     the instruction to be in the range ]PC,PC+1].
-      */
-  uintptr_t *pc_addr; /* address of the pc value to restore */
+     to the instruction that raised the signal.  However the unwinder expects
+     the instruction to be in the range ]PC,PC+1].  */
+  uintptr_t *pc_addr;
 #ifdef __RTP__
   mcontext_t *mcontext = &((ucontext_t *) sc)->uc_mcontext;
   pc_addr = (uintptr_t*)&mcontext->regs.pc;
@@ -1997,7 +1994,7 @@ __gnat_error_handler (int sig, siginfo_t *si, void *sc)
   __gnat_adjust_context_for_raise (sig, sc);
 #endif
 
-  #include "sigtramp.h"
+#include "sigtramp.h"
 
   __gnat_sigtramp (sig, (void *)si, (void *)sc,
 		   (__sigtramphandler_t *)&__gnat_map_signal);
@@ -2189,7 +2186,7 @@ __gnat_error_handler (int sig)
 }
 
 void
-__gnat_install_handler(void)
+__gnat_install_handler (void)
 {
   struct sigaction act;
 
@@ -2252,7 +2249,7 @@ __gnat_error_handler (int sig)
 }
 
 void
-__gnat_install_handler(void)
+__gnat_install_handler (void)
 {
   struct sigaction act;
 
@@ -2443,8 +2440,8 @@ __gnat_error_handler (int sig, siginfo_t *si, void *ucontext)
 {
   __gnat_adjust_context_for_raise (sig, ucontext);
 
+  /* The Darwin libc comes with a signal trampoline, except for ARM64.  */
 #ifdef __arm64__
-  /* Use a trampoline so that the unwinder won't see the signal frame.  */
   __gnat_sigtramp (sig, (void *)si, ucontext,
 		   (__sigtramphandler_t *)&__gnat_map_signal);
 #else
@@ -2515,7 +2512,7 @@ __gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED, void *ucontext)
 static void
 __gnat_map_signal (int sig,
 		   siginfo_t *si ATTRIBUTE_UNUSED,
-		   void *ucontext ATTRIBUTE_UNUSED)
+		   void *mcontext ATTRIBUTE_UNUSED)
 {
   struct Exception_Data *exception;
   const char *msg;
@@ -2546,9 +2543,7 @@ __gnat_map_signal (int sig,
 }
 
 static void
-__gnat_error_handler (int sig,
-		      siginfo_t *si ATTRIBUTE_UNUSED,
-		      void *ucontext ATTRIBUTE_UNUSED)
+__gnat_error_handler (int sig, siginfo_t *si, void *ucontext)
 {
   __gnat_adjust_context_for_raise (sig, ucontext);