diff --git a/config/functions b/config/functions
index fa14e0e8e6..f8e23691a6 100644
--- a/config/functions
+++ b/config/functions
@@ -222,14 +222,18 @@ setup_toolchain() {
   fi
 
   # compiler optimization, descending priority: speed, size, default
-  if flag_enabled "speed" "no"; then
+  if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
+    TARGET_CFLAGS+=" $CFLAGS_OPTIM_DEBUG"
+    TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_DEBUG"
+    TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_DEBUG"
+  elif flag_enabled "speed" "no"; then
     TARGET_CFLAGS+=" $CFLAGS_OPTIM_SPEED"
     TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_SPEED"
   elif flag_enabled "size" "no"; then
     TARGET_CFLAGS+=" $CFLAGS_OPTIM_SIZE"
     TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_SIZE"
   else
-    TARGET_CFLAGS+=" $CXXFLAGS_OPTIM_DEFAULT"
+    TARGET_CFLAGS+=" $CFLAGS_OPTIM_DEFAULT"
     TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_DEFAULT"
   fi
 
diff --git a/config/optimize b/config/optimize
index 9c57fcaa92..dd38973488 100644
--- a/config/optimize
+++ b/config/optimize
@@ -1,16 +1,6 @@
 # Linker hash-style is set to gnu via gcc default
 LD_OPTIM="-Wl,--as-needed"
 
-if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -ggdb"
-else
-  TARGET_CFLAGS="$TARGET_CFLAGS -fomit-frame-pointer"
-  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fomit-frame-pointer"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS"
-fi
-
 NINJA_OPTS=""
 
 TARGET_CPPFLAGS=""
@@ -43,14 +33,18 @@ LDFLAGS_OPTIM_LTO_COMMON="-fuse-linker-plugin"
 LDFLAGS_OPTIM_GOLD="-fuse-ld=gold"
 
 # default compiler optimization
-CFLAGS_OPTIM_DEFAULT="-O2"
+CFLAGS_OPTIM_DEFAULT="-O2 -fomit-frame-pointer"
 CXXFLAGS_OPTIM_DEFAULT="$CFLAGS_OPTIM_DEFAULT"
 # speed flag
-CFLAGS_OPTIM_SPEED="-O3"
+CFLAGS_OPTIM_SPEED="-O3 -fomit-frame-pointer"
 CXXFLAGS_OPTIM_SPEED="$CFLAGS_OPTIM_SPEED"
 # size flag
-CFLAGS_OPTIM_SIZE="-Os"
+CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer"
 CXXFLAGS_OPTIM_SIZE="$CFLAGS_OPTIM_SIZE"
+# debug settings
+CFLAGS_OPTIM_DEBUG="-ggdb -Os"
+CXXFLAGS_OPTIM_DEBUG="$CFLAGS_OPTIM_DEBUG"
+LDFLAGS_OPTIM_DEBUG="-ggdb"
 
 # position-independent code
 CFLAGS_OPTIM_PIC="-fPIC -DPIC"
diff --git a/config/path b/config/path
index f6b781428c..480069ca55 100644
--- a/config/path
+++ b/config/path
@@ -80,8 +80,6 @@ if [[ -z "$PATH" || ( "$PATH" != "$TOOLCHAIN/bin:$TOOLCHAIN/sbin" && "$PATH" = "
   export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin${PATH:+":$PATH"}"
 fi
 
-VERSION_SUFFIX=$TARGET_ARCH
-
 # redirect formatted output
 export BUILD_INDENT_SIZE=4
 SILENT_OUT=3