Move setting variable in relro data earlier in ld.so.

(cherry picked from commit e23fe25b33324a9ea992276c1a4f04127bf9ba4b)

diff --git a/ChangeLog b/ChangeLog
index a9a37e88f0473d3efeef4570f547df203dfbcbe2..bf85164756123d7c9afccfa89d52bcec70c99170 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-28  Andreas Schwab  <schwab@redhat.com>
+           Ulrich Drepper  <drepper@gmail.com>
+
+       [BZ #12489]
+       * elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
+       before performing relro protection.  At old place add assertion
+       to make sure nothing changed.
+
 2011-04-08  Andreas Schwab  <schwab@linux-m68k.org>
 
        * sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c: