summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-11-25 17:05:53 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-11-25 17:05:53 +0100
commitc679db43525555f6a1d3831bfac8ca9cc69977cf (patch)
treee4f1fcdd1f9b4e9cb795abed3940b7143fc56042
parentd1e815ed25625c1412ffcd9ceaf7c860c69dbf40 (diff)
downloadglibc-c679db43525555f6a1d3831bfac8ca9cc69977cf.tar.gz
glibc-c679db43525555f6a1d3831bfac8ca9cc69977cf.tar.xz
glibc-c679db43525555f6a1d3831bfac8ca9cc69977cf.zip
Do not add relro attribute to __libc_stack_end
It does not actually work yet

* sysdeps/mach/hurd/dl-sysdep.c (__libc_stack_end): Remove relro attribute.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 77bf20fce8..f00417f8c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,8 @@
 	* sysdeps/i386/setjmp.S (__sigsetjmp): Add hidden_def.
 	* sysdeps/mach/hurd/accept4.c (__libc_accept4): Remove
 	libc_hidden_def.
-	* sysdeps/mach/hurd/dl-sysdep.c (__libc_stack_end): Add relro
-	attribute, define rtld_hidden_data_def.
+	* sysdeps/mach/hurd/dl-sysdep.c (__libc_stack_end): Define
+	rtld_hidden_data_def.
 	* sysdeps/mach/hurd/fxstatat64.c (__fxstatat64): Add libc_hidden_def.
 	* sysdeps/mach/hurd/if_index.c (__if_freenameindex): Add
 	libc_hidden_def.
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index 7b3c56961d..222eece697 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -55,7 +55,7 @@ rtld_hidden_data_def (__libc_enable_secure)
 int __libc_multiple_libcs = 0;	/* Defining this here avoids the inclusion
 				   of init-first.  */
 /* This variable contains the lowest stack address ever used.  */
-void *__libc_stack_end attribute_relro = NULL;
+void *__libc_stack_end;
 rtld_hidden_data_def(__libc_stack_end)
 
 #if HP_TIMING_AVAIL