1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00

elfutils: Fix build with gcc trunk

Fixes a build issue seen with latest gcc trunk.

Fixes
| ../../elfutils-0.189/tests/elfstrmerge.c: In function 'main':
| ../../elfutils-0.189/tests/elfstrmerge.c:450:32: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
|   450 |   newscnbufs = calloc (sizeof (void *), newshnums);
|       |                                ^~~~
| ../../elfutils-0.189/tests/elfstrmerge.c:450:32: note: earlier argument should specify number of elements, later size of each element
| cc1: all warnings being treated as errors

(From OE-Core rev: 3817ac3130e8858b3445872ff74b39c21969822a)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2024-01-25 23:21:05 -08:00
committed by Richard Purdie
parent 4cb6ff8a57
commit bcbb155635
2 changed files with 40 additions and 0 deletions
@@ -22,6 +22,7 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
file://ptest.patch \
file://0001-tests-Makefile.am-compile-test_nlist-with-standard-C.patch \
file://0001-Add-helper-function-for-basename.patch \
file://0001-tests-fix-build-against-upcoming-gcc-14-Werror-callo.patch \
"
SRC_URI:append:libc-musl = " \
file://0003-musl-utils.patch \
@@ -0,0 +1,39 @@
From 901c6a8c78c3c4eee244b9d5298cbd7b9aa713d1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 21 Dec 2023 09:23:30 +0000
Subject: [PATCH] tests: fix build against upcoming `gcc-14`
(`-Werror=calloc-transposed-args`)
`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
detected minor infelicity in `calloc()` API usage in `elfutils`:
elfstrmerge.c: In function 'main':
elfstrmerge.c:450:32: error:
'calloc' sizes specified with 'sizeof' in the earlier argument and not in the later argument [-Werror=calloc-transposed-args]
450 | newscnbufs = calloc (sizeof (void *), newshnums);
| ^~~~
elfstrmerge.c:450:32: note: earlier argument should specify number of elements, later size of each element
Upstream-Status: Backport [https://sourceware.org/git/?p=elfutils.git;a=commit;h=ae580d48278b9924da7503886b37be34378e1b04]
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
tests/elfstrmerge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
index 56350bb..4eb58bb 100644
--- a/tests/elfstrmerge.c
+++ b/tests/elfstrmerge.c
@@ -447,7 +447,7 @@ main (int argc, char **argv)
}
newshnums = shdrnum - 1;
- newscnbufs = calloc (sizeof (void *), newshnums);
+ newscnbufs = calloc (newshnums, sizeof (void *));
if (newscnbufs == NULL)
fail_errno ("Couldn't allocate memory for new section buffers", NULL);
--
2.43.0