* decl2.c (finish_file): Put back some code.

From-SVN: r16361

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8ae7e39e13917142a76befeadf9b03cc029b4c74..a93380199177501965bba65d14c705410c4b809c 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov  7 11:57:28 1997  Jason Merrill  <jason@yorick.cygnus.com>
+
+       * decl2.c (finish_file): Put back some code.
+
 Thu Nov  6 11:28:14 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
        * decl2.c (finish_file): Remove redundant code.

diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 2ca75dbbd9b00ae39f2fbca04cf94c50e0730c81..b51e6602fa6a5f2620d0e42d311aa4eb109a79f5 100644 (file)
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3260,6 +3260,11 @@ finish_file ()
                  {
                    DECL_EXTERNAL (decl) = 0;
                    reconsider = 1;
+                   /* We can't inline this function after it's been
+                       emitted.  We want a variant of
+                       output_inline_function that doesn't prevent
+                       subsequent integration...  */
+                   DECL_INLINE (decl) = 0;
                    output_inline_function (decl);
                    permanent_allocation (1);
                  }