Restore GL(dl_initial_dtv)

diff --git a/ChangeLog b/ChangeLog
index e259fabbbfc6c8631e6df128910b941c3e836887..f8ccb686b0b260e7bb44434734e3d32b050d718e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf/dl-tls.c (DL_INITIAL_DTV): Removed.
+       (_dl_initial_dtv): New.  Defined if SHARED isn't defined.
+       (_dl_deallocate_tls): Restore GL(dl_initial_dtv).
+
 2012-09-06  H.J. Lu  <hongjiu.lu@intel.com>
 
        * csu/libc-tls.c (static_dtv): Renamed to ...

diff --git a/elf/dl-tls.c b/elf/dl-tls.c
index 9d896b7bdd891dd6db2102b9055b9037244874f3..c3a3d68f931846cbf90af223e5b1c63ec32e7036 100644 (file)
--- a/elf/dl-tls.c
+++ b/elf/dl-tls.c
@@ -466,9 +466,7 @@ rtld_hidden_def (_dl_allocate_tls)
 
 #ifndef SHARED
 extern dtv_t _dl_static_dtv[];
-# define DL_INITIAL_DTV        (&_dl_static_dtv[1])
-#else
-# define DL_INITIAL_DTV        GL(dl_initial_dtv)
+# define _dl_initial_dtv (&_dl_static_dtv[1])
 #endif
 
 void
@@ -484,7 +482,7 @@ _dl_deallocate_tls (void *tcb, bool dealloc_tcb)
       free (dtv[1 + cnt].pointer.val);
 
   /* The array starts with dtv[-1].  */
-  if (dtv != DL_INITIAL_DTV)
+  if (dtv != GL(dl_initial_dtv))
     free (dtv - 1);
 
   if (dealloc_tcb)