android-tools: add fix for strchr() conformance to C23

Building android-tools v29.0.6.r14 with glibc 2.43 fails due to ISO C23
changes to strchr(). Add a patch to update the affected libunwind sources
to use const pointer types to fix this build failure.

Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Viswanath Kraleti 2026-03-14 17:47:49 +05:30 committed by Khem Raj
parent c40a15d924
commit 9f5c6b28e3
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,27 @@
From d91f5324f809c3a5b0343927716e4b99bc31db53 Mon Sep 17 00:00:00 2001
From: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
Date: Fri, 13 Mar 2026 18:57:36 +0530
Subject: [PATCH] libunwind: fix strchr() conformance to ISO C23
Fix uses of strchr() to conform to ISO C23, supported since glibc-2.43
Signed-off-by: Viswanath Kraleti <viswanath.kraleti@oss.qualcomm.com>
Upstream-Status: Pending
---
external/libunwind/src/dwarf/Gfind_proc_info-lsb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c b/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c
index 77ed3d09..37eadf52 100644
--- a/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c
+++ b/external/libunwind/src/dwarf/Gfind_proc_info-lsb.c
@@ -248,7 +248,8 @@ load_debug_frame (const char *file, char **buf, size_t *bufsize,
if (*buf == NULL && linkbuf != NULL && memchr (linkbuf, 0, linksize) != NULL)
{
- char *newname, *basedir, *p;
+ char *newname, *basedir;
+ const char *p;
static const char *debugdir = "/usr/lib/debug";
int ret;

View File

@ -22,6 +22,7 @@ SRC_URI += " \
file://debian/external/libunwind/legacy_built-in_sync_functions.patch \
file://debian/external/libunwind/20150704-CVE-2015-3239_dwarf_i.h.patch \
file://debian/external/libunwind/libunwind-guard-unreachable-macro-to-avoid-redefinit.patch \
file://debian/external/libunwind/libunwind-fix-strchr-conformance-to-ISO-C23.patch \
\
file://debian/system/core/move-log-file-to-proper-dir.patch \
file://debian/system/core/Added-missing-headers.patch \