!290 Init support of LoongArch64

From: @lzhai 
Reviewed-by: @kuenking111 
Signed-off-by: @kuenking111
This commit is contained in:
openeuler-ci-bot 2024-02-20 08:30:07 +00:00 committed by Gitee
commit 33ad41bba8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 116398 additions and 1 deletions

116372
LoongArch64-support.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -110,6 +110,9 @@
%ifarch %{aarch64} %ifarch %{aarch64}
%global archinstall aarch64 %global archinstall aarch64
%endif %endif
%ifarch loongarch64
%global archinstall loongarch64
%endif
%ifarch %{riscv64} %ifarch %{riscv64}
%global archinstall riscv64 %global archinstall riscv64
%endif %endif
@ -561,9 +564,11 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic %{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver %{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
%ifnarch loongarch64
%ifarch %{aarch64} x86_64 %ifarch %{aarch64} x86_64
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc %{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
%endif %endif
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/include %{_jvmdir}/%{sdkdir -- %{?1}}/include
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ct.sym %{_jvmdir}/%{sdkdir -- %{?1}}/lib/ct.sym
%if %{with_systemtap} %if %{with_systemtap}
@ -748,7 +753,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver} Version: %{newjavaver}.%{buildver}
Release: 0 Release: 1
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -803,6 +808,14 @@ Source11: nss.cfg.in
# due to memory leak). # due to memory leak).
Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
############################################
#
# LoongArch64 specific patches
#
############################################
Patch2001: LoongArch64-support.patch
############################################# #############################################
# #
# OpenJDK specific patches # OpenJDK specific patches
@ -1126,6 +1139,7 @@ fi
pushd %{top_level_dir_name} pushd %{top_level_dir_name}
# OpenJDK patches # OpenJDK patches
%ifnarch loongarch64
%ifarch riscv64 %ifarch riscv64
%patch2000 -p1 %patch2000 -p1
%else %else
@ -1190,6 +1204,10 @@ pushd %{top_level_dir_name}
%patch91 -p1 %patch91 -p1
%patch92 -p1 %patch92 -p1
%endif %endif
%endif
%ifarch loongarch64
%patch2001 -p1
%endif
popd # openjdk popd # openjdk
# %patch1000 # %patch1000
@ -1280,8 +1298,10 @@ bash ../configure \
--with-version-build=%{buildver} \ --with-version-build=%{buildver} \
--with-version-pre="" \ --with-version-pre="" \
--with-version-opt="" \ --with-version-opt="" \
%ifnarch loongarch64
--with-vendor-version-string="%{vendor_version_string}" \ --with-vendor-version-string="%{vendor_version_string}" \
--with-vendor-name="Bisheng" \ --with-vendor-name="Bisheng" \
%endif
--with-vendor-url="https://openeuler.org/" \ --with-vendor-url="https://openeuler.org/" \
--with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \ --with-vendor-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \
--with-vendor-vm-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \ --with-vendor-vm-bug-url="https://gitee.com/src-openeuler/openjdk-11/issues/" \
@ -1395,6 +1415,7 @@ done
# javaCalls.cpp:58 should map to: # javaCalls.cpp:58 should map to:
# http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58 # http://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/file/ff3b27e6bcc2/src/share/vm/runtime/javaCalls.cpp#l58
# Using line number 1 might cause build problems. See: # Using line number 1 might cause build problems. See:
%ifnarch loongarch64
gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out gdb -q "$JAVA_HOME/bin/java" <<EOF | tee gdb.out
handle SIGSEGV pass nostop noprint handle SIGSEGV pass nostop noprint
handle SIGILL pass nostop noprint handle SIGILL pass nostop noprint
@ -1407,6 +1428,7 @@ end
run -version run -version
EOF EOF
#grep 'JavaCallWrapper::JavaCallWrapper' gdb.out #grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
%endif
# Check src.zip has all sources. See RHBZ#1130490 # Check src.zip has all sources. See RHBZ#1130490
jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
@ -1699,6 +1721,9 @@ cjc.mainProgram(arg)
%changelog %changelog
* Tue Feb 20 2024 Leslie Zhai <zhaixiang@loongson.cn> - 1:11.0.22.7-1
- init support of LoongArch64
* Wed Jan 17 2024 DXwangg <wangjiawei80@huawei.com> - 1:11.0.22.7-0 * Wed Jan 17 2024 DXwangg <wangjiawei80@huawei.com> - 1:11.0.22.7-0
- update to 11.0.22+7(GA) - update to 11.0.22+7(GA)
- modified delete_expired_certificates.patch - modified delete_expired_certificates.patch