From ab0de32e41296ee156bf92491377a40d518d1651 Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Fri, 3 Nov 2023 15:18:52 +0800 Subject: [PATCH 1/2] [a8] Init 11.0.21.0.9 for LoongArch64 --- java-11-openjdk.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index f7ab74c..143f0f1 100644 --- a/java-11-openjdk.spec +++ b/java-11-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-11-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -120,11 +120,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} s390x +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x 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 %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 +%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 loongarch64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches ppc s390 # Set of architectures which run a full bootstrap cycle @@ -134,7 +134,7 @@ # Set of architectures with a Ahead-Of-Time (AOT) compiler %global aot_arches x86_64 %{aarch64} # 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} loongarch64 # Set of architectures which support class data sharing # 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 @@ -316,6 +316,11 @@ %global archinstall sparcv9 %global stapinstall %{_target_cpu} %endif +# 64 bit loongarch +%ifarch loongarch64 +%global archinstall loongarch64 +%global stapinstall loongarch64 +%endif # Need to support noarch for srpm build %ifarch noarch %global archinstall %{nil} @@ -2096,6 +2101,7 @@ done # Using line number 1 might cause build problems. See: # https://bugzilla.redhat.com/show_bug.cgi?id=1539664 # https://bugzilla.redhat.com/show_bug.cgi?id=1538767 +%ifnarch loongarch64 gdb -q "$JAVA_HOME/bin/java" < - 1:11.0.21.0.9-2.0.3 +- Init 11.0.21.0.9 for LoongArch64 + * Fri Nov 03 2023 Zhao Hang - 1:11.0.21.0.9-2.0.2 - Update version for dependecy -- Gitee From 6524d245c5391698fcaa71e886b146c3e2358af3 Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Fri, 3 Nov 2023 15:26:30 +0800 Subject: [PATCH 2/2] Revert anolis_release --- java-11-openjdk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 143f0f1..6159d7b 100644 --- a/java-11-openjdk.spec +++ b/java-11-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-11-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -2513,7 +2513,7 @@ end %endif %changelog -* Fri Nov 03 2023 Leslie Zhai - 1:11.0.21.0.9-2.0.3 +* Fri Nov 03 2023 Leslie Zhai - 1:11.0.21.0.9-2.0.2 - Init 11.0.21.0.9 for LoongArch64 * Fri Nov 03 2023 Zhao Hang - 1:11.0.21.0.9-2.0.2 -- Gitee