From c8a23c29f7e61990d9f3fb36b4dfab8f46efa0ef Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 30 Nov 2015 12:06:30 +0000 Subject: [PATCH] * gcc-interface/trans.c (gigi): Fix initialization order. From-SVN: r231068 --- gcc/ada/ChangeLog | 4 ++++ gcc/ada/gcc-interface/trans.c | 19 ++++++++++--------- 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,3 +1,7 @@ +2015-11-30 Eric Botcazou + + * gcc-interface/trans.c (gigi): Fix initialization order. + 2015-11-30 Eric Botcazou * osint.adb: Add use type clause for CRTL.size_t. 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;