diff mbox

Remove configure tests for some linker -z options

Message ID alpine.DEB.2.10.1511060018500.8571@digraph.polyomino.org.uk
State New
Headers show

Commit Message

Joseph Myers Nov. 6, 2015, 12:19 a.m. UTC
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).

2015-11-05  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.

Comments

Adhemerval Zanella Netto Nov. 6, 2015, 12:10 p.m. UTC | #1
On 05-11-2015 22:19, Joseph Myers wrote:
> 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).
> 
> 2015-11-05  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.
> 
> diff --git a/configure b/configure
> index 71800c6..01f5075 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 c3ebba3..3fdf992 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
> 

LGTM.
diff mbox

Patch

diff --git a/configure b/configure
index 71800c6..01f5075 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 c3ebba3..3fdf992 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