OpenJDK / jdk / jdk
changeset 56039:df3397f95387
8229254: solaris_x64 build fails after JDK-8191278
Reviewed-by: kbarrett, dholmes
| author | bulasevich |
|---|---|
| date | Wed, 21 Aug 2019 17:09:05 +0300 |
| parents | 182f94955cfb |
| children | efb2770e8288 |
| files | src/hotspot/os/solaris/os_solaris.cpp src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/os/solaris/os_solaris.cpp Wed Aug 21 17:38:19 2019 +0530 +++ b/src/hotspot/os/solaris/os_solaris.cpp Wed Aug 21 17:09:05 2019 +0300 @@ -1597,6 +1597,10 @@ char* name; // String representation } arch_t; +#ifndef EM_AARCH64 + #define EM_AARCH64 183 /* ARM AARCH64 */ +#endif + static const arch_t arch_array[]={ {EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"}, {EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp Wed Aug 21 17:38:19 2019 +0530 +++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp Wed Aug 21 17:09:05 2019 +0300 @@ -541,7 +541,7 @@ if (cb != NULL) { CompiledMethod* nm = cb->as_compiled_method_or_null(); bool is_unsafe_arraycopy = thread->doing_unsafe_access() && UnsafeCopyMemory::contains_pc(pc); - if ((nm != NULL && nm->has_unsafe_access()) || is_unsafe_arraycopy)) { + if ((nm != NULL && nm->has_unsafe_access()) || is_unsafe_arraycopy) { address next_pc = Assembler::locate_next_instruction(pc); if (is_unsafe_arraycopy) { next_pc = UnsafeCopyMemory::page_error_continue_pc(pc);