Compare commits

..

No commits in common. "c9s" and "c10s" have entirely different histories.
c9s ... c10s

3 changed files with 425 additions and 440 deletions

View File

@ -1,7 +1,7 @@
# recipients: java-qa # recipients: java-qa
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-9 - rhel-10
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -126,7 +126,7 @@
# Set of architectures for which we build fastdebug builds # Set of architectures for which we build fastdebug builds
%global fastdebug_arches x86_64 ppc64le aarch64 %global fastdebug_arches x86_64 ppc64le aarch64
# Set of architectures with a Just-In-Time (JIT) compiler # 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) # Set of architectures which use the Zero assembler port (!jit_arches)
%global zero_arches ppc s390 %global zero_arches ppc s390
# Set of architectures which run a full bootstrap cycle # Set of architectures which run a full bootstrap cycle
@ -136,15 +136,15 @@
# Set of architectures with a Ahead-Of-Time (AOT) compiler # Set of architectures with a Ahead-Of-Time (AOT) compiler
%global aot_arches x86_64 %{aarch64} %global aot_arches x86_64 %{aarch64}
# Set of architectures which support the serviceability agent # 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
# Set of architectures which support class data sharing # Set of architectures which support class data sharing
# As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific # 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 # However, it does segfault on the Zero assembler port, so currently JIT only
%global share_arches %{jit_arches} %global share_arches %{jit_arches}
# Set of architectures for which we build the Shenandoah garbage collector # 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 # Set of architectures for which we build the Z garbage collector
%global zgc_arches x86_64 %global zgc_arches x86_64 riscv64
# Set of architectures for which alt-java has SSB mitigation # Set of architectures for which alt-java has SSB mitigation
%global ssbd_arches x86_64 %global ssbd_arches x86_64
# Set of architectures for which java has short vector math library (libjsvml.so) # Set of architectures for which java has short vector math library (libjsvml.so)
@ -161,7 +161,7 @@
# Set of architectures for which we have a devkit # Set of architectures for which we have a devkit
# Only used on RHEL # Only used on RHEL
%if 0%{?centos} == 0 %if 0%{?centos} == 0
%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64 %global devkit_arches %{aarch64} %{ppc64le} riscv64 s390x x86_64
%endif %endif
# By default, we build a slowdebug build during main build on JIT architectures # By default, we build a slowdebug build during main build on JIT architectures
@ -300,6 +300,10 @@
%global archinstall aarch64 %global archinstall aarch64
%global stapinstall arm64 %global stapinstall arm64
%endif %endif
%ifarch riscv64
%global archinstall riscv64
%global stapinstall %{_target_cpu}
%endif
# 32 bit sparc, optimized for v9 # 32 bit sparc, optimized for v9
%ifarch sparcv9 %ifarch sparcv9
%global archinstall sparc %global archinstall sparc
@ -390,7 +394,7 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 6 %global buildver 6
%global rpmrelease 2 %global rpmrelease 3
#%%global tagsuffix %%{nil} #%%global tagsuffix %%{nil}
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk %if %is_system_jdk
@ -540,7 +544,7 @@
%if 0%{?centos} == 0 %if 0%{?centos} == 0
ExclusiveArch: %{devkit_arches} ExclusiveArch: %{devkit_arches}
%else %else
ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
%endif %endif
Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}} Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}}
@ -1062,7 +1066,7 @@ export NUM_PROC=${NUM_PROC:-1}
%endif %endif
export XZ_OPT="-T0" export XZ_OPT="-T0"
%ifarch s390x sparc64 alpha %{power64} %{aarch64} %ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
export ARCH_DATA_MODEL=64 export ARCH_DATA_MODEL=64
%endif %endif
%ifarch alpha %ifarch alpha
@ -1939,6 +1943,14 @@ done
%endif %endif
%changelog %changelog
* Fri Jul 04 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-3
- Move riscv64 addition to ExclusiveArch to devkit_arches on RHEL
- Related: OPENJDK-3850
* Tue May 20 2025 Kashyap Chamarthy <kchamart@redhat.com> - 1:21.0.7.0.6-3
- Enable riscv64 arch; thanks: Songsong Zhang <U2FsdGVkX1@gmail.com>
- Resolves: OPENJDK-3850
* Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2 * Thu May 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.7.0.6-2
- Add local version of JDK-8351500 for early interim release before 21.0.8 - Add local version of JDK-8351500 for early interim release before 21.0.8
- Resolves: OPENJDK-3679 - Resolves: OPENJDK-3679

File diff suppressed because it is too large Load Diff