diff --git a/Makefile.all.am b/Makefile.all.am
index faa170d8f..29e040700 100644
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -97,7 +97,7 @@ clean-noinst_DSYMS:
 # -fno-builtin is important for defeating LLVM's idiom recognition
 # that somehow causes VG_(memset) to get into infinite recursion.
 AM_CFLAGS_BASE = \
-	-O2 -g \
+	-O2 -finline-functions -g \
 	-std=gnu99 \
 	-Wall \
 	-Wmissing-prototypes \