Index: osprey-gcc-4.2.0/gcc/cp/decl.c
===================================================================
--- osprey-gcc-4.2.0/gcc/cp/decl.c	(revision 3327)
+++ osprey-gcc-4.2.0/gcc/cp/decl.c	(working copy)
@@ -1953,7 +1953,8 @@
   DECL_COMMON (newdecl) = DECL_COMMON (olddecl);
 #ifdef OPEN64_SPIN
   if (flag_spin_file)
-      SET_DECL_ASSEMBLER_NAME (newdecl, DECL_ASSEMBLER_NAME(olddecl));
+      SET_DECL_ASSEMBLER_NAME (newdecl, 
+              DECL_ASSEMBLER_NAME_SET_P(olddecl) ? DECL_ASSEMBLER_NAME(olddecl) : NULL);
   else
 #endif
       COPY_DECL_ASSEMBLER_NAME (olddecl, newdecl);
Index: osprey-gcc/gcc/cp/decl.c
===================================================================
--- osprey-gcc/gcc/cp/decl.c	(revision 3327)
+++ osprey-gcc/gcc/cp/decl.c	(working copy)
@@ -1818,7 +1818,8 @@
   DECL_COMMON (newdecl) = DECL_COMMON (olddecl);
 #ifdef OPEN64_SPIN
   if (flag_spin_file)
-      SET_DECL_ASSEMBLER_NAME (newdecl, DECL_ASSEMBLER_NAME(olddecl));
+      SET_DECL_ASSEMBLER_NAME (newdecl, 
+              DECL_ASSEMBLER_NAME_SET_P(olddecl) ? DECL_ASSEMBLER_NAME(olddecl) : NULL);
   else
 #endif
       COPY_DECL_ASSEMBLER_NAME (olddecl, newdecl);