diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-06-20 10:40:02 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-06-20 14:34:06 +0200 |
| commit | 362588f7cc56354b3566a14dfbeb55ad74a9bd31 (patch) | |
| tree | 78b818d167d36edaa15f4f135049d22565bd3671 | |
| parent | 71dafdf5f19dd2b0729e4774149944911a405bc6 (diff) | |
| download | glibc-362588f7cc56354b3566a14dfbeb55ad74a9bd31.zip glibc-362588f7cc56354b3566a14dfbeb55ad74a9bd31.tar.gz glibc-362588f7cc56354b3566a14dfbeb55ad74a9bd31.tar.bz2 | |
s390x: Capture grep output in static PIE check
The test is not a run-time check, so update the description.
Also use readelf -W for a more stable output format and fix
an LC_ALL typo.
This avoids garbled configure messages:
checking for s390-specific static PIE requirements (runtime check)... 0x0000000000000017 (JMPREL) 0x280
yes
| -rw-r--r-- | sysdeps/s390/s390-64/configure | 8 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/configure.ac | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sysdeps/s390/s390-64/configure b/sysdeps/s390/s390-64/configure index 33c2861..9ea6940 100644 --- a/sysdeps/s390/s390-64/configure +++ b/sysdeps/s390/s390-64/configure @@ -4,8 +4,8 @@ # 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 (runtime check)" >&5 -printf %s "checking for s390-specific static PIE requirements (runtime check)... " >&6; } +{ 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; } if { as_var=\ libc_cv_s390x_staticpie_req_runtime; eval test \${$as_var+y}; } then : @@ -62,13 +62,13 @@ EOF ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } \ - && { ac_try='! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF' + && { ac_try='! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; } \ - && { ac_try='LC_ACLL=C $READELF -d conftest | grep JMPREL' + && { ac_try='LC_ALL=C $READELF -Wd conftest | grep JMPREL >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? diff --git a/sysdeps/s390/s390-64/configure.ac b/sysdeps/s390/s390-64/configure.ac index fd729e1..aaf71ea 100644 --- a/sysdeps/s390/s390-64/configure.ac +++ b/sysdeps/s390/s390-64/configure.ac @@ -4,7 +4,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # 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 (runtime check)], \ +AC_CACHE_CHECK([for s390-specific static PIE requirements], \ [libc_cv_s390x_staticpie_req_runtime], [dnl cat > conftest1.c <<EOF __thread int * foo; @@ -42,8 +42,8 @@ EOF 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 -static-pie -nostartfiles -nostdlib -fPIE -o conftest conftest1.o conftest2.o]) \ - && AC_TRY_COMMAND([! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF]) \ - && AC_TRY_COMMAND([LC_ACLL=C $READELF -d conftest | grep JMPREL]) + && AC_TRY_COMMAND([! LC_ALL=C $READELF -Wr conftest | grep R_390_TLS_TPOFF] >&AS_MESSAGE_LOG_FD) \ + && AC_TRY_COMMAND([LC_ALL=C $READELF -Wd conftest | grep JMPREL >&AS_MESSAGE_LOG_FD]) then libc_cv_s390x_staticpie_req_runtime=yes fi |