packages/openjdk-1.8.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on riscv64 in prep stage for 8u422

Browse Source
This commit is contained in:
Dingli Zhang 2024-08-29 05:48:55 +00:00
parent cb88177d7d
commit bfc1063e97
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
add-riscv64-support.patch
View File

@ -90,14 +90,14 @@ index 54cfcdd1..88eb8acd 100644
#if (defined IA32) #if (defined IA32)
@@ -2010,9 +2014,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) @@ -2010,9 +2014,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
static Elf32_Half running_arch_code=EM_AARCH64; static Elf32_Half running_arch_code=EM_AARCH64;
#elif (defined LOONGARCH) #elif (defined LOONGARCH64)
static Elf32_Half running_arch_code=EM_LOONGARCH; static Elf32_Half running_arch_code=EM_LOONGARCH;
+ #elif (defined RISCV) + #elif (defined RISCV)
+ static Elf32_Half running_arch_code=EM_RISCV; + static Elf32_Half running_arch_code=EM_RISCV;
#else #else
#error Method os::dll_load requires that one of following is defined:\ #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, LOONGARCH64
+ 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, RISCV
#endif #endif
// Identify compatability class for VM's architecture and library's architecture // Identify compatability class for VM's architecture and library's architecture

5
openjdk-1.8.0.spec
View File

@ -945,7 +945,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver} Version: %{javaver}.%{updatever}.%{buildver}
Release: 7 Release: 8
# 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
@ -2670,6 +2670,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect
%endif %endif
%changelog %changelog
* Thu Aug 29 2024 Dingli Zhang <dingli@iscas.ac.cn> -1:1.8.0.422-b05.8
- Fix build on riscv64 in prep stage for 8u422
* Tue Aug 20 2024 wuyafang <wuyafang@huawei.com> -1:1.8.0.422-b05.7 * Tue Aug 20 2024 wuyafang <wuyafang@huawei.com> -1:1.8.0.422-b05.7
- modified add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch - modified add-Fix-aarch64-runtime-thread-signal-transfer-bug.patch