From bfc1063e9760d5dc8b26e97a2a896a1f98770924 Mon Sep 17 00:00:00 2001 From: Dingli Zhang Date: Thu, 29 Aug 2024 05:48:55 +0000 Subject: [PATCH] Fix build on riscv64 in prep stage for 8u422 --- add-riscv64-support.patch | 6 +++--- openjdk-1.8.0.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/add-riscv64-support.patch b/add-riscv64-support.patch index 8dda639..250feb7 100644 --- a/add-riscv64-support.patch +++ b/add-riscv64-support.patch @@ -90,14 +90,14 @@ index 54cfcdd1..88eb8acd 100644 #if (defined IA32) @@ -2010,9 +2014,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) static Elf32_Half running_arch_code=EM_AARCH64; - #elif (defined LOONGARCH) + #elif (defined LOONGARCH64) static Elf32_Half running_arch_code=EM_LOONGARCH; + #elif (defined RISCV) + static Elf32_Half running_arch_code=EM_RISCV; #else #error Method os::dll_load requires that one of following is defined:\ -- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH -+ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH, RISCV +- IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH64 ++ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K, AARCH64, LOONGARCH64, RISCV #endif // Identify compatability class for VM's architecture and library's architecture diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index a4bfb42..a89bd86 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -945,7 +945,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 7 +Release: 8 # 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 @@ -2670,6 +2670,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %endif %changelog +* Thu Aug 29 2024 Dingli Zhang -1:1.8.0.422-b05.8 +- Fix build on riscv64 in prep stage for 8u422 + * Tue Aug 20 2024 wuyafang -1:1.8.0.422-b05.7 - modified add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch -- Gitee