diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dff80110bc4..31fbe7fe6d7 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 6378c622a25..322050880c9 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.