s390x: Fix static PIE condition for toolchain bootstrapping.

The static PIE configure check uses link tests.  When bootstrapping
a cross-toolchain, the link tests fail due to missing crt-files /
libc.so.  As we explicitely want to test an issue in binutils (ld),
we now also explicitely check for known linker versions.

See also commit 368b7c614b102122b86af3953daea2b30230d0a8
S390: Use compile-only instead of also link-tests in configure.

2 files changed, 138 insertions, 12 deletions

diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure
index 2784f158ea..824ae9c129 100644
--- a/sysdeps/s390/s390-64/configure
+++ b/sysdeps/s390/s390-64/configure
@@ -1,13 +1,107 @@
 # This file is generated from configure.ac by Autoconf.  DO NOT EDIT!
  # Local configure fragment for sysdeps/s390/s390-64.
 
+# Bypass result of runtime configure check for known linker versions as
+# e.g. crt-files or libc.so might not be available in bootstrapping
+# environments.
+case $($LD --version) in
+  "GNU gold"*)
+    # As of 2023-08-07, gold does not support static PIE due to
+    # Bug 22221 - add --no-dynamic-linker option
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=22221
+    libc_cv_s390x_staticpie_req_version=no
+    ;;
+  "LLD"*)
+    # As of 2023-08-07, there is no lld which supports s390x.
+    libc_cv_s390x_staticpie_req_version=no
+    ;;
+  *)
+    # The required binutils patches are available with bintuils 2.39
+    libc_cv_s390x_staticpie_req_version=yes
+    # Skip AC_CHECK_PROGS and just use the result from main configure.ac.
+    libc_cv_s390x_staticpie_req_LD=$LD
+    for ac_prog in $LD
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_libc_cv_s390x_staticpie_req_LD+y}
+then :
+  printf %s "(cached) " >&6
+else $as_nop
+  if test -n "$libc_cv_s390x_staticpie_req_LD"; then
+  ac_cv_prog_libc_cv_s390x_staticpie_req_LD="$libc_cv_s390x_staticpie_req_LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  case $as_dir in #(((
+    '') as_dir=./ ;;
+    */) ;;
+    *) as_dir=$as_dir/ ;;
+  esac
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+    ac_cv_prog_libc_cv_s390x_staticpie_req_LD="$ac_prog"
+    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+libc_cv_s390x_staticpie_req_LD=$ac_cv_prog_libc_cv_s390x_staticpie_req_LD
+if test -n "$libc_cv_s390x_staticpie_req_LD"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_s390x_staticpie_req_LD" >&5
+printf "%s\n" "$libc_cv_s390x_staticpie_req_LD" >&6; }
+else
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+  test -n "$libc_cv_s390x_staticpie_req_LD" && break
+done
+
+if test -z "$libc_cv_s390x_staticpie_req_LD"; then
+  ac_verc_fail=yes
+else
+  # Found it, now check the version.
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking version of $libc_cv_s390x_staticpie_req_LD" >&5
+printf %s "checking version of $libc_cv_s390x_staticpie_req_LD... " >&6; }
+  ac_prog_version=`$libc_cv_s390x_staticpie_req_LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
+  case $ac_prog_version in
+    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+    2.1[0-9][0-9]*|2.39*|2.[4-9][0-9]*|[3-9].*|[1-9][0-9]*)
+       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+  esac
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+printf "%s\n" "$ac_prog_version" >&6; }
+fi
+if test $ac_verc_fail = yes; then
+  libc_cv_s390x_staticpie_req_version=no
+fi
+
+    ;;
+esac
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for s390-specific static PIE requirements (version check)" >&5
+printf %s "checking for s390-specific static PIE requirements (version check)... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_s390x_staticpie_req_version" >&5
+printf "%s\n" "$libc_cv_s390x_staticpie_req_version" >&6; }
+
 # Minimal checking for static PIE support in ld.
 # Compare to ld testcase/bugzilla:
 # <binutils-source>/ld/testsuite/ld-elf/pr22263-1.rd
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for s390-specific static PIE requirements" >&5
-printf %s "checking for s390-specific static PIE requirements... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for s390-specific static PIE requirements (runtime check)" >&5
+printf %s "checking for s390-specific static PIE requirements (runtime check)... " >&6; }
 if { as_var=\
-libc_cv_s390x_staticpie_req; eval test \${$as_var+y}; }
+libc_cv_s390x_staticpie_req_runtime; eval test \${$as_var+y}; }
 then :
   printf %s "(cached) " >&6
 else $as_nop
@@ -32,7 +126,7 @@ main ()
   return 0;
 }
 EOF
-  libc_cv_s390x_staticpie_req=no
+  libc_cv_s390x_staticpie_req_runtime=no
   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fPIE -c conftest1.c -o conftest1.o'
   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
@@ -58,15 +152,17 @@ EOF
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }
   then
-    libc_cv_s390x_staticpie_req=yes
+    libc_cv_s390x_staticpie_req_runtime=yes
   fi
   rm -rf conftest.*
 fi
 eval ac_res=\$\
-libc_cv_s390x_staticpie_req
+libc_cv_s390x_staticpie_req_runtime
 	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 printf "%s\n" "$ac_res" >&6; }
-if test $libc_cv_s390x_staticpie_req = yes; then
+
+if test $libc_cv_s390x_staticpie_req_runtime = yes \
+   || test $libc_cv_s390x_staticpie_req_version = yes; then
    # Static PIE is supported only on 64bit.
    # Ensure you also have those patches for:
    # - binutils (ld)
diff --git a/sysdeps/s390/s390-64/configure.ac b/sysdeps/s390/s390-64/configure.ac
index d009f108b1..4657de0d37 100644
--- a/sysdeps/s390/s390-64/configure.ac
+++ b/sysdeps/s390/s390-64/configure.ac
@@ -1,11 +1,39 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 # Local configure fragment for sysdeps/s390/s390-64.
 
+# Bypass result of runtime configure check for known linker versions as
+# e.g. crt-files or libc.so might not be available in bootstrapping
+# environments.
+case $($LD --version) in
+  "GNU gold"*)
+    # As of 2023-08-07, gold does not support static PIE due to
+    # Bug 22221 - add --no-dynamic-linker option
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=22221
+    libc_cv_s390x_staticpie_req_version=no
+    ;;
+  "LLD"*)
+    # As of 2023-08-07, there is no lld which supports s390x.
+    libc_cv_s390x_staticpie_req_version=no
+    ;;
+  *)
+    # The required binutils patches are available with bintuils 2.39
+    libc_cv_s390x_staticpie_req_version=yes
+    # Skip AC_CHECK_PROGS and just use the result from main configure.ac.
+    libc_cv_s390x_staticpie_req_LD=$LD
+    AC_CHECK_PROG_VER(libc_cv_s390x_staticpie_req_LD, $LD, --version,
+		      [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
+		      [2.1[0-9][0-9]*|2.39*|2.[4-9][0-9]*|[3-9].*|[1-9][0-9]*],
+		      libc_cv_s390x_staticpie_req_version=no)
+    ;;
+esac
+AC_MSG_CHECKING([for s390-specific static PIE requirements (version check)])
+AC_MSG_RESULT($libc_cv_s390x_staticpie_req_version)
+
 # Minimal checking for static PIE support in ld.
 # Compare to ld testcase/bugzilla:
 # <binutils-source>/ld/testsuite/ld-elf/pr22263-1.rd
-AC_CACHE_CHECK([for s390-specific static PIE requirements], \
-[libc_cv_s390x_staticpie_req], [dnl
+AC_CACHE_CHECK([for s390-specific static PIE requirements (runtime check)], \
+[libc_cv_s390x_staticpie_req_runtime], [dnl
   cat > conftest1.c <<EOF
 __thread int * foo;
 
@@ -27,16 +55,18 @@ main ()
   return 0;
 }
 EOF
-  libc_cv_s390x_staticpie_req=no
+  libc_cv_s390x_staticpie_req_runtime=no
   if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fPIE -c conftest1.c -o conftest1.o]) \
      && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -fPIE -c conftest2.c -o conftest2.o]) \
      && AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -o conftest conftest1.o conftest2.o]) \
      && AC_TRY_COMMAND([! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF])
   then
-    libc_cv_s390x_staticpie_req=yes
+    libc_cv_s390x_staticpie_req_runtime=yes
   fi
   rm -rf conftest.*])
-if test $libc_cv_s390x_staticpie_req = yes; then
+
+if test $libc_cv_s390x_staticpie_req_runtime = yes \
+   || test $libc_cv_s390x_staticpie_req_version = yes; then
    # Static PIE is supported only on 64bit.
    # Ensure you also have those patches for:
    # - binutils (ld)