diff --git a/config/functions b/config/functions
index 80b7ea4773..f8e23691a6 100644
--- a/config/functions
+++ b/config/functions
@@ -223,8 +223,9 @@ setup_toolchain() {
 
   # compiler optimization, descending priority: speed, size, default
   if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
-    TARGET_CFLAGS+=" $CFLAGS_OPTIM_SIZE"
-    TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_SIZE"
+    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"
diff --git a/config/optimize b/config/optimize
index e3f8b475f4..dd38973488 100644
--- a/config/optimize
+++ b/config/optimize
@@ -33,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/options b/config/options
index f05b8f5802..63239b6151 100644
--- a/config/options
+++ b/config/options
@@ -112,13 +112,3 @@ fi
 
 # set package metadata
 source_package "${1}"
-
-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