diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 258890d1746fc6a78c89c42f431725e338303062..ed5e0c27f519d40ca720a36ae46045f7993d85a8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03  Richard Guenther  <rguenther@suse.de>
+
+	* cgraphunit.c (assemble_thunk): Use DECL_ASSEMBLER_NAME
+	instead of DECL_NAME for the entry point.
+
 2009-12-03  Richard Earnshaw  <rearnsha@arm.com>
 
 	* arm/linux-atomic.c (SYNC_LOCK_RELEASE): Place memory barrier
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 51ead06bc4a26a09e4e00c1ea38ba40d34b0678e..345fb670a82a796fa02253a4820c977eef77ceca 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -1321,7 +1321,7 @@ assemble_thunk (struct cgraph_node *node)
       DECL_RESULT (thunk_fndecl)
 	= build_decl (DECL_SOURCE_LOCATION (thunk_fndecl),
 		      RESULT_DECL, 0, integer_type_node);
-      fnname = IDENTIFIER_POINTER (DECL_NAME (thunk_fndecl));
+      fnname = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (thunk_fndecl));
 
       /* The back end expects DECL_INITIAL to contain a BLOCK, so we
 	 create one.  */