From 671f63eb327d56c9d9f1430881d02b57886cfd95 Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Fri, 3 Nov 2023 15:02:00 +0800 Subject: [PATCH 1/2] [a8] Init 1.8.0.392.b08 for LoongArch64 --- java-1.8.0-openjdk.spec | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 2234161..78bde87 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.3 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -109,11 +109,11 @@ # 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} +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} loongarch64 # Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 +%global fastdebug_arches x86_64 ppc64le aarch64 loongarch64 # Set of architectures with a Just-In-Time (JIT) compiler -%global jit_arches %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 +%global jit_arches %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 loongarch64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches %{arm} ppc s390 s390x # Set of architectures which run a full bootstrap cycle @@ -121,11 +121,11 @@ # Set of architectures which support SystemTap tapsets %global systemtap_arches %{jit_arches} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 # Set of architectures which support class data sharing # See https://bugzilla.redhat.com/show_bug.cgi?id=513605 # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT -%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 # Set of architectures which support Java Flight Recorder (JFR) %global jfr_arches %{jit_arches} # Set of architectures for which alt-java has SSB mitigation @@ -133,7 +133,7 @@ # Set of architectures where we verify backtraces with gdb %global gdb_arches %{jit_arches} %{zero_arches} # Set of architectures for which we have a portable build -%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64 +%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64 loongarch64 # By default, we build a debug build during main build on JIT architectures %if %{with slowdebug} @@ -270,6 +270,10 @@ %global archinstall aarch64 %global stapinstall arm64 %endif +%ifarch loongarch64 +%global archinstall loongarch64 +%global stapinstall loongarch64 +%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -1881,8 +1885,10 @@ ln -s %{top_level_dir_name} openjdk # # the configure macro will do this too, but it also passes a few flags not # supported by openjdk configure script +%ifnarch loongarch64 cp %{SOURCE100} %{top_level_dir_name}/common/autoconf/build-aux/ cp %{SOURCE101} %{top_level_dir_name}/common/autoconf/build-aux/ +%endif # OpenJDK patches @@ -1899,6 +1905,7 @@ sh %{SOURCE12} %patch204 %endif +%ifnarch loongarch64 %patch1 %patch3 %patch5 @@ -1922,6 +1929,7 @@ sh %{SOURCE12} %patch574 %patch112 %patch581 +%endif pushd %{top_level_dir_name} # Add crypto policy and FIPS support @@ -2637,6 +2645,9 @@ cjc.mainProgram(args) %endif %changelog +* Fri Nov 03 2023 Leslie Zhai - 1:1.8.0.392.b08-4.0.3 +- Init LoongArch64 + * Fri Nov 03 2023 Hong Wei Qin - 1:1.8.0.392.b08-4.0.2 - Update portable pkg dist -- Gitee From c95c1ed0fe999549873825e2626f7d177368fc64 Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Fri, 3 Nov 2023 15:25:52 +0800 Subject: [PATCH 2/2] Revert anolis_release --- java-1.8.0-openjdk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 78bde87..e1d3b21 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.3 +%define anolis_release .0.2 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -2645,7 +2645,7 @@ cjc.mainProgram(args) %endif %changelog -* Fri Nov 03 2023 Leslie Zhai - 1:1.8.0.392.b08-4.0.3 +* Fri Nov 03 2023 Leslie Zhai - 1:1.8.0.392.b08-4.0.2 - Init LoongArch64 * Fri Nov 03 2023 Hong Wei Qin - 1:1.8.0.392.b08-4.0.2 -- Gitee