|
|
@@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
|
|
|
index 5120918aed2..f7a99955874 100644
|
|
|
--- a/make/autoconf/libraries.m4
|
|
|
+++ b/make/autoconf/libraries.m4
|
|
|
-@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
|
|
- BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
|
|
|
+@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
|
|
+ fi
|
|
|
fi
|
|
|
|
|
|
+ # Libatomic library
|
|
|
@@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644
|
|
|
arm*)
|
|
|
VAR_CPU=arm
|
|
|
VAR_CPU_ARCH=arm
|
|
|
-@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
|
|
|
+@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
|
|
|
HOTSPOT_$1_CPU_DEFINE=PPC64
|
|
|
|
|
|
# The cpu defines below are for zero, we don't support them directly.
|
|
|
@@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c
|
|
|
index b08caf4d5d3..2bf084895ba 100644
|
|
|
--- a/src/hotspot/os/linux/os_linux.cpp
|
|
|
+++ b/src/hotspot/os/linux/os_linux.cpp
|
|
|
-@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
+@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
#ifndef EM_AARCH64
|
|
|
#define EM_AARCH64 183 /* ARM AARCH64 */
|
|
|
#endif
|
|
|
@@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644
|
|
|
#ifndef EM_RISCV
|
|
|
#define EM_RISCV 243 /* RISC-V */
|
|
|
#endif
|
|
|
-@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
+@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
{EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"},
|
|
|
#endif
|
|
|
{EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
|
|
|
@@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644
|
|
|
// we only support 64 bit z architecture
|
|
|
{EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"},
|
|
|
{EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
|
|
|
-@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
+@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
static Elf32_Half running_arch_code=EM_PPC;
|
|
|
#elif (defined AARCH64)
|
|
|
static Elf32_Half running_arch_code=EM_AARCH64;
|
|
|
@@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644
|
|
|
#elif (defined ARM)
|
|
|
static Elf32_Half running_arch_code=EM_ARM;
|
|
|
#elif (defined S390)
|
|
|
-@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
- static Elf32_Half running_arch_code=EM_RISCV;
|
|
|
+@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
|
|
|
+ static Elf32_Half running_arch_code=EM_LOONGARCH;
|
|
|
#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__, RISCV, S390, SH, __sparc
|
|
|
-+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
|
|
+- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
|
|
++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc
|
|
|
#endif
|
|
|
|
|
|
// Identify compatibility class for VM's architecture and library's architecture
|
Adam Duskett