Skip to content

Add hsdis support into the build for JDK24+ #3414

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

Draft
sxa wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Add hsdis support into the build for JDK24+ #3414

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a681a01
Configure JDK24+ on Linux with hsdis capstone support
sxa Jun 30, 2023
99efea9
Move capstone detection and configargs back to linux.sh
sxa Oct 5, 2023
9a4ecb7
Shut up linter
sxa Oct 5, 2023
58c4fab
Adjust hsdis support to be JDK24+ instead of 20+
sxa Dec 16, 2024
6cb92f5
Remove erroneous call
sxa Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions build-farm/platform-specific-configurations/linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,15 @@ else
fi
fi

if [ "$JAVA_FEATURE_VERSION" -ge 24 ] && [ "${VARIANT}" == "${BUILD_VARIANT_TEMURIN}" ]; then
# hsdis+capstone only supported on these two in openjdk
if [ "${ARCHITECTURE}" = "x64" ] || [ "${ARCHITECTURE}" = "aarch64" ]; then
if [ -r /usr/local/lib/libcapstone.so.4 ]; then
export CONFIGURE_ARGS_FOR_ANY_PLATFORM="${CONFIGURE_ARGS_FOR_ANY_PLATFORM} --enable-hsdis-bundling --with-hsdis=capstone --with-capstone=/usr/local"
fi
fi
fi

if [ "${VARIANT}" == "${BUILD_VARIANT_BISHENG}" ]; then
# BUILD_C/CXX required for native (non-cross) RISC-V builds of Bisheng
if [ -n "$CXX" ]; then
Expand Down
Loading