From: martin.jansa@gmail.com
To: openembedded-core@lists.openembedded.org
Cc: Martin Jansa <martin.jansa@gmail.com>
Subject: [whinlatter][PATCH 9/9] binutils: backport patch to fix build with glibc-2.43 on host
Date: Thu, 9 Apr 2026 17:28:28 +0200 [thread overview]
Message-ID: <20260409152839.2894434-9-martin.jansa@gmail.com> (raw)
In-Reply-To: <20260409152839.2894434-1-martin.jansa@gmail.com>
From: Martin Jansa <martin.jansa@gmail.com>
Fixes:
../../../gprofng/libcollector/linetrace.c: In function ‘__collector_ext_line_install’:
../../../gprofng/libcollector/linetrace.c:219:45: error: expected identifier before ‘_Generic’
219 | if (java_follow_env != NULL && CALL_UTIL (strstr)(java_follow_env, COLLECTOR_JVMTI_OPTION))
| ^~~~~~
../../../gprofng/libcollector/linetrace.c:219:34: note: in expansion of macro ‘CALL_UTIL’
219 | if (java_follow_env != NULL && CALL_UTIL (strstr)(java_follow_env, COLLECTOR_JVMTI_OPTION))
| ^~~~~~~~~
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
---
.../binutils/binutils-2.45.inc | 1 +
...tect-against-standard-library-macros.patch | 31 +++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 meta/recipes-devtools/binutils/binutils/0022-gprofng-protect-against-standard-library-macros.patch
diff --git a/meta/recipes-devtools/binutils/binutils-2.45.inc b/meta/recipes-devtools/binutils/binutils-2.45.inc
index 16a63cabc5..f5456c0b0f 100644
--- a/meta/recipes-devtools/binutils/binutils-2.45.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.45.inc
@@ -39,6 +39,7 @@ SRC_URI = "\
file://0015-CVE-2025-11081.patch \
file://0016-CVE-2025-11082.patch \
file://0017-CVE-2025-11083.patch \
+ file://0022-gprofng-protect-against-standard-library-macros.patch \
file://CVE-2025-11414.patch \
file://CVE-2025-11412.patch \
file://CVE-2025-11413.patch \
diff --git a/meta/recipes-devtools/binutils/binutils/0022-gprofng-protect-against-standard-library-macros.patch b/meta/recipes-devtools/binutils/binutils/0022-gprofng-protect-against-standard-library-macros.patch
new file mode 100644
index 0000000000..0fa0a93991
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils/0022-gprofng-protect-against-standard-library-macros.patch
@@ -0,0 +1,31 @@
+From 5f66aee7f4bec7a2d8378034116f5e5c3dc50f41 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Sat, 22 Nov 2025 11:29:43 +0100
+Subject: [PATCH] gprofng: protect against standard library macros
+
+The CALL_UTIL macro can expand to an unparsable expression of the argument
+is a macro, like with the new const-preserving standard library macros in
+C23.
+
+ * gprofng/src/collector_module.h (CALL_UTIL): Add parens to not
+ expand its argument if it is a function-like macro.
+
+Upstream-Status: Backport [2.46 5f66aee7f4bec7a2d8378034116f5e5c3dc50f41]
+Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
+---
+ gprofng/src/collector_module.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gprofng/src/collector_module.h b/gprofng/src/collector_module.h
+index b64d69c45ab..859a6dd1f7d 100644
+--- a/gprofng/src/collector_module.h
++++ b/gprofng/src/collector_module.h
+@@ -119,7 +119,7 @@ typedef struct CollectorUtilFuncs
+ extern CollectorUtilFuncs __collector_util_funcs;
+ extern int __collector_dlsym_guard;
+
+-#define CALL_UTIL(x) __collector_util_funcs.x
++#define CALL_UTIL(x) (__collector_util_funcs.x)
+
+ /* The following constants define the meaning of the "void *arg"
+ * argument of getFrameInfo().
next prev parent reply other threads:[~2026-04-09 15:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-09 15:28 [whinlatter][PATCH 1/9] dtc: backport fix for build with glibc-2.43 martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 2/9] pseudo: Add fix for glibc 2.43 martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 3/9] yocto-uninative: Update to 5.1 " martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 4/9] m4: backport 3 gnulib changes to fix build with glibc-2.43 on host martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 5/9] gettext: backport " martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 6/9] util-linux: backport fix to " martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 7/9] systemd: " martin.jansa
2026-04-09 15:28 ` [whinlatter][PATCH 8/9] gcc: backport a fix for building with gcc-16 martin.jansa
2026-04-09 15:28 ` martin.jansa [this message]
2026-04-09 19:17 ` [OE-core] [whinlatter][PATCH 1/9] dtc: backport fix for build with glibc-2.43 Yoann Congal
2026-04-09 21:29 ` Martin Jansa
2026-04-10 7:41 ` Yoann Congal
2026-04-10 9:09 ` Martin Jansa
2026-04-10 9:28 ` Yoann Congal
2026-04-10 9:39 ` Martin Jansa
2026-04-10 9:44 ` Yoann Congal
2026-04-10 10:09 ` Martin Jansa
2026-04-10 9:19 ` Yoann Congal
[not found] ` <18A4CD91CED0CFD1.657799@lists.openembedded.org>
2026-04-10 6:14 ` Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260409152839.2894434-9-martin.jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox