46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
|
Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280
|
||
|
|
--- old/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
|
||
|
|
+++ new/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
|
||
|
|
@@ -47,6 +47,8 @@
|
||
|
|
#include "opto/intrinsicnode.hpp"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#include <asm/ptrace.h>
|
||
|
|
+
|
||
|
|
#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
|
||
|
|
@@ -845,7 +845,7 @@ void VM_Version::determine_features() {
|
||
|
|
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
|
||
|
|
@@ -75,7 +75,7 @@
|
||
|
|
# include <pwd.h>
|
||
|
|
# include <poll.h>
|
||
|
|
# include <ucontext.h>
|
||
|
|
-
|
||
|
|
+# include <asm/ptrace.h>
|
||
|
|
|
||
|
|
address os::current_stack_pointer() {
|
||
|
|
intptr_t* csp;
|
||
|
|
--- old/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
|
||
|
|
+++ new/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.cpp
|
||
|
|
@@ -23,6 +23,8 @@
|
||
|
|
*
|
||
|
|
*/
|
||
|
|
|
||
|
|
+#include <asm/ptrace.h>
|
||
|
|
+
|
||
|
|
#include "precompiled.hpp"
|
||
|
|
#include "runtime/frame.inline.hpp"
|
||
|
|
#include "runtime/thread.hpp"
|