Skip to content

tools: fix loong64 build#51401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
nodejs-github-bot merged 1 commit into from
Jan 24, 2024
Merged

tools: fix loong64 build #51401

nodejs-github-bot merged 1 commit into from
Jan 24, 2024

Conversation

@shipujin
Copy link
Member

@shipujinshipujin commented Jan 8, 2024

tools: fix loong64 build

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 8, 2024

Review requested:

  • @nodejs/gyp
  • @nodejs/v8-update

@nodejs-github-botnodejs-github-bot added needs-ci PRs that need a full CI run. tools Issues and PRs related to the tools directory. v8 engine Issues and PRs related to the V8 dependency. labels Jan 8, 2024
@shipujinshipujin mentioned this pull request Jan 8, 2024
Closed
targos
targos requested changes Jan 8, 2024
View reviewed changes
Copy link
Member

@targostargos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another condition on line 972 should be enough.

@shipujin
Copy link
MemberAuthor

shipujin commented Jan 8, 2024

Another condition on line 972 should be enough.

Ok, what you said is right. I will modify patch and submit again

@shipujinshipujin requested a review from targosJanuary 9, 2024 11:11
@targos
Copy link
Member

targos commented Jan 9, 2024

I still think the patch could be simpler with only a change on line 972.

@shipujin
Copy link
MemberAuthor

shipujin commented Jan 9, 2024•
edited
Loading

line 972

I don't quite understand what you mean. Do you mean that only 972 can be modified?

diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 4d69a59fcb..79e1256fe8 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -969,7 +969,7 @@ 'conditions': [ ['v8_enable_webassembly==1',{'conditions': [ - ['((_toolset=="host" and host_arch=="arm64" or _toolset=="target" and target_arch=="arm64") and (OS=="linux" or OS=="mac" or OS=="ios")) or ((_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64") and (OS=="linux" or OS=="mac"))',{+ ['((_toolset=="host" and host_arch=="arm64" or _toolset=="target" and target_arch=="arm64") and (OS=="linux" or OS=="mac" or OS=="ios")) or ((_toolset=="host" and host_arch=="x64" or _toolset=="target" and target_arch=="x64") and (OS=="linux" or OS=="mac")) or ((_toolset=="host" and host_arch=="loong64" or _toolset=="target" and target_arch=="loong64") and (OS=="linux" or OS=="mac"))',{'sources': [ '<(V8_ROOT)/src/trap-handler/handler-inside-posix.cc', '<(V8_ROOT)/src/trap-handler/handler-outside-posix.cc',

Line 972 is in the range of v8_target_arch=="arm64". Modifying only line 972 will continue to report an error

Best regards

@targos
Copy link
Member

targos commented Jan 9, 2024

Oh, yes you're right, sorry about that! I guess you can still simplify it a bit by removing the various OS=="mac" and OS=="ios" conditions, but LGTM.

@shipujin
Copy link
MemberAuthor

shipujin commented Jan 9, 2024

Oh, yes you're right, sorry about that! I guess you can still simplify it a bit by removing the various OS=="mac" and OS=="ios" conditions, but LGTM.

You're right. I can remove the Mac-related stuff and simplify, I will resubmit.

Best regards

@shipujinshipujin requested a review from targosJanuary 10, 2024 04:38
@targostargos added the request-ci Add this label to start a Jenkins CI on a PR. label Jan 10, 2024
@github-actionsgithub-actionsbot removed the request-ci Add this label to start a Jenkins CI on a PR. label Jan 10, 2024
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 10, 2024

CI: https://ci.nodejs.org/job/node-test-pull-request/56724/

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 10, 2024

V8 CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/nodes=benchmark-ubuntu2204-intel-64,v8test=v8test/5761/

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 10, 2024

V8 CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/nodes=rhel8-s390x,v8test=v8test/5761/

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 10, 2024

V8 CI: https://ci.nodejs.org/job/node-test-commit-v8-linux/nodes=rhel8-ppc64le,v8test=v8test/5761/

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 11, 2024

CI: https://ci.nodejs.org/job/node-test-pull-request/56753/

@lpincalpinca added the commit-queue Add this label to land a pull request using GitHub Actions. label Jan 24, 2024
@nodejs-github-botnodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jan 24, 2024
@nodejs-github-botnodejs-github-bot merged commit 6ae20aa into nodejs:mainJan 24, 2024
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jan 24, 2024

Landed in 6ae20aa

marco-ippolito pushed a commit to marco-ippolito/node that referenced this pull request Feb 2, 2024
@marco-ippolito
tools: fix loong64 build
80ad1e4
PR-URL: nodejs#51401 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
rdw-msft pushed a commit to rdw-msft/node that referenced this pull request Feb 9, 2024
@rdw-msft
tools: fix loong64 build
3537451
PR-URL: nodejs#51401 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
targos pushed a commit that referenced this pull request Feb 15, 2024
@targos
tools: fix loong64 build
d8e1058
PR-URL: #51401 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
marco-ippolito pushed a commit to marco-ippolito/node that referenced this pull request Feb 19, 2024
@marco-ippolito
tools: fix loong64 build
73976a1
PR-URL: nodejs#51401 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
@marco-ippolitomarco-ippolito mentioned this pull request Mar 1, 2024
Merged
richardlau pushed a commit that referenced this pull request Mar 25, 2024
@richardlau
tools: fix loong64 build
ffa276c
PR-URL: #51401 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
richardlau pushed a commit that referenced this pull request Mar 25, 2024
@richardlau
tools: fix loong64 build
e02dbf0
PR-URL: #51401 Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
@richardlaurichardlau mentioned this pull request Mar 25, 2024
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lpincalpincalpinca approved these changes

@targostargostargos approved these changes

Assignees

No one assigned

Labels

needs-ciPRs that need a full CI run.toolsIssues and PRs related to the tools directory.v8 engineIssues and PRs related to the V8 dependency.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@shipujin@nodejs-github-bot@targos@lpinca