|
Line 0
Link Here
|
|
|
1 |
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-08-29 13:03:51.988142000 +0200 |
| 2 |
+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2017-08-29 13:09:21.107206000 +0200 |
| 3 |
@@ -275,6 +275,8 @@ static char cpu_arch[] = "sparcv9"; |
| 4 |
# else |
| 5 |
static char cpu_arch[] = "sparc"; |
| 6 |
# endif |
| 7 |
+#elif defined(AARCH64) |
| 8 |
+static char cpu_arch[] = "aarch64"; |
| 9 |
#else |
| 10 |
#error Add appropriate cpu_arch setting |
| 11 |
#endif |
| 12 |
@@ -1602,7 +1604,8 @@ void * os::dll_load(const char *filename, char *ebuf, |
| 13 |
{EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, |
| 14 |
{EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, |
| 15 |
{EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"}, |
| 16 |
- {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"} |
| 17 |
+ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}, |
| 18 |
+ {EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"AARCH64"} |
| 19 |
}; |
| 20 |
|
| 21 |
#if (defined IA32) |
| 22 |
@@ -1633,6 +1636,8 @@ void * os::dll_load(const char *filename, char *ebuf, |
| 23 |
static Elf32_Half running_arch_code=EM_MIPS; |
| 24 |
#elif (defined M68K) |
| 25 |
static Elf32_Half running_arch_code=EM_68K; |
| 26 |
+ #elif (defined AARCH64) |
| 27 |
+ static Elf32_Half running_arch_code=EM_AARCH64; |
| 28 |
#else |
| 29 |
#error Method os::dll_load requires that one of following is defined:\ |
| 30 |
IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K |