From 308dd43e908f0f7be13c9c4f0913687c1006483a Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 31 Aug 2020 22:00:57 +0200 Subject: [PATCH] openjdk8: fix build on ppc64*-musl --- srcpkgs/openjdk8/files/musl_002_hotspot_ppc.patch | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openjdk8/files/musl_002_hotspot_ppc.patch b/srcpkgs/openjdk8/files/musl_002_hotspot_ppc.patch index d9a10ab694..43f8618522 100644 --- a/srcpkgs/openjdk8/files/musl_002_hotspot_ppc.patch +++ b/srcpkgs/openjdk8/files/musl_002_hotspot_ppc.patch @@ -1,4 +1,4 @@ ---- openjdk.orig/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp +--- openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp +++ openjdk/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp @@ -80,7 +80,7 @@ # include @@ -9,7 +9,7 @@ address os::current_stack_pointer() { intptr_t* csp; ---- openjdk.orig/hotspot.orig/src/cpu/ppc/vm/macroAssembler_ppc.cpp +--- openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp +++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp @@ -46,6 +46,8 @@ #include "gc_implementation/g1/heapRegion.hpp" @@ -20,3 +20,14 @@ #ifdef PRODUCT #define BLOCK_COMMENT(str) // nothing #else +--- openjdk/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp ++++ openjdk/hotspot/src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp +@@ -27,6 +27,8 @@ + #include "runtime/frame.inline.hpp" + #include "runtime/thread.hpp" + ++#include ++ + bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava) { + assert(this->is_Java_thread(), "must be JavaThread"); +