From: Jason Merrill <jason@yorick.cygnus.com>
Date: Fri, 7 Nov 1997 19:58:26 +0000 (+0000)
Subject: * decl2.c (finish_file): Put back some code.
X-Git-Tag: releases/libf2c-0.5.21~623
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd871063c593eb5fc415b0f372197b3660e0c2f7;p=thirdparty%2Fgcc.git

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

From-SVN: r16361
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8ae7e39e1391..a93380199177 100644
--- 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 2ca75dbbd9b0..b51e6602fa6a 100644
--- 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);
 		  }