Bump devkit requirement to 1.0-9 to bring in updated sysroot

- Drop workaround of building s390x with dynamic libstdc++

Related: OPENJDK-3070

java-21-openjdk.spec

@@ -700,7 +700,7 @@ BuildRequires: devtoolset-%{dtsversion}-gcc
 BuildRequires: devtoolset-%{dtsversion}-gcc-c++
 %else
 %ifarch %{devkit_arches}
-BuildRequires: %{devkit_name} >= 1.0-8
+BuildRequires: %{devkit_name} >= 1.0-9
 %else
 # Earlier versions have a bug in tree vectorization on PPC
 BuildRequires: gcc >= 4.8.3-8
@@ -1149,11 +1149,6 @@ function buildjdk() {
     local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name}
     local top_dir_abs_build_path=$(pwd)/${outputdir}
 
-%ifarch s390x
-    # devkit libstdc++.a fails with "error: relocation refers
-    # to local symbol "" [9], which is defined in a discarded section
-    libc_link_opt="dynamic";
-%else
     # This must be set using the global, so that the
     # static libraries still use a dynamic stdc++lib
     if [ "x%{link_type}" = "xbundled" ] ; then
@@ -1161,7 +1156,6 @@ function buildjdk() {
     else
         libc_link_opt="dynamic";
     fi
-%endif
 
     echo "Using output directory: ${outputdir}";
     echo "Checking build JDK ${buildjdk} is operational..."
@@ -1947,9 +1941,12 @@ done
 - Update release notes to 21.0.6+7
 - Build with DWARF 4 debuginfo for compatibility with older toolchains
 - Check for CentOS being defined to determine use of devkit
+- Bump devkit requirement to 1.0-9 to bring in updated sysroot
+- Drop workaround of building s390x with dynamic libstdc++
 - ** This tarball is embargoed until 2025-01-21 @ 1pm PT. **
 - Resolves: OPENJDK-3556
 - Resolves: OPENJDK-3590
+- Related: OPENJDK-3070
 
 * Thu Nov 28 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.11-2
 - Bump devkit requirement to 1.0-8 to bring in the gcc with --enable-linker-build-id