aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada/rtinit.c
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2015-01-06 11:22:41 +0100
committerArnaud Charlet <charlet@gcc.gnu.org>2015-01-06 11:22:41 +0100
commit59e9bc0b6ff7d00bd56a5b4767014b6529bf820b (patch)
tree6a6bd4a86df01a948ed4eeae70967786292cf016 /gcc/ada/rtinit.c
parent1a779058e1ebd6e68771f25062e95f3bb7ff48ab (diff)
downloadgcc-59e9bc0b6ff7d00bd56a5b4767014b6529bf820b.zip
gcc-59e9bc0b6ff7d00bd56a5b4767014b6529bf820b.tar.gz
gcc-59e9bc0b6ff7d00bd56a5b4767014b6529bf820b.tar.bz2
[multiple changes]
2015-01-06 Ed Schonberg <schonberg@adacore.com> * sem_ch12.adb: Sloc of wrapper is that of instantiation. 2015-01-06 Robert Dewar <dewar@adacore.com> * sem_ch11.adb: Minor reformatting. 2015-01-06 Ed Schonberg <schonberg@adacore.com> * exp_aggr.adb (Get_Assoc_Expr): New routine internal to Build_Array_Aggr_Code, used to initialized components covered by a box association. If the component type is scalar and has a default aspect, use it to initialize such components. 2015-01-06 Pascal Obry <obry@adacore.com> * rtinit.c (__gnat_runtime_initialize): Add a parameter to control the setup of the exception handler. * initialize.c: Remove unused declaration. * bindgen.adb: Always call __gnat_runtime_initialize and pass whether the exeception handler must be set or not. From-SVN: r219251
Diffstat (limited to 'gcc/ada/rtinit.c')
-rw-r--r--gcc/ada/rtinit.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/gcc/ada/rtinit.c b/gcc/ada/rtinit.c
index 59bac0f..97582db 100644
--- a/gcc/ada/rtinit.c
+++ b/gcc/ada/rtinit.c
@@ -76,7 +76,6 @@ int __gnat_rt_init_count = 0;
#include <windows.h>
extern void __gnat_init_float (void);
-extern void __gnat_install_SEH_handler (void *);
extern int gnat_argc;
extern char **gnat_argv;
@@ -138,7 +137,7 @@ append_arg (int *index, LPWSTR dir, LPWSTR value,
#endif
void
-__gnat_runtime_initialize(void)
+__gnat_runtime_initialize(int install_handler)
{
/* increment the reference counter */
@@ -302,7 +301,8 @@ __gnat_runtime_initialize(void)
}
#endif
- __gnat_install_handler();
+ if (install_handler)
+ __gnat_install_handler();
}
/**************************************************/
@@ -315,7 +315,7 @@ __gnat_runtime_initialize(void)
extern void __gnat_init_float (void);
void
-__gnat_runtime_initialize(void)
+__gnat_runtime_initialize(int install_handler)
{
/* increment the reference counter */
@@ -327,7 +327,8 @@ __gnat_runtime_initialize(void)
__gnat_init_float ();
- __gnat_install_handler();
+ if (install_handler)
+ __gnat_install_handler();
}
/***********************************************/
@@ -339,7 +340,7 @@ __gnat_runtime_initialize(void)
extern void __gnat_init_float (void);
void
-__gnat_runtime_initialize(void)
+__gnat_runtime_initialize(int install_handler)
{
/* increment the reference counter */
@@ -351,7 +352,8 @@ __gnat_runtime_initialize(void)
__gnat_init_float ();
- __gnat_install_handler();
+ if (install_handler)
+ __gnat_install_handler();
}
#else
@@ -361,7 +363,7 @@ __gnat_runtime_initialize(void)
/***********************************************/
void
-__gnat_runtime_initialize(void)
+__gnat_runtime_initialize(int install_handler)
{
/* increment the reference counter */
@@ -371,7 +373,8 @@ __gnat_runtime_initialize(void)
if (__gnat_rt_init_count > 1)
return;
- __gnat_install_handler();
+ if (install_handler)
+ __gnat_install_handler();
}
#endif