2 files changed, 9 insertions, 99 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"
diff --git a/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
deleted file mode 100644
index 421548d0f4a5..000000000000
--- a/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c.orig	2023-10-01 03:54:04 UTC
-+++ src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
-@@ -58,6 +58,7 @@
- #include <unistd.h>
- 
- #ifdef __FreeBSD__
-+#include <sys/user.h>
- #include <vm/vm_param.h>
- #endif
- 
-@@ -177,23 +178,43 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
-     }
-     return t_info.virtual_size;
- #elif defined(__FreeBSD__)
--    FILE *fp;
--    unsigned long end, start;
--    jlong total = 0;
-+    int mib[4];
-+    struct kinfo_vmentry *kve;
-+    long total = 0;
-+    size_t len = 0;
-+    int error;
-+    char *buf, *bp, *eb;
- 
--    if ((fp = fopen("/proc/curproc/map", "r")) == NULL) {
--        throw_internal_error(env, "Unable to open /proc/curproc/map");
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_PROC;
-+    mib[2] = KERN_PROC_VMMAP;
-+    mib[3] = getpid();
-+    error = sysctl(mib, 4, NULL, &len, NULL, 0);
-+    if (error) {
-+        throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
-         return -1;
-     }
--
--    for (;;) {
--       // Ignore everything except start and end entries
--       if (fscanf(fp, "0x%lx 0x%lx %*[^\n]\n", &start, &end) != 2 || start > end)
--           break;
--       total += end - start;
-+    len = len * 4 / 3;
-+    buf = malloc(len);
-+    if (buf == NULL) {
-+        throw_internal_error(env, "Fail to allocate memory");
-+        return -1;
-     }
--
--    fclose(fp);
-+    error = sysctl(mib, 4, buf, &len, NULL, 0);
-+    if (error) {
-+        throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
-+        return -1;
-+    }
-+    bp = buf;
-+    eb = buf + len;
-+    while (bp < eb) {
-+        kve = (struct kinfo_vmentry *)(uintptr_t)bp;
-+        if (kve->kve_structsize == 0)
-+            break;
-+        bp += kve->kve_structsize;
-+        total += kve->kve_end - kve->kve_start;
-+    }
-+    free(buf);
-     return total;
- #else /* _ALLBSD_SOURCE */
-     /*
-@@ -403,6 +424,21 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
-     return nfiles;
- #elif defined(__OpenBSD__)
-     return getdtablecount();
-+#elif defined(__FreeBSD__)
-+    int mib[4];
-+    int error;
-+    int nfds;
-+    size_t len;
-+
-+    len = sizeof(nfds);
-+    mib[0] = CTL_KERN;
-+    mib[1] = KERN_PROC;
-+    mib[2] = KERN_PROC_NFDS;
-+    mib[3] = 0;
-+
-+    if (sysctl(mib, 4, &nfds, &len, NULL, 0) == -1)
-+        return -1;
-+    return nfds;
- #else /* solaris/linux */
-     DIR *dirp;
-     struct dirent* dentp;