From: Hans-Peter Nilsson <hp@axis.com>
Date: Tue, 13 Nov 2012 06:15:53 +0000 (+0000)
Subject: re PR target/55257 (g++.dg/debug/dwarf2/non-virtual-thunk.C scan-assembler thunk... 
X-Git-Tag: upstream/12.2.0~72851
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=097f98d44dd72329f57ede51399a7d99f3a93bcd;p=platform%2Fupstream%2Fgcc.git

re PR target/55257 (g++.dg/debug/dwarf2/non-virtual-thunk.C scan-assembler thunk.C:30)

	PR target/55257
	* config/cris/cris.c (cris_asm_output_mi_thunk): Call
	final_start_function and final_end_function.

From-SVN: r193467
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dff8011..31fbe7f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-13  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR target/55257
+	* config/cris/cris.c (cris_asm_output_mi_thunk): Call
+	final_start_function and final_end_function.
+
 2012-11-12  David Edelsohn  <dje.gcc@gmail.com>
 
 	* asan.c: Include tm_p.h
diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c
index 6378c62..3220508 100644
--- a/gcc/config/cris/cris.c
+++ b/gcc/config/cris/cris.c
@@ -2698,6 +2698,9 @@ cris_asm_output_mi_thunk (FILE *stream,
 			  HOST_WIDE_INT vcall_offset ATTRIBUTE_UNUSED,
 			  tree funcdecl)
 {
+  /* Make sure unwind info is emitted for the thunk if needed.  */
+  final_start_function (emit_barrier (), stream, 1);
+
   if (delta > 0)
     fprintf (stream, "\tadd%s " HOST_WIDE_INT_PRINT_DEC ",$%s\n",
 	     ADDITIVE_SIZE_MODIFIER (delta), delta,
@@ -2735,6 +2738,8 @@ cris_asm_output_mi_thunk (FILE *stream,
       if (TARGET_V32)
 	fprintf (stream, "\tnop\n");
     }
+
+  final_end_function ();
 }
 
 /* Boilerplate emitted at start of file.