summaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-30 12:06:30 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-30 12:06:30 +0000
commit49a601a2d082130242e87c784ff1484902795bc9 (patch)
treeb249400df9619c47d1d0e2bde3daa24a9d0a68f8 /gcc/ada
parent6696f241eb83878c0e0730694ba07d5e11f59d61 (diff)
downloadgcc-49a601a2d082130242e87c784ff1484902795bc9.tar.gz
* gcc-interface/trans.c (gigi): Fix initialization order.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231068 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/gcc-interface/trans.c19
2 files changed, 14 insertions, 9 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index eb00a33a122..ce389d1e767 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,9 @@
2015-11-30 Eric Botcazou <ebotcazou@adacore.com>
+ * gcc-interface/trans.c (gigi): Fix initialization order.
+
+2015-11-30 Eric Botcazou <ebotcazou@adacore.com>
+
* osint.adb: Add use type clause for CRTL.size_t.
(C_String_Length): Return CRTL.size_t instead of Integer.
(To_Path_String_Access): Take CRTL.size_t instead of Integer.
diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index eda1b3a63e8..143d2144dcc 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -627,8 +627,16 @@ gigi (Node_Id gnat_root,
main_identifier_node = get_identifier ("main");
- /* Install the builtins we might need, either internally or as
- user available facilities for Intrinsic imports. */
+ /* If we are using the GCC exception mechanism, let GCC know. */
+ if (Back_End_Exceptions ())
+ gnat_init_gcc_eh ();
+
+ /* Initialize the GCC support for FP operations. */
+ gnat_init_gcc_fp ();
+
+ /* Install the builtins we might need, either internally or as user-available
+ facilities for Intrinsic imports. Note that this must be done after the
+ GCC exception mechanism is initialized. */
gnat_install_builtins ();
vec_safe_push (gnu_except_ptr_stack, NULL_TREE);
@@ -641,13 +649,6 @@ gigi (Node_Id gnat_root,
targetm.asm_out.output_ident
(TREE_STRING_POINTER (gnat_to_gnu (Ident_String (Main_Unit))));
- /* If we are using the GCC exception mechanism, let GCC know. */
- if (Back_End_Exceptions ())
- gnat_init_gcc_eh ();
-
- /* Initialize the GCC support for FP operations. */
- gnat_init_gcc_fp ();
-
/* Force -fno-strict-aliasing if the configuration pragma was seen. */
if (No_Strict_Aliasing_CP)
flag_strict_aliasing = 0;