diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2023-01-25 22:50:17 -0800 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2023-01-25 22:51:23 -0800 |
| commit | 8c49e908cf3339870f612b555b6054d10d0e9e7c (patch) | |
| tree | 2988380a3a3a33a6cd59b8c3057fcede3dc25bcc /java/openjdk19 | |
| parent | devel/py-prefixed: Update 0.6.0 → 0.7.0 (diff) | |
java/openjdk19: Fix the build on x86
Diffstat (limited to 'java/openjdk19')
| -rw-r--r-- | java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp b/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp new file mode 100644 index 000000000000..30a55e7d9a9e --- /dev/null +++ b/java/openjdk19/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp @@ -0,0 +1,42 @@ +--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2022-10-20 06:58:23.018695000 -0700 ++++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp 2022-12-29 13:13:27.000625000 -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 |