diff options
| author | Fangrui Song <maskray@google.com> | 2022-04-04 17:19:07 -0700 |
|---|---|---|
| committer | Fangrui Song <maskray@google.com> | 2022-04-04 17:19:07 -0700 |
| commit | 3ee318c9233ce77dee099f2830e8e29a0c572ca7 (patch) | |
| tree | 06a550c27bc52f0edab75f7f900ef32112a7eae2 /configure | |
| parent | 1c225a2dd16f20d7fb04157b4ac8a3f284bd686a (diff) | |
| download | glibc-3ee318c9233ce77dee099f2830e8e29a0c572ca7.tar.gz glibc-3ee318c9233ce77dee099f2830e8e29a0c572ca7.tar.xz glibc-3ee318c9233ce77dee099f2830e8e29a0c572ca7.zip | |
Remove -z combreloc and HAVE_Z_COMBRELOC
-z combreloc has been the default regadless of the architecture since binutils commit f4d733664aabd7bd78c82895e030ec9779a92809 (2002). The configure check added in commit fdde83499a05 (2001) has long been unneeded. We can therefore treat HAVE_Z_COMBRELOC as always 1 and delete dead code paths in dl-machine.h files (many were copied from commit a711b01d34ca and ee0cb67ec238). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/configure b/configure index 2a3cb49b0b..d2f413d05d 100755 --- a/configure +++ b/configure @@ -625,7 +625,6 @@ libc_cv_has_glob_dat libc_cv_hashstyle libc_cv_fpie libc_cv_z_execstack -libc_cv_z_combreloc ASFLAGS_config libc_cv_cc_with_libunwind libc_cv_insert @@ -5967,44 +5966,6 @@ if test $libc_cv_as_noexecstack = yes; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -z combreloc" >&5 -$as_echo_n "checking for -z combreloc... " >&6; } -if ${libc_cv_z_combreloc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.c <<EOF -extern int bar (int); -extern int mumble; -int foo (void) { return bar (mumble); } -EOF -if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -fPIC -shared $no_ssp -o conftest.so conftest.c - -nostdlib -nostartfiles - -Wl,-z,combreloc 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then - if $READELF -S conftest.so | grep -E '.rela?.dyn' > /dev/null; then - libc_cv_z_combreloc=yes - else - libc_cv_z_combreloc=no - fi -else - libc_cv_z_combreloc=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_z_combreloc" >&5 -$as_echo "$libc_cv_z_combreloc" >&6; } -if test "$libc_cv_z_combreloc" = yes; then - $as_echo "#define HAVE_Z_COMBRELOC 1" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z execstack" >&5 $as_echo_n "checking for linker that supports -z execstack... " >&6; } libc_linker_feature=no |