diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7271a7befa..f697f3098ee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 24 01:32:12 1998  David S. Miller  <davem@pierdol.cobaltmicro.com>
+
+	* toplev.c (rest_of_compilation): Revert May 15 change.
+
 Tue Jun 23 21:27:27 1998  Ken Raeburn  <raeburn@cygnus.com>
 
 	* reload.c (find_reloads): Fix check for failure to match any
diff --git a/gcc/toplev.c b/gcc/toplev.c
index fb0245a0c3a..42d3616e359 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -3063,7 +3063,6 @@ rest_of_compilation (decl)
 	}
 
       if (! current_function_contains_functions
-	  && ! decl_function_context (decl)
 	  && (DECL_DEFER_OUTPUT (decl)
 	      || (DECL_INLINE (decl)
 		  && ((! TREE_PUBLIC (decl) && ! TREE_ADDRESSABLE (decl)