Skip to content

Commit 815f21b

Browse files
luyahanRafaelGSS
authored andcommitted
tools: fix riscv64 build failed
PR-URL: #52888 Reviewed-By: Stewart X Addison <[email protected]> Reviewed-By: Richard Lau <[email protected]>
1 parent 728f7e0 commit 815f21b

File tree

1 file changed

+21
-4
lines changed

1 file changed

+21
-4
lines changed

tools/v8_gypfiles/v8.gyp

+21-4
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,12 @@
313313
'sources': [
314314
'<(V8_ROOT)/src/builtins/riscv/builtins-riscv.cc',
315315
],
316-
}],
316+
}],
317317
['v8_target_arch=="loong64" or v8_target_arch=="loong64"', {
318318
'sources': [
319319
'<(V8_ROOT)/src/builtins/loong64/builtins-loong64.cc',
320320
],
321-
}],
321+
}],
322322
['v8_target_arch=="mips64" or v8_target_arch=="mips64el"', {
323323
'sources': [
324324
'<(V8_ROOT)/src/builtins/mips64/builtins-mips64.cc',
@@ -1031,7 +1031,24 @@
10311031
'sources': [
10321032
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"riscv64\\".*?sources \\+= ")',
10331033
],
1034-
}],
1034+
'conditions': [
1035+
['v8_enable_webassembly==1', {
1036+
'conditions': [
1037+
['((_toolset=="host" and host_arch=="riscv64" or _toolset=="target" and target_arch=="riscv64") and (OS=="linux")) or ((_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64") and (OS=="linux"))', {
1038+
'sources': [
1039+
'<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc',
1040+
'<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',
1041+
],
1042+
}],
1043+
['(_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64") and (OS=="linux")', {
1044+
'sources': [
1045+
'<(V8_ROOT)/src/trap-handler/handler-outside-simulator.cc',
1046+
],
1047+
}],
1048+
],
1049+
}],
1050+
],
1051+
}],
10351052
['v8_target_arch=="loong64"', {
10361053
'sources': [
10371054
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_base_without_compiler.*?v8_enable_wasm_gdb_remote_debugging.*?v8_current_cpu == \\"loong64\\".*?sources \\+= ")',
@@ -1053,7 +1070,7 @@
10531070
],
10541071
}],
10551072
],
1056-
}],
1073+
}],
10571074
['OS=="win"', {
10581075
# This will prevent V8's .cc files conflicting with the inspector's
10591076
# .cpp files in the same shard.

0 commit comments

Comments
 (0)