diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 222693f2a52..bb4b6b21bed 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-07  Steve Ellcey  <sje@cup.hp.com>
+
+	* decl.c (start_cleanup_fn): Declare as inline.
+
 2008-10-06  Jason Merrill  <jason@redhat.com>
 
 	PR c++/37376, other mangling issues
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index be28e788600..b0b03a549e6 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6006,6 +6006,7 @@ start_cleanup_fn (void)
      actually needed.  It is unlikely that it will be inlined, since
      it is only called via a function pointer, but we avoid unnecessary
      emissions this way.  */
+  DECL_DECLARED_INLINE_P (fndecl) = 1;
   DECL_INTERFACE_KNOWN (fndecl) = 1;
   /* Build the parameter.  */
   if (use_cxa_atexit)