diff --git a/toolchain.sh b/toolchain.sh
index 56552aa..ab9cbfd 100755
--- a/toolchain.sh
+++ b/toolchain.sh
@@ -16,11 +16,11 @@ NJOBS=-j"$(nproc)"
 PATH=$PATH:$PREFIX/bin
 export CFLAGS="-w"
 export CXXFLAGS="-w"
-export CFLAGS_FOR_TARGET="-m64 -O3 -fPIE"
-export GOFLAGS_FOR_TARGET="-m64 -O3 -fPIE"
-export FCFLAGS_FOR_TARGET="-m64 -O3 -fPIE"
-export FFLAGS_FOR_TARGET="-m64 -O3 -fPIE"
-export CXXFLAGS_FOR_TARGET="-m64 -O3 -fPIE"
+export CFLAGS_FOR_TARGET="-fPIE -pie"
+export GOFLAGS_FOR_TARGET="-fPIE -pie"
+export FCFLAGS_FOR_TARGET="-fPIE -pie"
+export FFLAGS_FOR_TARGET="-fPIE -pie"
+export CXXFLAGS_FOR_TARGET="-fPIE -pie"
 
 echo "Build bootstrap toolchain for $TARGET with $NJOBS jobs for $PREFIX"