From ff86e29deb6c9d1f0205cea18da0e82aebe49dc2 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 17 Nov 2023 00:31:08 +0000 Subject: [PATCH] riscv64: Use JDK21 to bootstrap JDK21 Signed-off-by: Stewart X Addison --- build-farm/make-adopt-build-farm.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-farm/make-adopt-build-farm.sh b/build-farm/make-adopt-build-farm.sh index 4d8f2e1a4..bd406bf23 100755 --- a/build-farm/make-adopt-build-farm.sh +++ b/build-farm/make-adopt-build-farm.sh @@ -147,6 +147,10 @@ then # To support reproducible-builds the jar/jmod --date option is required # which is only available in jdk-17 and from jdk-19 so we cannot bootstrap with JDK16 JDK_BOOT_VERSION="17" + elif [ "${JAVA_FEATURE_VERSION}" == "21" ] && [ "${ARCHITECTURE}" == "riscv64" ]; then + # JDK20 has issues. No RVV fix for C910/C920 systems and + # does not run well in in docker containers + JDK_BOOT_VERSION="21" elif [ "${JAVA_FEATURE_VERSION}" == "19" ]; then JDK_BOOT_VERSION="19" fi