Skip to content

Add hsdis support into the build for JDK24+#3414

Draft
sxa wants to merge 5 commits into
adoptium:masterfrom
sxa:linux_capstone
Draft

Add hsdis support into the build for JDK24+#3414
sxa wants to merge 5 commits into
adoptium:masterfrom
sxa:linux_capstone

Conversation

@sxa
Copy link
Copy Markdown
Member

@sxa sxa commented Jun 30, 2023 •
edited
Loading

Partial implementation of adoptium/adoptium#213 - limited to Linux only.

@sxa sxa self-assigned this Jun 30, 2023
@github-actions github-actions Bot added the macos Issues that affect or relate to the MAC OS label Jun 30, 2023
@sxa sxa force-pushed the linux_capstone branch from 6bc070b to 3243300 Compare July 6, 2023 10:08
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Jul 6, 2023
@sxa sxa force-pushed the linux_capstone branch from 3243300 to 0d62c1e Compare July 6, 2023 10:14
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Jul 6, 2023
@sxa sxa force-pushed the linux_capstone branch from 0d62c1e to 1613361 Compare July 6, 2023 11:02
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Jul 6, 2023
@sxa sxa force-pushed the linux_capstone branch from 1613361 to 87c99b1 Compare July 6, 2023 11:05
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Jul 6, 2023
@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 5, 2023 •
edited
Loading

I'm torn about this PR. I really don't like having the --with-capstone in the build.sh since it's a location that's specific to where we are installing it on our machines from the playbooks (So ideally the logic should all be in linux.sh). 🤔

@sxa sxa mentioned this pull request Oct 5, 2023
Merged
2 tasks
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 5, 2023
@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 5, 2023

I really don't like having the --with-capstone in the build.sh

Now leaning towards only having it in a if variant=temurin block, although realistically it should probably be a parameter to makejdk-any-platform.sh ...

@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 5, 2023
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 5, 2023
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 5, 2023
@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 5, 2023

As a first pass this has been modified to put it all in linux.sh and gate it on Temurin and Linux/aaarch64 or Linux/x64 for JDK20+

@sxa sxa mentioned this pull request Oct 5, 2023
Open
@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 5, 2023

We should probably add a smoke test for this, but it can be done in a future PR.

@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 5, 2023
@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 6, 2023
andrew-m-leonard
andrew-m-leonard approved these changes Oct 6, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@andrew-m-leonard andrew-m-leonard left a comment

Choose a reason for hiding this comment

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

lgtm

@sxa sxa marked this pull request as ready for review October 10, 2023 10:40
@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 10, 2023

Playbook changes merged and docker images rebuild successfully so this is ready to go subject to approvals.

@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 10, 2023

(Last force push was for a rebase)

@github-actions github-actions Bot added macos Issues that affect or relate to the MAC OS and removed macos Issues that affect or relate to the MAC OS labels Oct 10, 2023
@sxa sxa marked this pull request as draft October 12, 2023 09:32
@sxa
Copy link
Copy Markdown
Member Author

sxa commented Oct 12, 2023

Knocking back to draft following this week's PMC meeting where a decision was made not to include this yet pending further understanding of whether it is really useful for a normal build.

@sxa sxa changed the title Add hsdis support into the build for JDK20+ Add hsdis support into the build for JDK24+ Dec 16, 2024
sxa added 4 commits December 17, 2024 17:31
@sxa
Configure JDK24+ on Linux with hsdis capstone support
a681a01
@sxa
Move capstone detection and configargs back to linux.sh
99efea9 
Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa
Shut up linter
9a4ecb7 
Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa
Adjust hsdis support to be JDK24+ instead of 20+
58c4fab 
Signed-off-by: Stewart X Addison <sxa@redhat.com>
@sxa
Remove erroneous call
6cb92f5 
Signed-off-by: Stewart X Addison <sxa@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@karianna karianna karianna approved these changes

@andrew-m-leonard andrew-m-leonard andrew-m-leonard approved these changes

Assignees

@sxa sxa

Labels

macos Issues that affect or relate to the MAC OS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sxa @karianna @andrew-m-leonard