Subject: Remove fpu_control.h include and partly apply patch for JDK-8224851 Upstream: No Author: Simon Frankenberger The header is not present with musl and including it results in build error. It's not needed anyways. The second patch fixes "error: redeclaration of 'using MacroAssembler::call_VM_leaf_base'" --- old/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +++ new/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp @@ -77,7 +77,6 @@ # include # include # include -# include #ifdef BUILTIN_SIM #define REG_SP REG_RSP --- old/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp +++ new/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp @@ -39,8 +39,6 @@ protected: protected: - using MacroAssembler::call_VM_leaf_base; - // Interpreter specific version of call_VM_base using MacroAssembler::call_VM_leaf_base;