diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index 07d2f2fee0..3584a554a2 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -7,7 +7,7 @@ $SCRIPTS/install gcc-core
 
 # Fails to compile with GCC's link time optimization.
   CFLAGS=`echo $CFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||"`
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||" -e "s|-fwhole-program||"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||" -e "s|-fuse-linker-plugin||"`
 
 # Fails to compile using the gold linker.
   CFLAGS=`echo $CFLAGS | sed -e "s|-fuse-linker-plugin||" -e "s|-fuse-ld=gold||"`
@@ -16,9 +16,10 @@ $SCRIPTS/install gcc-core
 # Filter out some problematic CFLAGS
   CFLAGS=`echo $CFLAGS | sed -e "s|-D_FILE_OFFSET_BITS=64||" -e "s|-D_LARGEFILE_SOURCE||"`
   CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Os|-O3|"`
 
 # set some CFLAGS we need
-  CFLAGS="$CFLAGS -fno-stack-protector"
+#  CFLAGS="$CFLAGS -fno-stack-protector"
 
 # dont do an parallel build
   MAKEFLAGS=-j1