diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 76a3fe442ae0ac49fda4b302d6db7ba12be827b5..f9dce7033d124fc5d7e665ec93f43874234ea140 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-20  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/alpha/alpha.c (alpha_end_function): Do not clear
+	crtl->emit structure and free insn locators if cfun->is_thunk is true,
+	this is now handled in generic code.
+
 2009-08-20  Andreas Krebbel  <krebbel1@de.ibm.com>
 
 	* config/s390/s390.c (Z10_PREDICT_DISTANCE): New macro.
@@ -13,11 +19,10 @@
 	* config/s390/s390.c ('E'): New output modifier.
 
 2009-08-20  Ramana Radhakrishnan  <ramana.radhakrishnan@arm.com>
-            Richard Earnshaw  <richard.earnshaw@arm.com>
+	    Richard Earnshaw  <richard.earnshaw@arm.com>
 
-        * config/arm/arm.c (arm_emit_movpair): Handle CONST_INT.
-        * config/arm/arm.md (*arm_movtas_ze): New pattern for
-        movt.
+	* config/arm/arm.c (arm_emit_movpair): Handle CONST_INT.
+	* config/arm/arm.md (*arm_movtas_ze): New pattern for movt.
 
 2009-08-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index e1644918850006979a0da3146075a93a7484949a..08de36365361bb31e2827b6213d98c6c2b9cb6cb 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -8613,14 +8613,6 @@ alpha_end_function (FILE *file, const char *fnname, tree decl ATTRIBUTE_UNUSED)
   if (insn && CALL_P (insn))
     output_asm_insn (get_insn_template (CODE_FOR_nop, NULL), NULL);
 
-#if TARGET_ABI_OSF
-  if (cfun->is_thunk)
-    {
-      memset (&crtl->emit, 0, sizeof (struct emit_status));
-      insn_locators_free ();
-    }
-#endif
-
 #if TARGET_ABI_OPEN_VMS
   alpha_write_linkage (file, fnname, decl);
 #endif