From 9f8d8da430ee5447a5395e2b8424b28a833c00e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
 <bernhard.rosenkraenzer.ext@huawei.com>
Date: Thu, 2 Sep 2021 17:27:37 +0200
Subject: [PATCH] gcc: Build without -Wformat-security and -Wformat-nonliteral
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove -Wformat-security and -Wformat-nonliteral from compiler flags for
incompatible code in gcc so we can enable those flags globally.

Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
---
 meta-ohos-staging/recipes-devtools/gcc/gcc-11.2.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta-ohos-staging/recipes-devtools/gcc/gcc-11.2.inc b/meta-ohos-staging/recipes-devtools/gcc/gcc-11.2.inc
index 31dbc072..b625fba0 100644
--- a/meta-ohos-staging/recipes-devtools/gcc/gcc-11.2.inc
+++ b/meta-ohos-staging/recipes-devtools/gcc/gcc-11.2.inc
@@ -116,3 +116,13 @@ EXTRA_OECONF_PATHS = "\
     --with-sysroot=/not/exist \
     --with-build-sysroot=${STAGING_DIR_TARGET} \
 "
+
+# gcc triggers some warnings (format string security issues) because of
+# very low-level code. Those warnings are harmless (last checked in 11.2).
+# Let's make sure we don't error out on them so we can enable the extra
+# checks globally in OPTIMIZE_FOR=security mode.
+#
+# Since parts of gcc are built with -Werror, we have to remove even the
+# -W flags, not just -Werror=.
+#
+TARGET_CFLAGS_remove = "-Wformat-security -Werror=format-security -Wformat-nonliteral -Werror=format-nonliteral"
-- 
GitLab