Skip to content

Commit

Permalink
nodejs-22: (riscv64, backport) fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
MingcongBai committed Oct 30, 2024
1 parent cc5ebc6 commit 7130525
Showing 1 changed file with 44 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 1613ecb0010f4869d0a9944fcd34fb78bfdb0361 Mon Sep 17 00:00:00 2001
From: Lu Yahan <yahan@iscas.ac.cn>
Date: Wed, 8 May 2024 16:34:24 +0800
Subject: [PATCH] UPSTREAM: tools: fix riscv64 build failed

Fix build failure on riscv64 since v22.

Ref: https://github.com/nodejs/node/pull/52888
Ref: https://github.com/nodejs/node/issues/52678
---
tools/v8_gypfiles/v8.gyp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp
index c680132f80..f0d53831f5 100644
--- a/tools/v8_gypfiles/v8.gyp
+++ b/tools/v8_gypfiles/v8.gyp
@@ -1168,6 +1168,23 @@
'sources': [
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
],
+ 'conditions': [
+ ['v8_enable_webassembly==1', {
+ 'conditions': [
+ ['(_toolset=="host" and host_arch=="riscv64" or _toolset=="target" and target_arch=="riscv64") or (_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64")', {
+ 'sources': [
+ '<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc',
+ '<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
+ ],
+ }],
+ ['(_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64") and (OS=="linux")', {
+ 'sources': [
+ '<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
+ ],
+ }],
+ ],
+ }],
+ ],
}],
['v8_target_arch=="loong64"', {
'sources': [
--
2.47.0

0 comments on commit 7130525

Please sign in to comment.