re PR c++/57897 (Target x86_64-w64-mingw32 failed with '-mno-fentry isn't compatible...

       PR c++/57897
       * config/i386/i386.c (ix86_option_override_internal): Set for
       x64 target flag_unwind_tables, if flag_asynchronous_unwind_tables
       was explicit set.

From-SVN: r205957

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 545eb766b76b06d78eedab467185436b55516e93..68261c688b65e7ea180d92b92a3dce48c3dc1a4c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-13  Kai Tietz  <kitetz@redhat.com>
+
+       PR c++/57897
+       * config/i386/i386.c (ix86_option_override_internal): Set for
+       x64 target flag_unwind_tables, if flag_asynchronous_unwind_tables
+       was explicit set.
+
 2013-12-12  Jeff Law  <law@redhat.com>
 
        * i386.md (simple LEA peephole2): Add missing mode to zero_extend

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 8f7920995b06567702c6a51349fb09d2ee9d018f..b37025bf0164ff41bd23b9ee487f4c16c743a7ec 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3698,6 +3698,10 @@ ix86_option_override_internal (bool main_args_p,
     {
       if (opts->x_optimize >= 1 && !opts_set->x_flag_omit_frame_pointer)
        opts->x_flag_omit_frame_pointer = !USE_X86_64_FRAME_POINTER;
+      if (opts->x_flag_asynchronous_unwind_tables
+         && !opts_set->x_flag_unwind_tables
+         && TARGET_64BIT_MS_ABI)
+       opts->x_flag_unwind_tables = 1;
       if (opts->x_flag_asynchronous_unwind_tables == 2)
        opts->x_flag_unwind_tables
          = opts->x_flag_asynchronous_unwind_tables = 1;