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

!602 Fix build on riscv64 in prep stage for 8u422

Browse Source 
Merge pull request !602 from Dingli Zhang/openEuler-24.03-LTS-Next-8u422-riscv64
This commit is contained in:
openeuler-ci-bot 2024-09-03 01:17:46 +00:00 committed by Gitee
commit 3158138562
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 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

10
openjdk-1.8.0.spec
View File

@ -943,7 +943,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: 1 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
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -1990,7 +1990,9 @@ pushd %{top_level_dir_name}
%patch435 -p1 %patch435 -p1
%patch436 -p1 %patch436 -p1
%patch437 -p1 %patch437 -p1
%ifnarch riscv64
%patch438 -p1 %patch438 -p1
%endif
%patch439 -p1 %patch439 -p1
%patch440 -p1 %patch440 -p1
%patch441 -p1 %patch441 -p1
@ -2659,6 +2661,12 @@ cjc.mainProgram(arg)
%endif %endif
%changelog %changelog
* Mon Sep 2 2024 Dingli Zhang <dingli@iscas.ac.cn> -1:1.8.0.422-b05.3
- Fix build error on riscv64 because of patch438
* Thu Aug 29 2024 Dingli Zhang <dingli@iscas.ac.cn> -1:1.8.0.422-b05.2
- Fix build on riscv64 in prep stage for 8u422
* Tue Jul 30 2024 Xiang Gao <gaoxiang@kylinos.cn> - 1:1.8.0.422-b05.1 * Tue Jul 30 2024 Xiang Gao <gaoxiang@kylinos.cn> - 1:1.8.0.422-b05.1
- Backport 8178498,8193710,8196743,8284330, serviceability tools support containers on loongarch - Backport 8178498,8193710,8196743,8284330, serviceability tools support containers on loongarch