diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 234bc4505f5..fd5015242c6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22  Richard Guenther  <rguenther@suse.de>
+
+	* tree-inline.c (inlinable_function_p): Restore disregarding
+	inline limits for GNU extern inline functions.
+
 2007-08-22  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/32563
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 16198385496..a24f70d0562 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1920,6 +1920,11 @@ inlinable_function_p (tree fn)
 bool
 disregard_inline_limits_p (tree fn)
 {
+  /* GNU extern inline functions are supposed to be cheap.  */
+  if (DECL_DECLARED_INLINE_P (fn)
+      && DECL_EXTERNAL (fn))
+    return true;
+
   return lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) != NULL_TREE;
 }