From 8921df9c20effb4b5c41c7aa38c64d270be03450 Mon Sep 17 00:00:00 2001
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Tue, 16 Sep 2025 12:42:55 +0200
Subject: [PATCH] java/openjdk24: set proper ABI on powerpc64

n file included from /wrkdirs/usr/ports/java/openjdk24/work/openjdk-jdk-24.0.2-ga-freebsd-1/src/hotspot/share/precompiled/precompiled.hpp:45:
In file included from /wrkdirs/usr/ports/java/openjdk24/work/openjdk-jdk-24.0.2-ga-freebsd-1/src/hotspot/share/nmt/memTracker.hpp:30:
In file included from /wrkdirs/usr/ports/java/openjdk24/work/openjdk-jdk-24.0.2-ga-freebsd-1/src/hotspot/share/nmt/memoryFileTracker.hpp:34:
In file included from /wrkdirs/usr/ports/java/openjdk24/work/openjdk-jdk-24.0.2-ga-freebsd-1/src/hotspot/share/runtime/os.inline.hpp:31:
/wrkdirs/usr/ports/java/openjdk24/work/openjdk-jdk-24.0.2-ga-freebsd-1/src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.inline.hpp:35:10: error: no member named 'resolve_function_descriptor' in 'os::Bsd'; did you mean simply 'resolve_function_descriptor'?
   35 |   return os::Bsd::resolve_function_descriptor(p);
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      |          resolve_function_descriptor
/wrkdirs/usr/ports/java/openjdk24/work/openjdk-jdk-24.0.2-ga-freebsd-1/src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.inline.hpp:34:18: note: 'resolve_function_descriptor' declared here
   34 | inline void* os::resolve_function_descriptor(void* p) {
      |                  ^
1 error generated.
---
 .../files/patch-make_autoconf_flags-cflags.m4 | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4
index 5156c18515da..81bc372519f5 100644
--- a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4
+++ b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4
@@ -1,13 +1,12 @@
---- make/autoconf/flags-cflags.m4.orig	2020-01-08 09:12:31 UTC
+--- make/autoconf/flags-cflags.m4.orig	2025-09-16 10:24:48 UTC
 +++ make/autoconf/flags-cflags.m4
-@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
-         # for all archs except arm and ppc, prevent gcc to omit frame pointer
-         $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
+@@ -780,6 +780,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
+         # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
+         $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10"
        fi
-+    elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
-+        if test "x$FLAGS_CPU" = xppc64; then
-+            $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
-+        fi
++      if test "x$FLAGS_CPU" = xppc64; then
++        $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
++      fi
      fi
- 
-   elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+     if test "x$OPENJDK_TARGET_OS" = xaix; then
+       $1_CFLAGS_CPU="-mcpu=pwr8"