From b23409aef2bf4fa265c425ce9037b4a7638fafe0 Mon Sep 17 00:00:00 2001 From: Bin Cao Date: Wed, 3 Jun 2026 10:04:29 +0800 Subject: [PATCH] nodejs: fix v8 -Wtemplate-body build error with GCC 15 on ia32 GCC 15 introduced -Wtemplate-body (enabled by default as an error) which performs stricter name lookup checking inside template bodies. In the Int64LoweringReducer template class (only compiled for 32-bit targets), the expression `__ Tuple(...)` is ambiguous in a dependent context because GCC cannot determine whether `Tuple` after the `__` macro expansion (`Asm().`) refers to a template member function or the struct type `Tuple`. Add the C++ `template` disambiguator keyword to tell the compiler that `Tuple` is a dependent template name. This is a minimal backport of commit 7772a2df9d0b4db9947dbb902b4aec33c35401c0. Signed-off-by: Bin Cao Signed-off-by: Khem Raj --- ...plate-body-error-with-GCC-15-on-ia32.patch | 52 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_24.16.0.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch b/meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch new file mode 100644 index 0000000000..4053f97053 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs-24/0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch @@ -0,0 +1,52 @@ +From 9f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a Mon Sep 17 00:00:00 2001 +From: Bin Cao +Date: Thu, 29 May 2026 12:00:00 +0800 +Subject: [PATCH] v8: fix -Wtemplate-body error with GCC 15 on ia32 + +GCC 15 introduced -Wtemplate-body (enabled by default as an error) which +performs stricter name lookup checking inside template bodies. In the +Int64LoweringReducer template class (only compiled for 32-bit targets), +the expression `__ Tuple(...)` is ambiguous in a +dependent context because GCC cannot determine whether `Tuple` after +the `__` macro expansion (`Asm().`) refers to a template member function +or the struct type `Tuple`. + +Add the C++ `template` disambiguator keyword to tell the compiler that +`Tuple` is a dependent template name. This is the standards-correct fix +and is backward-compatible with older GCC versions. + +This is a minimal backport of the fix already present in upstream V8 +(main branch), where the method was additionally renamed from `Tuple` to +`MakeTuple`. + +Upstream-Status: Backport [https://github.com/nodejs/node/commit/7772a2df9d0b4db9947dbb902b4aec33c35401c0] +Signed-off-by: Bin Cao +--- + .../turboshaft/int64-lowering-reducer.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h +index abcdef1..1234567 100644 +--- a/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h ++++ b/deps/v8/src/compiler/turboshaft/int64-lowering-reducer.h +@@ -637,7 +637,7 @@ class Int64LoweringReducer : public Next { + result = __ Word32CountLeadingZeros(high); + } + +- return __ Tuple(result, __ Word32Constant(0)); ++ return __ template Tuple(result, __ Word32Constant(0)); + } + + V LowerCtz(V input) { +@@ -650,7 +650,7 @@ class Int64LoweringReducer : public Next { + result = __ Word32CountTrailingZeros(low); + } + +- return __ Tuple(result, __ Word32Constant(0)); ++ return __ template Tuple(result, __ Word32Constant(0)); + } + + V LowerPopCount(V input) { +-- +2.43.0 + diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb index af12dd3c10..ff40a09656 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_24.16.0.bb @@ -29,6 +29,7 @@ SRC_URI = "https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0006-deps-disable-io_uring-support-in-libuv.patch \ file://0007-positional-args.patch \ file://0008-custom-env.patch \ + file://0010-v8-fix-Wtemplate-body-error-with-GCC-15-on-ia32.patch \ file://run-ptest \ " SRC_URI:append:class-target = " \