about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--elf/rtld.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7629934aa7..62ce56d457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-01  Ondřej Bílka  <neleai@seznam.cz>
 
+	* elf/rtld.c: Remove unused NONTLS_INIT_TP.
+
+2013-11-01  Ondřej Bílka  <neleai@seznam.cz>
+
 	[BZ #16112]
 	* malloc/malloc (malloc_info): Do not handle first bin as
 	special case.
diff --git a/elf/rtld.c b/elf/rtld.c
index 51682f2177..c5a6538628 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2217,10 +2217,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
 	_dl_start_profile ();
     }
 
-#ifndef NONTLS_INIT_TP
-# define NONTLS_INIT_TP do { } while (0)
-#endif
-
   if (!was_tls_init_tp_called && GL(dl_tls_max_dtv_idx) > 0)
     ++GL(dl_tls_generation);