diff --git a/java-11-openjdk-riscv64.patch b/java-11-openjdk-riscv64.patch index 0109530..59715b3 100644 --- a/java-11-openjdk-riscv64.patch +++ b/java-11-openjdk-riscv64.patch @@ -22,7 +22,7 @@ index e06c11af0..e1c55bb1b 100644 AC_MSG_ERROR([unsupported cpu $1]) ;; diff --git a/openjdk/src/hotspot/os/linux/os_linux.cpp b/openjdk/src/hotspot/os/linux/os_linux.cpp -index 8496e3db1..2d5058a7b 100644 +index 8496e3db1..a154fd3e3 100644 --- a/openjdk/src/hotspot/os/linux/os_linux.cpp +++ b/openjdk/src/hotspot/os/linux/os_linux.cpp @@ -1728,6 +1728,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { @@ -43,8 +43,12 @@ index 8496e3db1..2d5058a7b 100644 }; #if (defined IA32) -@@ -1789,7 +1793,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1787,9 +1791,11 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_68K; + #elif (defined SH) static Elf32_Half running_arch_code=EM_SH; ++#elif (defined __riscv) ++ static Elf32_Half running_arch_code=EM_RISCV; #else #error Method os::dll_load requires that one of following is defined:\ - AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, S390, SH, __sparc @@ -52,7 +56,7 @@ index 8496e3db1..2d5058a7b 100644 #endif // Identify compatability class for VM's architecture and library's architecture -@@ -1822,10 +1826,12 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1822,10 +1828,12 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { } #ifndef S390 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 51aad49..5927920 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -841,7 +841,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1.0.riscv64%{?dist} +Release: 1.1.riscv64%{?dist} # 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 @@ -1777,7 +1777,7 @@ require "copy_jdk_configs.lua" %changelog -* Tue Oct 16 2018 David Abdurachmanov - 1:11.0.0.28-1.0.riscv64 +* Tue Oct 16 2018 David Abdurachmanov - 1:11.0.0.28-1.1.riscv64 - Add support for RISC-V (riscv64) * Fri Sep 28 2018 Severin Gehwolf - 1:11.0.0.28-1