packages/openjdk-11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Init riscv64 support

Browse Source
This commit is contained in:
misaka00251 2023-08-17 15:33:02 +08:00
parent 3736cf9cac
commit 7e448acd64
No known key found for this signature in database
GPG Key ID: 4AA100DC964EDE26
2 changed files with 61110 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61086
2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch Normal file
View File

File diff suppressed because it is too large Load Diff

26
openjdk-11.spec
View File

@ -54,6 +54,7 @@
%endif
%global aarch64 aarch64
%global riscv64 riscv64
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@ -109,6 +110,9 @@
%ifarch %{aarch64}
%global archinstall aarch64
%endif
%ifarch %{riscv64}
%global archinstall riscv64
%endif
%global with_systemtap 1
@ -284,7 +288,9 @@ ext=.gz
alternatives \\
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
%ifarch %{aarch64} x86_64
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
%endif
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
@ -555,7 +561,9 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
%ifarch %{aarch64} x86_64
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/include
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ct.sym
%if %{with_systemtap}
@ -740,7 +748,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: 1
Release: 2
# 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
@ -878,6 +886,13 @@ Patch90: fix_Internal_and_external_code_inconsistency.patch
# 11.0.18
Patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch
############################################
#
# riscv64 specific patches
#
############################################
Patch2000: 2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch
BuildRequires: elfutils-extra
BuildRequires: autoconf
BuildRequires: alsa-lib-devel
@ -1109,6 +1124,9 @@ fi
pushd %{top_level_dir_name}
# OpenJDK patches
%ifarch riscv64
%patch2000 -p1
%else
%patch5 -p1
%patch6 -p1
%patch7 -p1
@ -1168,6 +1186,7 @@ pushd %{top_level_dir_name}
%patch89 -p1
%patch90 -p1
%patch91 -p1
%endif
popd # openjdk
# %patch1000
@ -1228,7 +1247,7 @@ export NUM_PROC=${NUM_PROC:-1}
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
%endif
%ifarch %{aarch64}
%ifarch %{aarch64} riscv64
export ARCH_DATA_MODEL=64
%endif
@ -1677,6 +1696,9 @@ cjc.mainProgram(arg)
%changelog
* Thu Aug 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:11.0.20.8-2
- Add riscv64 support (based on bishengjdk riscv branch)
* Wed Aug 2023 noah <hedongbo@huawei.com> - 1:11.0.20.8-1
- fix CPUBench kmeans random fails