From f0b69f7b3253492f4daf0fbe9dca8ab444041f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20Lothor=C3=A9?= Date: Mon, 16 Feb 2026 15:26:33 +0100 Subject: [PATCH] package/dtc: fix host build with glibc 2.43 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When trying to build host-dtc on a host with glibc 2.43, the build fails on the following error: libfdt/fdt_overlay.c: In function ‘overlay_fixup_phandle’: libfdt/fdt_overlay.c:424:21: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 424 | sep = memchr(fixup_str, ':', fixup_len); | ^ libfdt/fdt_overlay.c:434:21: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 434 | sep = memchr(name, ':', fixup_len); | ^ fdtput.c: In function ‘create_node’: fdtput.c:235:11: error: assignment discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 235 | p = strrchr(node_name, '/'); | ^ cc1: all warnings being treated as errors make[2]: *** [Makefile:359: fdtput.o] Error 1 make[2]: *** Waiting for unfinished jobs.... cc1: all warnings being treated as errors make[2]: *** [Makefile:359: libfdt/fdt_overlay.o] Error 1 make[1]: *** [package/pkg-generic.mk:273: /home/alexis/src/buildroot/dtc/build/host-dtc-1.7.2/.stamp_built] Error 2 make: *** [Makefile:83: _all] Error 2 The issue can be reproduced on master with this minimal defconfig on a host having glibc 2.43: BR2_x86_64=y BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_QORIQ_MC_UTILS=y (QORIQ_MC_UTILS will pull HOST_DTC) This error is due to some functions prototype update in glibc 2.43 for ISO C23 (see [1], point 3 in the NEWS list). The corresponding fix has already been integrated upstream, but it has not been released since then. Bring the corresponding upstream patch to allow host-dtc to build on affected hosts. [1] https://lists.gnu.org/archive/html/info-gnu/2026-01/msg00005.html Signed-off-by: Alexis Lothoré Signed-off-by: Julien Olivain (cherry picked from commit 3b52fe6f2e0feb72e745991a1ad4645ffdc55713) Signed-off-by: Thomas Perale --- .../0002-fix-discarded-const-qualifiers.patch | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 package/dtc/0002-fix-discarded-const-qualifiers.patch diff --git a/package/dtc/0002-fix-discarded-const-qualifiers.patch b/package/dtc/0002-fix-discarded-const-qualifiers.patch new file mode 100644 index 0000000000..95db886389 --- /dev/null +++ b/package/dtc/0002-fix-discarded-const-qualifiers.patch @@ -0,0 +1,88 @@ +From 9a1c801a1a3c102bf95c5339c9e985b26b823a21 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Tue, 6 Jan 2026 14:19:30 -0500 +Subject: Fix discarded const qualifiers + +It's unsafe to implicitly discard the const qualifier on a pointer. In +overlay_fixup_phandle(), this was probably just an oversight, and making +the "sep" variable a const char * is sufficient to fix it. + +In create_node(), however, the "p" variable is directly modifying the +buffer pointed to by "const char* node_name". To fix this, we need to +actually make a duplicate of the buffer and operate on that instead. + +This introduces a malloc()/free() and an unbounded strdup() into the +operation, but fdtput isn't a long-running service and the node_name +argument comes directly from argv, so this shouldn't introduce a +significant performance impact. + +Signed-off-by: Stephen Gallagher +Signed-off-by: David Gibson +Upstream: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=9a1c801a1a3c102bf95c5339c9e985b26b823a21 +Signed-off-by: Alexis Lothoré + +--- + fdtput.c | 8 +++++--- + libfdt/fdt_overlay.c | 3 ++- + meson.build | 1 + + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/fdtput.c b/fdtput.c +index 05f2b93..fdb581a 100644 +--- a/fdtput.c ++++ b/fdtput.c +@@ -254,19 +254,21 @@ static int create_paths(char **blob, const char *in_path) + static int create_node(char **blob, const char *node_name) + { + int node = 0; +- char *p; ++ const char *p; ++ char *path = NULL; + + p = strrchr(node_name, '/'); + if (!p) { + report_error(node_name, -1, -FDT_ERR_BADPATH); + return -1; + } +- *p = '\0'; + + *blob = realloc_node(*blob, p + 1); + + if (p > node_name) { +- node = fdt_path_offset(*blob, node_name); ++ path = xstrndup(node_name, (size_t)(p - node_name)); ++ node = fdt_path_offset(*blob, path); ++ free(path); + if (node < 0) { + report_error(node_name, -1, node); + return -1; +diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c +index e6b9eb6..51a3859 100644 +--- a/libfdt/fdt_overlay.c ++++ b/libfdt/fdt_overlay.c +@@ -407,7 +407,8 @@ static int overlay_fixup_phandle(void *fdt, void *fdto, int symbols_off, + const char *fixup_str = value; + uint32_t path_len, name_len; + uint32_t fixup_len; +- char *sep, *endptr; ++ const char *sep; ++ char *endptr; + int poffset, ret; + + fixup_end = memchr(value, '\0', len); +diff --git a/meson.build b/meson.build +index 66b44e8..501b706 100644 +--- a/meson.build ++++ b/meson.build +@@ -18,6 +18,7 @@ add_project_arguments( + '-Wshadow', + '-Wsuggest-attribute=format', + '-Wwrite-strings', ++ '-Wdiscarded-qualifiers', + ]), + language: 'c' + ) +-- +cgit 1.2.3-korg + +