mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-04-21 03:58:58 +00:00
7eaa6ae23a
A recent change in oe-core [1] to glibc 2.43 has introduced a build error with 6.12 kernels. Backport a patch [2] from linux-stable to address this. [1] https://git.openembedded.org/openembedded-core/commit/?id=f791d6c52870f3571e740ff7818d45bb0a717934 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=3dedeeecd1ae42a751721d83dc21877122cc1795 Signed-off-by: Ryan Eatmon <reatmon@ti.com>
61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
From 3dedeeecd1ae42a751721d83dc21877122cc1795 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
|
|
Date: Sat, 6 Dec 2025 14:28:25 +0500
|
|
Subject: libbpf: Fix -Wdiscarded-qualifiers under C23
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
commit d70f79fef65810faf64dbae1f3a1b5623cdb2345 upstream.
|
|
|
|
glibc ≥ 2.42 (GCC 15) defaults to -std=gnu23, which promotes
|
|
-Wdiscarded-qualifiers to an error.
|
|
|
|
In C23, strstr() and strchr() return "const char *".
|
|
|
|
Change variable types to const char * where the pointers are never
|
|
modified (res, sym_sfx, next_path).
|
|
|
|
Suggested-by: Florian Weimer <fweimer@redhat.com>
|
|
Suggested-by: Andrii Nakryiko <andrii@kernel.org>
|
|
Signed-off-by: Mikhail Gavrilov <mikhail.v.gavrilov@gmail.com>
|
|
Link: https://lore.kernel.org/r/20251206092825.1471385-1-mikhail.v.gavrilov@gmail.com
|
|
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
[ shung-hsi.yu: needed to fix kernel build failure due to libbpf since glibc
|
|
2.43+ (which adds 'const' qualifier to strstr). 'sym_sfx' hunk dropped because
|
|
commit f8a05692de06 ("libbpf: Work around kernel inconsistently stripping
|
|
'.llvm.' suffix") is not present. ]
|
|
Signed-off-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
|
|
Upstream-Status: Backport
|
|
---
|
|
tools/lib/bpf/libbpf.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
|
|
index 060aecf60b76b1..7d496f0a9a30d1 100644
|
|
--- a/tools/lib/bpf/libbpf.c
|
|
+++ b/tools/lib/bpf/libbpf.c
|
|
@@ -8174,7 +8174,7 @@ static int kallsyms_cb(unsigned long long sym_addr, char sym_type,
|
|
struct bpf_object *obj = ctx;
|
|
const struct btf_type *t;
|
|
struct extern_desc *ext;
|
|
- char *res;
|
|
+ const char *res;
|
|
|
|
res = strstr(sym_name, ".llvm.");
|
|
if (sym_type == 'd' && res)
|
|
@@ -11959,7 +11959,7 @@ static int resolve_full_path(const char *file, char *result, size_t result_sz)
|
|
if (!search_paths[i])
|
|
continue;
|
|
for (s = search_paths[i]; s != NULL; s = strchr(s, ':')) {
|
|
- char *next_path;
|
|
+ const char *next_path;
|
|
int seg_len;
|
|
|
|
if (s[0] == ':')
|
|
--
|
|
cgit 1.2.3-korg
|
|
|