diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc0cd37f402..28cbc2813c5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-27  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR middle-end/40249
+	* Makefile.in (CRTSTUFF_CFLAGS): Replace -fno-inline-functions
+	with -fno-inline.
+
 2009-05-27  Shujing Zhao  <pearly.zhao@oracle.com>
 
 	* config/m32r/m32r.c: Use REG_P, MEM_P and CONST_INT_P where
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 33b02032b8e..b140688b292 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -604,7 +604,7 @@ TARGET_LIBGCC2_CFLAGS =
 
 # Options to use when compiling crtbegin/end.
 CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
-  -finhibit-size-directive -fno-inline-functions -fno-exceptions \
+  -finhibit-size-directive -fno-inline -fno-exceptions \
   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
   $(INHIBIT_LIBC_CFLAGS)