From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Date: Wed, 31 Dec 2025 19:10:51 +0000 (+0100)
Subject: Makefile: repair CONFIG_CC_OPTIMIZE_FOR_DEBUG support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56ae3c2a44fcd8e2f680c51620011273727ae9db;p=thirdparty%2Fu-boot.git

Makefile: repair CONFIG_CC_OPTIMIZE_FOR_DEBUG support

Since commit 5f520875bdf0 ("kbuild: Bump the build system to 5.1")
CONFIG_CC_OPTIMIZE_FOR_DEBUG has no effect on the non-host code.

This patch reestablishes the prior logic to add

    -Og -Wno-maybe-uninitialized

to KBUILD_CFLAGS.

Fixes: 5f520875bdf0 ("kbuild: Bump the build system to 5.1")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
---

diff --git a/Makefile b/Makefile
index 6b5c5ee019e..696b502fa16 100644
--- a/Makefile
+++ b/Makefile
@@ -869,6 +869,11 @@ endif
 
 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
 KBUILD_CFLAGS	+= -Os
+else ifdef CONFIG_CC_OPTIMIZE_FOR_DEBUG
+-KBUILD_CFLAGS  += -Og
+# Avoid false positives -Wmaybe-uninitialized
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78394
+KBUILD_CFLAGS  += -Wno-maybe-uninitialized
 else
 KBUILD_CFLAGS   += -O2
 endif