--- /usr/portage/dev-libs/klibc/klibc-2.0.4.ebuild	2016-06-15 21:50:15.000000000 +0300
+++ klibc-2.0.4.ebuild	2016-07-05 19:37:29.000000000 +0300
@@ -120,6 +120,8 @@ src_prepare() {
 	for p in $(<"${S}"/debian/patches/series) ; do
 		epatch "${S}/debian/patches/${p}"
 	done
+
+	sed -i -e 's:-Os:-nostdlib -Os:' "${S}"/usr/klibc/arch/*/MCONFIG
 }
 
 # klibc has it's own ideas of arches
@@ -181,7 +183,6 @@ src_compile() {
 		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
 		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
 		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
 		HOSTCC="${HOSTCC}" CC="${CC}" \
 		HOSTLD="${HOSTLD}" LD="${LD}" \
 		INSTALLDIR="/usr/${libdir}/klibc" \
@@ -231,7 +232,6 @@ src_install() {
 		EXTRA_KLIBCAFLAGS="-Wa,--noexecstack" \
 		EXTRA_KLIBCLDFLAGS="-z noexecstack" \
 		HOSTLDFLAGS="-z noexecstack" \
-		KLIBCOPTFLAGS='-nostdlib' \
 		HOSTCC="${HOSTCC}" CC="${CC}" \
 		HOSTLD="${HOSTLD}" LD="${LD}" \
 		INSTALLDIR="/usr/${libdir}/klibc" \