--- gcc/cp/method.c.orig	2012-11-13 00:56:07.000000000 +0900
+++ gcc/cp/method.c	2012-11-13 00:58:02.000000000 +0900
@@ -1768,7 +1768,7 @@
 
   if (flag_new_abi)
     {
-      DECL_ASSEMBLER_NAME (decl) = mangle_decl (decl);
+      SET_DECL_ASSEMBLER_NAME (decl, mangle_decl (decl));
       return;
     }
 
@@ -1785,7 +1785,7 @@
 	    name = assignment_operator_name_info[(int) code].mangled_name;
 	  else
 	    name = operator_name_info[(int) code].mangled_name;
-	  DECL_ASSEMBLER_NAME (decl) = get_identifier (name);
+	  SET_DECL_ASSEMBLER_NAME (decl, get_identifier (name));
 	  return;
 	}
     }
@@ -1804,11 +1804,11 @@
 			|| TREE_CODE (TREE_TYPE (decl)) != FUNCTION_TYPE,
 			0);
 
-  DECL_ASSEMBLER_NAME (decl)
-    = build_decl_overload_real (decl, parm_types, NULL_TREE,
+  SET_DECL_ASSEMBLER_NAME (decl,
+    build_decl_overload_real (decl, parm_types, NULL_TREE,
 				NULL_TREE, NULL_TREE,
 				DECL_FUNCTION_MEMBER_P (decl)
-				+ DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (decl));
+				+ DECL_MAYBE_IN_CHARGE_CONSTRUCTOR_P (decl)));
 }
 
 /* Build an overload name for the type expression TYPE.  */
