aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/init.c
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2012-07-12 12:24:41 +0200
committerArnaud Charlet <charlet@gcc.gnu.org>2012-07-12 12:24:41 +0200
commit2ed5b74848f711b62fb30cfa324377217534411a (patch)
treea039ecea9bedef27b6c20801e0b1666f99a5aa23 /gcc/ada/init.c
parentcd20e505e752c0434869baec3ac4fe7ac55a32b9 (diff)
downloadgcc-2ed5b74848f711b62fb30cfa324377217534411a.zip
gcc-2ed5b74848f711b62fb30cfa324377217534411a.tar.gz
gcc-2ed5b74848f711b62fb30cfa324377217534411a.tar.bz2
[multiple changes]
2012-07-12 Javier Miranda <miranda@adacore.com> * exp_ch3.adb (Make_Neq_Body): Fix typo in comment. 2012-07-12 Eric Botcazou <ebotcazou@adacore.com> * tb-gcc.c (trace_callback): On IA-64/HP-UX, use workaround only if USE_LIBUNWIND_EXCEPTIONS is defined. * init.c: Further tweaks for IA-64/HP-UX. 2012-07-12 Tristan Gingold <gingold@adacore.com> * raise-gcc.c: Do not include unwind-dw2-fde.h. Adjust comments. (db_region_for): Second argument is ip. Do not recompute ip. (action_kind): Remove typedef, add unhandler enum const. (action_descriptor): Adjust type of kind field. (db_action_for): Second argument is ip, do not recompute it. (get_call_site_action_for): First argument is call_site, do not recompute it. Remove useless return. (is_handled_by): Now return enum action_kind. Handle GNAT_ALL_OTHERS first. Return unhandler for GNAT_UNHANDLED_OTHERS. (get_action_description_for): First argument is now ip, do not recompute it. Adjust code for call to is_handled_by. (__gnat_notify_unhandled_exception): Add prototype. (PERSONALITY_FUNCTION): Call get_ip_from_context. Adjust calls. Handle unhandler case. (__gnat_cleanupunwind_handler): Add comments, add ATTRIBUTE_UNUSED on arguments. (__gnat_Unwind_RaiseException, __gnat_Unwind_ForcedUnwind): Define only once. * raise.h: Makes struct Exception_Data opaque. From-SVN: r189433
Diffstat (limited to 'gcc/ada/init.c')
-rw-r--r--gcc/ada/init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index e28b264..8a27a60 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -304,8 +304,10 @@ __gnat_install_handler (void)
#include <signal.h>
#include <sys/ucontext.h>
-#if defined(__ia64__)
+#if defined (IN_RTS) && defined (__ia64__)
+
#include <sys/uc_access.h>
+
#define HAVE_GNAT_ADJUST_CONTEXT_FOR_RAISE
void
@@ -318,7 +320,7 @@ __gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED, void *ucontext)
__uc_get_ip (uc, &ip);
__uc_set_ip (uc, ip + 1);
}
-#endif /* __ia64__ */
+#endif /* IN_RTS && __ia64__ */
/* Tasking and Non-tasking signal handler. Map SIGnal to Ada exception
propagation after the required low level adjustments. */
@@ -331,9 +333,7 @@ __gnat_error_handler (int sig,
struct Exception_Data *exception;
const char *msg;
-#if defined(__ia64__)
__gnat_adjust_context_for_raise (sig, ucontext);
-#endif
switch (sig)
{