diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a6765d4dec33ffd1ef8e62ed48b4bc158ebf6a6..bfefccb9ed46f3c3c6625c326431472730a4e97a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-21  David Edelsohn  <dje.gcc@gmail.com>
+	    Aldy Hernandez  <aldyh@redhat.com>
+
+	* trans-mem.c (ipa_tm_create_version_alias): Mangle new_decl
+	if DECL_ONE_ONLY.
+	(ipa_tm_create_version): Same.
+
 2011-11-29  Bernd Schmidt  <bernds@codesourcery.com>
 
 	* haifa-sched.c (recompute_todo_spec): Simplify and correct the
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 751572c4fb41beaa2fa4d3049063430dce783807..9751a15a4d2dc9cf1903e1103985f1f7ced7b61c 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -4213,7 +4213,7 @@ ipa_tm_create_version_alias (struct cgraph_node *node, void *data)
   TREE_SYMBOL_REFERENCED (tm_name) = 1;
 
   /* Perform the same remapping to the comdat group.  */
-  if (DECL_COMDAT (new_decl))
+  if (DECL_ONE_ONLY (new_decl))
     DECL_COMDAT_GROUP (new_decl) = tm_mangle (DECL_COMDAT_GROUP (old_decl));
 
   new_node = cgraph_same_body_alias (NULL, new_decl, info->new_decl);
@@ -4248,7 +4248,7 @@ ipa_tm_create_version (struct cgraph_node *old_node)
   TREE_SYMBOL_REFERENCED (tm_name) = 1;
 
   /* Perform the same remapping to the comdat group.  */
-  if (DECL_COMDAT (new_decl))
+  if (DECL_ONE_ONLY (new_decl))
     DECL_COMDAT_GROUP (new_decl) = tm_mangle (DECL_COMDAT_GROUP (old_decl));
 
   new_node = cgraph_copy_node_for_versioning (old_node, new_decl, NULL, NULL);