re PR bootstrap/81470 (Bootstrap comparison failures in gcc/ada)

2017-06-08  Tristan Gingold  <gindold@adacore.com>

	PR ada/81470
	* dwarf2out.c (dwarf2out_do_cfi_startproc): Only emit
	.cfi_personality or .cfi_lsda if the eh data format is dwarf2.

From-SVN: r255501

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4112576523c0f2efcecfe37b8e7273f60d977c55..e34e1829f376ed4d3edf4eb9047972160bcf3335 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-08  Tristan Gingold  <gindold@adacore.com>
+
+       PR ada/81470
+       * dwarf2out.c (dwarf2out_do_cfi_startproc): Only emit
+       .cfi_personality or .cfi_lsda if the eh data format is dwarf2.
+
 2017-12-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config/sol2.h (SOLARIS_ATTRIBUTE_TABLE): Initialize new member

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index ae3d962526c24f3ebe2170970de5844875865292..876e53f234fa01e2896aca6ffa3821bc81292d1a 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -963,10 +963,16 @@ dwarf2out_do_cfi_startproc (bool second)
 {
   int enc;
   rtx ref;
-  rtx personality = get_personality_function (current_function_decl);
 
   fprintf (asm_out_file, "\t.cfi_startproc\n");
 
+  /* .cfi_personality and .cfi_lsda are only relevant to DWARF2
+     eh unwinders.  */
+  if (targetm_common.except_unwind_info (&global_options) != UI_DWARF2)
+    return;
+
+  rtx personality = get_personality_function (current_function_decl);
+
   if (personality)
     {
       enc = ASM_PREFERRED_EH_DATA_FORMAT (/*code=*/2, /*global=*/1);