From 116c7e0e0e09797b7d49133da3acd81538042fee Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Fri, 8 Mar 2024 12:03:06 +0200 Subject: [PATCH] Enable riscv64 This is the 1st attempt. Signed-off-by: David Abdurachmanov --- java-21-openjdk.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 7b9f42a..3881174 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -100,24 +100,24 @@ # Set of architectures which support multiple ABIs %global multilib_arches %{power64} sparc64 x86_64 # Set of architectures for which we build slowdebug builds -%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x riscv64 # Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 +%global fastdebug_arches x86_64 ppc64le aarch64 riscv64 # Set of architectures with a Just-In-Time (JIT) compiler -%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 +%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 riscv64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches ppc s390 # Set of architectures which support SystemTap tapsets %global systemtap_arches %{jit_arches} # Set of architectures with a Ahead-Of-Time (AOT) compiler -%global aot_arches x86_64 %{aarch64} +%global aot_arches x86_64 %{aarch64} riscv64 # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} riscv64 # As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific # However, it does segfault on the Zero assembler port, so currently JIT only %global share_arches %{jit_arches} # Set of architectures for which we build the Shenandoah garbage collector -%global shenandoah_arches x86_64 %{aarch64} +%global shenandoah_arches x86_64 %{aarch64} riscv64 # Set of architectures for which we build the Z garbage collector %global zgc_arches x86_64 # Set of architectures for which alt-java has SSB mitigation @@ -127,7 +127,7 @@ # Set of architectures where we verify backtraces with gdb # s390x fails on RHEL 7 so we exclude it there %if (0%{?rhel} > 0 && 0%{?rhel} < 8) -%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches} +%global gdb_arches %{arm} %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 %{zero_arches} riscv64 %else %global gdb_arches %{jit_arches} %{zero_arches} %endif @@ -256,6 +256,10 @@ %global archinstall aarch64 %global stapinstall arm64 %endif +%ifarch risv64 +%global archinstall riscv64 +%global stapinstall riscv64 +%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -1253,7 +1257,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}.0.riscv64%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -2416,6 +2420,9 @@ cjc.mainProgram(args) %endif %changelog +* Fri Mar 08 2024 David Abdurachmanov - 1:21.0.2.0.13-2.0.riscv64 +- Add riscv64 + * Thu Feb 15 2024 Petra Alice Mikova - 1:21.0.2.0.13-2 - make this package system jdk - fix release issue introduced by automatic rebuild