diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0b59a1e1d558..c2efbdf5288b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-18  Diego Novillo  <dnovillo@redhat.com>
+
+	* decl2.c (finish_objects): Use the original SYMBOL_REF from the
+	function declaration to avoid stripping the symbol's attributes.
+
 2001-05-18  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* decl.c (pushdecl): Adjust error string.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 73b9afdc6129..01f643fd927a 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -2932,7 +2932,7 @@ finish_objects (method_type, initp, body)
 		  linker sorts in increasing order.  */
 	       MAX_INIT_PRIORITY - initp);
       named_section (NULL_TREE, buf, 0);
-      assemble_integer (gen_rtx_SYMBOL_REF (Pmode, fnname),
+      assemble_integer (XEXP (DECL_RTL (fn), 0),
 			POINTER_SIZE / BITS_PER_UNIT, 1);
     }
 #endif