!151 Sw64: Add support for sw_64 architecture.
From: @little-huaduo Reviewed-by: @alexanderbill Signed-off-by: @alexanderbill
This commit is contained in:
commit
a3f34a93af
@ -72,7 +72,7 @@
|
|||||||
%global is_system_jdk 0
|
%global is_system_jdk 0
|
||||||
|
|
||||||
%global aarch64 aarch64 arm64 armv8
|
%global aarch64 aarch64 arm64 armv8
|
||||||
%global jit_arches x86_64 %{aarch64} loongarch64 riscv64
|
%global jit_arches x86_64 %{aarch64} loongarch64 riscv64 sw_64
|
||||||
%global aot_arches x86_64 %{aarch64}
|
%global aot_arches x86_64 %{aarch64}
|
||||||
%global linux_x64_aarch64 aarch64 x86_64
|
%global linux_x64_aarch64 aarch64 x86_64
|
||||||
|
|
||||||
@ -143,6 +143,9 @@
|
|||||||
%ifarch loongarch64
|
%ifarch loongarch64
|
||||||
%global archinstall loongarch64
|
%global archinstall loongarch64
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch sw_64
|
||||||
|
%global archinstall sw64
|
||||||
|
%endif
|
||||||
%ifarch %{riscv64}
|
%ifarch %{riscv64}
|
||||||
%global archinstall riscv64
|
%global archinstall riscv64
|
||||||
%endif
|
%endif
|
||||||
@ -914,7 +917,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: 2
|
Release: 3
|
||||||
|
|
||||||
# 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
|
||||||
@ -1068,6 +1071,12 @@ Patch78: Fix-a-concurrent-issue-of-program-data-ref-cnt.patch
|
|||||||
############################################
|
############################################
|
||||||
Patch2000: LoongArch64-support.patch
|
Patch2000: LoongArch64-support.patch
|
||||||
|
|
||||||
|
############################################
|
||||||
|
#
|
||||||
|
# Sw64 specific patches
|
||||||
|
#
|
||||||
|
############################################
|
||||||
|
Patch6000: sw_64-support.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -1289,7 +1298,7 @@ fi
|
|||||||
|
|
||||||
# OpenJDK patches
|
# OpenJDK patches
|
||||||
|
|
||||||
%ifnarch loongarch64 riscv64
|
%ifnarch loongarch64 riscv64 sw_64
|
||||||
pushd %{top_level_dir_name}
|
pushd %{top_level_dir_name}
|
||||||
%patch 1 -p1
|
%patch 1 -p1
|
||||||
%patch 3 -p1
|
%patch 3 -p1
|
||||||
@ -1403,6 +1412,11 @@ pushd %{top_level_dir_name}
|
|||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%ifarch sw_64
|
||||||
|
pushd %{top_level_dir_name}
|
||||||
|
%patch 6000 -p1
|
||||||
|
popd
|
||||||
|
%endif
|
||||||
|
|
||||||
# Extract systemtap tapsets
|
# Extract systemtap tapsets
|
||||||
%if %{with_systemtap}
|
%if %{with_systemtap}
|
||||||
@ -1458,7 +1472,7 @@ export NUM_PROC=${NUM_PROC:-1}
|
|||||||
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64} loongarch64
|
%ifarch s390x sparc64 alpha %{power64} %{aarch64} loongarch64 sw_64
|
||||||
export ARCH_DATA_MODEL=64
|
export ARCH_DATA_MODEL=64
|
||||||
%endif
|
%endif
|
||||||
%ifarch alpha
|
%ifarch alpha
|
||||||
@ -1541,9 +1555,18 @@ bash ../configure \
|
|||||||
--with-giflib=system \
|
--with-giflib=system \
|
||||||
--with-libpng=system \
|
--with-libpng=system \
|
||||||
--with-harfbuzz=system \
|
--with-harfbuzz=system \
|
||||||
|
%ifarch sw_64
|
||||||
|
--enable-jvm-feature-epsilongc=no --enable-jvm-feature-compiler1=no \
|
||||||
|
--enable-jvm-feature-jfr=no --enable-jvm-feature-jvmci=no --enable-jvm-feature-shenandoahgc=no --enable-jvm-feature-zgc=no \
|
||||||
|
--enable-cds-archive=no \
|
||||||
|
--with-extra-cflags="-mieee -mgprel-size=32" \
|
||||||
|
--with-extra-cxxflags="-mieee -mgprel-size=32" \
|
||||||
|
--with-extra-ldflags="-mieee -Wl,-no-relax" \
|
||||||
|
%else
|
||||||
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
|
--with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
|
||||||
--with-extra-cflags="$EXTRA_CFLAGS" \
|
--with-extra-cflags="$EXTRA_CFLAGS" \
|
||||||
--with-extra-ldflags="%{ourldflags}" \
|
--with-extra-ldflags="%{ourldflags}" \
|
||||||
|
%endif
|
||||||
--with-num-cores="$NUM_PROC" \
|
--with-num-cores="$NUM_PROC" \
|
||||||
--with-source-date="${SOURCE_DATE_EPOCH}" \
|
--with-source-date="${SOURCE_DATE_EPOCH}" \
|
||||||
--disable-javac-server \
|
--disable-javac-server \
|
||||||
@ -1963,6 +1986,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 19 2025 swcompiler <lc@wxiat.cn> - 1:17.0.14.7-3
|
||||||
|
- add sw64 architecture support to 17.0.14.7
|
||||||
|
|
||||||
* Fri Feb 21 2025 songliyang <songliyang@kylinos.cn> - 1:17.0.14.7-2
|
* Fri Feb 21 2025 songliyang <songliyang@kylinos.cn> - 1:17.0.14.7-2
|
||||||
- fix LoongArch64 support patch apply error
|
- fix LoongArch64 support patch apply error
|
||||||
|
|
||||||
|
|||||||
63402
sw_64-support.patch
Normal file
63402
sw_64-support.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user