diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk17/Makefile | 2 | ||||
| -rw-r--r-- | java/openjdk17/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 52366c2a60b5..bf439e6a8661 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -9,7 +9,7 @@ COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} LICENSE= GPLv2 -ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ diff --git a/java/openjdk17/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp b/java/openjdk17/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp new file mode 100644 index 000000000000..70cc5edc5f48 --- /dev/null +++ b/java/openjdk17/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp @@ -0,0 +1,42 @@ +--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp.orig 2021-12-30 23:31:30.529953000 -0800 ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2021-12-30 23:31:40.303627000 -0800 +@@ -35,7 +35,11 @@ + #define amd64 1 + #endif + +-#ifdef i386 ++#if defined(i386) && !defined(i586) ++#define i586 1 ++#endif ++ ++#ifdef i586 + #include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h" + #endif + +@@ -347,7 +351,7 @@ + } + + #undef NPRGREG +-#ifdef i386 ++#ifdef i586 + #define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG + #endif + #ifdef amd64 +@@ -369,7 +373,7 @@ + + #undef REG_INDEX + +-#ifdef i386 ++#ifdef i586 + #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg + + regs[REG_INDEX(GS)] = (uintptr_t) gregs.r_gs; +@@ -388,7 +392,7 @@ + regs[REG_INDEX(CS)] = (uintptr_t) gregs.r_cs; + regs[REG_INDEX(SS)] = (uintptr_t) gregs.r_ss; + +-#endif /* i386 */ ++#endif /* i586 */ + + #ifdef amd64 + #define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg |