--- old/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp +++ new/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp @@ -46,6 +46,8 @@ #include "gc_implementation/g1/heapRegion.hpp" #endif +#include + #ifdef PRODUCT #define BLOCK_COMMENT(str) // nothing #else --- old/src/hotspot/cpu/ppc/vm_version_ppc.cpp +++ new/src/hotspot/cpu/ppc/vm_version_ppc.cpp @@ -745,7 +745,7 @@ unsigned long auxv = getauxval(AT_HWCAP2); if (auxv & PPC_FEATURE2_HTM_NOSC) { - if (auxv & PPC_FEATURE2_HAS_HTM) { + if (auxv & PPC_FEATURE2_HTM) { // TM on POWER8 and POWER9 in compat mode (VM) is supported by the JVM. // TM on POWER9 DD2.1 NV (baremetal) is not supported by the JVM (TM on // POWER9 DD2.1 NV has a few issues that need a couple of firmware --- old/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp +++ new/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp @@ -80,7 +80,7 @@ # include # include # include - +# include address os::current_stack_pointer() { intptr_t* csp