about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-11-06 13:20:26 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-11-06 13:21:51 +0000
commitb9eaf28a640bdfbfbad55cdfe0361339664ab8ba (patch)
tree8cd6d06fc7ac783f43e614dbf33d974772e2bb49
parent8c77b6ad4063534fb1e5a6904217c4586060334a (diff)
downloadglibc-b9eaf28a640bdfbfbad55cdfe0361339664ab8ba.tar.gz
glibc-b9eaf28a640bdfbfbad55cdfe0361339664ab8ba.tar.xz
glibc-b9eaf28a640bdfbfbad55cdfe0361339664ab8ba.zip
Remove configure tests for some linker -z options.
There are configure tests for the linker -z nodelete, -z nodlopen and
-z initfirst options.  These options were added in binutils 2.11, so
the tests are obsolete; this patch removes them.

Tested for x86_64 and x86 (testsuite, and that installed shared
libraries are unchanged by the patch).

	* configure.ac (libc_cv_z_nodelete): Remove configure test.
	(libc_cv_z_nodlopen): Likewise.
	(libc_cv_z_initfirst): Likewise.
	* configure: Regenerated.
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure96
-rw-r--r--configure.ac12
3 files changed, 7 insertions, 108 deletions
diff --git a/ChangeLog b/ChangeLog
index 957acd1aeb..1af65b834c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (libc_cv_z_nodelete): Remove configure test.
+	(libc_cv_z_nodlopen): Likewise.
+	(libc_cv_z_initfirst): Likewise.
+	* configure: Regenerated.
+
 2015-11-06  Florian Weimer  <fweimer@redhat.com>
 
 	Simplify abilist format to be line-based.
diff --git a/configure b/configure
index 71800c6b57..01f5075767 100755
--- a/configure
+++ b/configure
@@ -5472,102 +5472,6 @@ if test $libc_cv_cc_with_libunwind = yes; then
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z nodelete" >&5
-$as_echo_n "checking for linker that supports -z nodelete... " >&6; }
-libc_linker_feature=no
-if test x"$gnu_ld" = x"yes"; then
-  libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z nodelete"`
-  if test -n "$libc_linker_check"; then
-    cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-    if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-				-Wl,--enable-new-dtags,-z,nodelete -nostdlib -nostartfiles
-				-fPIC -shared -o conftest.so conftest.c
-				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
-      libc_linker_feature=yes
-    fi
-    rm -f conftest*
-  fi
-fi
-if test $libc_linker_feature = yes; then
-  libc_cv_z_nodelete=yes
-else
-  as_fn_error $? "linker with -z nodelete support required" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
-$as_echo "$libc_linker_feature" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z nodlopen" >&5
-$as_echo_n "checking for linker that supports -z nodlopen... " >&6; }
-libc_linker_feature=no
-if test x"$gnu_ld" = x"yes"; then
-  libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z nodlopen"`
-  if test -n "$libc_linker_check"; then
-    cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-    if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-				-Wl,--enable-new-dtags,-z,nodlopen -nostdlib -nostartfiles
-				-fPIC -shared -o conftest.so conftest.c
-				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
-      libc_linker_feature=yes
-    fi
-    rm -f conftest*
-  fi
-fi
-if test $libc_linker_feature = yes; then
-  libc_cv_z_nodlopen=yes
-else
-  as_fn_error $? "linker with -z nodlopen support required" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
-$as_echo "$libc_linker_feature" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker that supports -z initfirst" >&5
-$as_echo_n "checking for linker that supports -z initfirst... " >&6; }
-libc_linker_feature=no
-if test x"$gnu_ld" = x"yes"; then
-  libc_linker_check=`$LD -v --help 2>/dev/null | grep "\-z initfirst"`
-  if test -n "$libc_linker_check"; then
-    cat > conftest.c <<EOF
-int _start (void) { return 42; }
-EOF
-    if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-				-Wl,--enable-new-dtags,-z,initfirst -nostdlib -nostartfiles
-				-fPIC -shared -o conftest.so conftest.c
-				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
-      libc_linker_feature=yes
-    fi
-    rm -f conftest*
-  fi
-fi
-if test $libc_linker_feature = yes; then
-  libc_cv_z_initfirst=yes
-else
-  as_fn_error $? "linker with -z initfirst support required" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_linker_feature" >&5
-$as_echo "$libc_linker_feature" >&6; }
-
 ASFLAGS_config=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether --noexecstack is desirable for .S files" >&5
 $as_echo_n "checking whether --noexecstack is desirable for .S files... " >&6; }
diff --git a/configure.ac b/configure.ac
index c3ebba3918..3fdf992f79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1208,18 +1208,6 @@ if test $libc_cv_cc_with_libunwind = yes; then
   AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
 fi
 
-LIBC_LINKER_FEATURE([-z nodelete], [-Wl,--enable-new-dtags,-z,nodelete],
-		    [libc_cv_z_nodelete=yes],
-		    [AC_MSG_ERROR(linker with -z nodelete support required)])
-
-LIBC_LINKER_FEATURE([-z nodlopen], [-Wl,--enable-new-dtags,-z,nodlopen],
-		    [libc_cv_z_nodlopen=yes],
-		    [AC_MSG_ERROR(linker with -z nodlopen support required)])
-
-LIBC_LINKER_FEATURE([-z initfirst], [-Wl,--enable-new-dtags,-z,initfirst],
-		    [libc_cv_z_initfirst=yes],
-		    [AC_MSG_ERROR(linker with -z initfirst support required)])
-
 ASFLAGS_config=
 AC_CACHE_CHECK(whether --noexecstack is desirable for .S files,
 	       libc_cv_as_noexecstack, [dnl