summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens2026-02-15 15:45:38 +0000
committerHauke Mehrtens2026-02-17 00:47:35 +0000
commiteddb6342cd4a4470b489a9c9c39893be37440511 (patch)
tree81603b861fcd7d8fda5037df51169eb7e0e717d7
parentba34bdca3da7fe21b0f8dc051300abcf9c8aea5f (diff)
downloadopenwrt-eddb6342cd4a4470b489a9c9c39893be37440511.tar.gz
fortify-headers: fix -Werror=format-nonliteral in fortify/stdio.h
Some applications might activate -Werror=format-nonliteral when building their application. This breaks fortify headers build. Tell GCC to ignore such warnings for this code. This fixes the libubox and ucode build: ``` /include/fortify/stdio.h: In function 'snprintf': /include/fortify/stdio.h:101:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] 101 | return __orig_snprintf(__s, __n, __f, __builtin_va_arg_pack()); | ^~~~~~ /include/fortify/stdio.h: In function 'sprintf': /include/fortify/stdio.h:110:17: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] 110 | __r = __orig_snprintf(__s, __b, __f, __builtin_va_arg_pack()); | ^~~ /include/fortify/stdio.h:114:17: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] 114 | __r = __orig_sprintf(__s, __f, __builtin_va_arg_pack()); | ^~~ cc1: all warnings being treated as errors ninja: build stopped: subcommand failed. ``` Link: https://github.com/openwrt/openwrt/pull/22042 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit b23726664090098acb9318caf41f7d6961cd1074)
-rw-r--r--toolchain/fortify-headers/patches/003-stdio.h-ignore-Wformat-nonliteral-in-snprintf-and-sp.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/toolchain/fortify-headers/patches/003-stdio.h-ignore-Wformat-nonliteral-in-snprintf-and-sp.patch b/toolchain/fortify-headers/patches/003-stdio.h-ignore-Wformat-nonliteral-in-snprintf-and-sp.patch
new file mode 100644
index 0000000000..7af51d360d
--- /dev/null
+++ b/toolchain/fortify-headers/patches/003-stdio.h-ignore-Wformat-nonliteral-in-snprintf-and-sp.patch
@@ -0,0 +1,61 @@
+From 793d85b802e8b1a179134056894249c5a0270c72 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 15 Feb 2026 19:03:50 +0100
+Subject: stdio.h: ignore -Wformat-nonliteral in snprintf and sprintf
+
+Some applications might activate -Werror=format-nonliteral when building
+their application. This breaks fortify headers build. Tell GCC to ignore
+such warnings for this code.
+
+This fixes the libubox and ucode build:
+```
+/include/fortify/stdio.h: In function 'snprintf':
+/include/fortify/stdio.h:101:9: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
+ 101 | return __orig_snprintf(__s, __n, __f, __builtin_va_arg_pack());
+ | ^~~~~~
+/include/fortify/stdio.h: In function 'sprintf':
+/include/fortify/stdio.h:110:17: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
+ 110 | __r = __orig_snprintf(__s, __b, __f, __builtin_va_arg_pack());
+ | ^~~
+/include/fortify/stdio.h:114:17: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
+ 114 | __r = __orig_sprintf(__s, __f, __builtin_va_arg_pack());
+ | ^~~
+cc1: all warnings being treated as errors
+ninja: build stopped: subcommand failed.
+```
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ include/stdio.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/include/stdio.h
++++ b/include/stdio.h
+@@ -98,7 +98,10 @@ _FORTIFY_FN(snprintf) int snprintf(char
+
+ if (__n > __b)
+ __builtin_trap();
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ return __orig_snprintf(__s, __n, __f, __builtin_va_arg_pack());
++#pragma GCC diagnostic pop
+ }
+
+ _FORTIFY_FN(sprintf) int sprintf(char *__s, const char *__f, ...)
+@@ -106,6 +109,8 @@ _FORTIFY_FN(sprintf) int sprintf(char *_
+ size_t __b = __builtin_object_size(__s, 0);
+ int __r;
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ if (__b != (size_t)-1) {
+ __r = __orig_snprintf(__s, __b, __f, __builtin_va_arg_pack());
+ if (__r != -1 && (size_t)__r >= __b)
+@@ -114,6 +119,7 @@ _FORTIFY_FN(sprintf) int sprintf(char *_
+ __r = __orig_sprintf(__s, __f, __builtin_va_arg_pack());
+ }
+ return __r;
++#pragma GCC diagnostic pop
+ }
+
+ #ifdef __cplusplus