Add support for RISC-V (riscv64)
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
parent
5a09ba2c99
commit
e396017504
1486
config.guess
vendored
Normal file
1486
config.guess
vendored
Normal file
File diff suppressed because it is too large
Load Diff
1790
config.sub
vendored
Normal file
1790
config.sub
vendored
Normal file
File diff suppressed because it is too large
Load Diff
67
java-11-openjdk-riscv64.patch
Normal file
67
java-11-openjdk-riscv64.patch
Normal file
@ -0,0 +1,67 @@
|
||||
diff --git a/openjdk/make/autoconf/platform.m4 b/openjdk/make/autoconf/platform.m4
|
||||
index e06c11af0..e1c55bb1b 100644
|
||||
--- a/openjdk/make/autoconf/platform.m4
|
||||
+++ b/openjdk/make/autoconf/platform.m4
|
||||
@@ -150,6 +150,18 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
|
||||
VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=big
|
||||
;;
|
||||
+ riscv32)
|
||||
+ VAR_CPU=riscv32
|
||||
+ VAR_CPU_ARCH=riscv
|
||||
+ VAR_CPU_BITS=32
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
+ riscv64)
|
||||
+ VAR_CPU=riscv64
|
||||
+ VAR_CPU_ARCH=riscv
|
||||
+ VAR_CPU_BITS=64
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
*)
|
||||
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
|
||||
--- 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) {
|
||||
#ifndef EM_AARCH64
|
||||
#define EM_AARCH64 183 /* ARM AARCH64 */
|
||||
#endif
|
||||
+#ifndef EM_RISCV
|
||||
+ #define EM_RISCV 243 /* RISC-V */
|
||||
+#endif
|
||||
|
||||
static const arch_t arch_array[]={
|
||||
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
|
||||
@@ -1753,6 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
{EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
|
||||
{EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"},
|
||||
{EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"},
|
||||
+ {EM_RISCV, EM_RISCV, ELFCLASSNONE, ELFDATA2MSB, (char*)"RISC-V"},
|
||||
};
|
||||
|
||||
#if (defined IA32)
|
||||
@@ -1789,7 +1793,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
||||
static Elf32_Half running_arch_code=EM_SH;
|
||||
#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
|
||||
+ AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, S390, SH, __sparc, __riscv
|
||||
#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) {
|
||||
}
|
||||
|
||||
#ifndef S390
|
||||
+#ifndef __riscv
|
||||
if (lib_arch.elf_class != arch_array[running_arch_index].elf_class) {
|
||||
::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: architecture word width mismatch)");
|
||||
return NULL;
|
||||
}
|
||||
+#endif // !__riscv
|
||||
#endif // !S390
|
||||
|
||||
if (lib_arch.compat_class != arch_array[running_arch_index].compat_class) {
|
@ -167,6 +167,9 @@
|
||||
%ifarch %{aarch64}
|
||||
%global archinstall aarch64
|
||||
%endif
|
||||
%ifarch riscv64
|
||||
%global archinstall riscv64
|
||||
%endif
|
||||
# 32 bit sparc, optimized for v9
|
||||
%ifarch sparcv9
|
||||
%global archinstall sparc
|
||||
@ -838,7 +841,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 1%{?dist}
|
||||
Release: 1.0.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
|
||||
@ -891,6 +894,10 @@ Source13: TestCryptoLevel.java
|
||||
# Ensure ECDSA is working
|
||||
Source14: TestECDSA.java
|
||||
|
||||
# New versions of config files with RISC-V (riscv64) support.
|
||||
Source100: config.guess
|
||||
Source101: config.sub
|
||||
|
||||
############################################
|
||||
#
|
||||
# RPM/distribution specific patches
|
||||
@ -919,6 +926,8 @@ Patch6: RHBZ-1628612-JDK-8210461-workaround-disable-aarch64-intrinsic.patch
|
||||
# available in jdk11u.
|
||||
Patch7: RHBZ-1630996-JDK-8210858-workaround-disable-aarch64-intrinsic-log.patch
|
||||
|
||||
Patch30: java-11-openjdk-riscv64.patch
|
||||
|
||||
#############################################
|
||||
#
|
||||
# OpenJDK specific patches
|
||||
@ -973,7 +982,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-proto-devel
|
||||
BuildRequires: zip
|
||||
BuildRequires: javapackages-filesystem
|
||||
BuildRequires: java-11-openjdk-devel
|
||||
BuildRequires: java-openjdk-devel
|
||||
# Zero-assembler build requirement
|
||||
%ifnarch %{jit_arches}
|
||||
BuildRequires: libffi-devel
|
||||
@ -1196,6 +1205,10 @@ if [ $prioritylength -ne 7 ] ; then
|
||||
exit 14
|
||||
fi
|
||||
|
||||
# Update config.{guess,sub} with RISC-V (riscv64) support
|
||||
cp %{SOURCE100} openjdk/make/autoconf/build-aux/
|
||||
cp %{SOURCE101} openjdk/make/autoconf/build-aux/
|
||||
|
||||
# OpenJDK patches
|
||||
|
||||
# Remove libraries that are linked
|
||||
@ -1213,6 +1226,7 @@ pushd %{top_level_dir_name}
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch30 -p2
|
||||
|
||||
popd # openjdk
|
||||
|
||||
@ -1272,7 +1286,7 @@ export NUM_PROC=${NUM_PROC:-1}
|
||||
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
||||
%endif
|
||||
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64
|
||||
export ARCH_DATA_MODEL=64
|
||||
%endif
|
||||
%ifarch alpha
|
||||
@ -1315,7 +1329,7 @@ bash ../configure \
|
||||
--with-version-build=%{buildver} \
|
||||
--with-version-pre="" \
|
||||
--with-version-opt="" \
|
||||
--with-boot-jdk=/usr/lib/jvm/java-11-openjdk \
|
||||
--with-boot-jdk=/usr/lib/jvm/java-10-openjdk \
|
||||
--with-debug-level=$debugbuild \
|
||||
--with-native-debug-symbols=internal \
|
||||
--enable-unlimited-crypto \
|
||||
@ -1763,6 +1777,9 @@ require "copy_jdk_configs.lua"
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Oct 16 2018 David Abdurachmanov <david.abdurachmanov@gmail.com> - 1:11.0.0.28-1.0.riscv64
|
||||
- Add support for RISC-V (riscv64)
|
||||
|
||||
* Fri Sep 28 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:11.0.0.28-1
|
||||
- Identify as GA version and no longer as early access (EA).
|
||||
- JDK 11 has been released for GA on 2018-09-25.
|
||||
|
Loading…
Reference in New Issue
Block a user