lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-04 03:22:14 +03:00
Code Activity

Update.

Browse Source 
2004-09-20  Jakub Jelinek  <jakub@redhat.com>

	* configure.in (libc_cv_z_relro): Only set to yes if linker script
	contains DATA_SEGMENT_RELRO_END.
This commit is contained in:
Ulrich Drepper
2004-09-20 14:47:18 +00:00
parent efec50797a
commit 54beacabbe
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2004-09-20 Jakub Jelinek <jakub@redhat.com>
* configure.in (libc_cv_z_relro): Only set to yes if linker script
contains DATA_SEGMENT_RELRO_END.
2004-09-20 Ulrich Drepper <drepper@redhat.com> 2004-09-20 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_map_object_from_fd): Add some error checking. * elf/dl-load.c (_dl_map_object_from_fd): Add some error checking.

15
configure vendored
View File

@@ -5549,16 +5549,23 @@ echo $ECHO_N "checking for -z relro option... $ECHO_C" >&6
if test "${libc_cv_z_relro+set}" = set; then if test "${libc_cv_z_relro+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
if { ac_try='${CC-cc} -v --help 2>&1|grep "z relro" 1>&5' libc_cv_z_relro=no
if { ac_try='${CC-cc} -v --help 2>&1|grep "z relro" 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } (exit $ac_status); }; }
then then
libc_cv_z_relro=yes if { ac_try='${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&5'
else { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
libc_cv_z_relro=no (eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }
then
libc_cv_z_relro=yes
fi
fi fi
fi fi
echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5 echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5

8
configure.in
View File

@@ -1325,11 +1325,13 @@ EOF
AC_CACHE_CHECK(for -z relro option, AC_CACHE_CHECK(for -z relro option,
libc_cv_z_relro, [dnl libc_cv_z_relro, [dnl
libc_cv_z_relro=no
if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD]) if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_z_relro=yes if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&AS_MESSAGE_LOG_FD])
else then
libc_cv_z_relro=no libc_cv_z_relro=yes
fi
fi]) fi])
AC_SUBST(libc_cv_z_relro) AC_SUBST(libc_cv_z_relro)
if test $libc_cv_z_relro = yes; then if test $libc_cv_z_relro = yes; then