From 87e60c5c54f8841d3010ff423099aa1ce9c18972 Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Fri, 3 Oct 2025 00:25:25 +0100
Subject: [PATCH] Handle new libsimdsort.so introduced on x86_64 only by
 JDK-8309130

Related: RHEL-100678
---
 java-25-openjdk.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec
index ba573a8..a569d98 100644
--- a/java-25-openjdk.spec
+++ b/java-25-openjdk.spec
@@ -140,6 +140,8 @@
 %global ssbd_arches x86_64
 # Set of architectures for which java has short vector math library (libjsvml.so)
 %global svml_arches x86_64
+# Set of architectures for which java has intrinsics for Arrays.sort (libsimdsort.so)
+%global simdsort_arches x86_64
 # Set of architectures where we verify backtraces with gdb
 %global gdb_arches %{jit_arches} %{zero_arches}
 # Architecture on which we run Java only tests
@@ -779,6 +781,9 @@ fi
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjdwp.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjimage.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsound.so
+%ifarch %{svml_arches}
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so
+%endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/liblcms.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/lible.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libmanagement.so
@@ -796,8 +801,8 @@ fi
 %endif
 %endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
-%ifarch %{svml_arches}
-%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsvml.so
+%ifarch %{simdsort_arches}
+%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsimdsort.so
 %endif
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsyslookup.so
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
@@ -2485,6 +2490,7 @@ exit 0
 - Flip equals test in TestSecurityProperties.java to handle null values from Security.getProperty
 - Introduce crypto_policy_active to designate whether we should expect policy adherence in testing
 - Flip crypto_policy_active to false while the crypto policy & FIPS patch is not present
+- Handle new libsimdsort.so introduced on x86_64 only by JDK-8309130
 - Related: RHEL-100678
 
 * Mon Aug 25 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1