stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8229254: solaris_x64 build fails after JDK-8191278

Browse Source 
Reviewed-by: kbarrett, dholmes
This commit is contained in:
Boris Ulasevich 2019-08-21 17:09:05 +03:00
parent 0b625536e6
commit 9e633ae065
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/os/solaris/os_solaris.cpp
View File

@ -1597,6 +1597,10 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
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"},

2
src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp
View File

@ -541,7 +541,7 @@ JVM_handle_solaris_signal(int sig, siginfo_t* info, void* ucVoid,
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);