From 0dea1a8b17f6bb66ce78a97b188cb4c83c3a5d68 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Fri, 1 Nov 2019 06:34:40 +0000
Subject: [PATCH 1/4] buildsystem: optimize for size when building with debug

---
 config/functions | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/functions b/config/functions
index fa14e0e8e6..80b7ea4773 100644
--- a/config/functions
+++ b/config/functions
@@ -222,14 +222,17 @@ 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_SIZE"
+    TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_SIZE"
+  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
 

From 8df34cfa11525c6c1a171e70dc11c212e0718dba Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 3 Nov 2019 16:48:49 +0000
Subject: [PATCH 2/4] buildsystem: remove obsolete variable

---
 config/path | 2 --
 1 file changed, 2 deletions(-)

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

From 021a47be3579863b3bbbb41e9a03d1641eada73d Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 3 Nov 2019 16:27:41 +0000
Subject: [PATCH 3/4] buildsystem: fix BUILD_WITH_DEBUG usage in
 config/optimize

---
 config/optimize | 10 ----------
 config/options  | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/optimize b/config/optimize
index 9c57fcaa92..e3f8b475f4 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=""
diff --git a/config/options b/config/options
index 63239b6151..f05b8f5802 100644
--- a/config/options
+++ b/config/options
@@ -112,3 +112,13 @@ 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

From f03406f33b76472f15df87b42c7abd41a1f33a5f Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Mon, 4 Nov 2019 16:27:59 +0000
Subject: [PATCH 4/4] buildsystem: fix BUILD_WITH_DEBUG usage in
 config/optimize (v2)

---
 config/functions |  5 +++--
 config/optimize  | 10 +++++++---
 config/options   | 10 ----------
 3 files changed, 10 insertions(+), 15 deletions(-)

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