From 3d713bb88263a01aaa0dba8fa0866949d58b0dac Mon Sep 17 00:00:00 2001 From: Geert Bosch Date: Wed, 5 Mar 2003 17:09:55 +0100 Subject: [PATCH] raise.c (__gnat_Unwind_RaiseException): Add prototype to avoid warning, and fix return type for the IN_RTS && !SJLJ case. ada/9961 * raise.c (__gnat_Unwind_RaiseException): Add prototype to avoid warning, and fix return type for the IN_RTS && !SJLJ case. From-SVN: r63842 --- gcc/ada/ChangeLog | 8 +++++++- gcc/ada/raise.c | 19 +++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 22faa324f3d..009cd6ef862 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,8 +1,14 @@ +2003-03-05 Olivier Hainque + + ada/9961 + * raise.c (__gnat_Unwind_RaiseException): Add prototype to avoid + warning, and fix return type for the IN_RTS && !SJLJ case. + 2003-03-04 Tom Tromey * Make-lang.in (ada.tags): New target. -2003-03-04 Olivier Hainque +2003-03-04 Olivier Hainque ada/9911 * a-except.adb (Unwind_RaiseException): Import a GNAT specific diff --git a/gcc/ada/raise.c b/gcc/ada/raise.c index 4db4d20a4d0..a9841740d88 100644 --- a/gcc/ada/raise.c +++ b/gcc/ada/raise.c @@ -88,10 +88,20 @@ __gnat_unhandled_terminate () } /* Below is the code related to the integration of the GCC mechanism for - exception handling. */ + exception handling. Still work in progress. */ #include "unwind.h" +/* If the underlying GCC scheme for exception handling is SJLJ, the standard + propagation routine (_Unwind_RaiseException) is actually renamed using a + #define directive (see unwing-sjlj.c). We need a consistently named + interface to import from a-except, so stubs are defined here, at the end + of this file. */ + +_Unwind_Reason_Code +__gnat_Unwind_RaiseException PARAMS ((struct _Unwind_Exception *)); + + /* Exception Handling personality routine for Ada. ??? It is currently inspired from the one for C++, needs cleanups and @@ -597,10 +607,7 @@ __gnat_eh_personality (version, actions, exception_class, ue_header, context) } -/* If the underlying GCC scheme for exception handling is SJLJ, the standard - propagation routine (_Unwind_RaiseException) is actually renamed using a - #define directive (see unwing-sjlj.c). We need a consistently named - interface to import from a-except, so stubs are defined here. */ +/* Stubs for the libgcc unwinding interface, to be imported by a-except. */ #ifdef __USING_SJLJ_EXCEPTIONS__ @@ -614,7 +621,7 @@ __gnat_Unwind_RaiseException (e) #else /* __USING_SJLJ_EXCEPTIONS__ not defined */ -void +_Unwind_Reason_Code __gnat_Unwind_RaiseException (e) struct _Unwind_Exception *e; { -- 2.30.2