about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-iteratephdr.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 60adfb8611..ad1d327e12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-03  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/dl-iteratephdr.c (__dl_iterate_phdr): Remove unnecessary
+	assignment.
+
 2010-05-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* misc/mntent_r.c (encode_name): The slow loop handles newlines so we
diff --git a/elf/dl-iteratephdr.c b/elf/dl-iteratephdr.c
index fee19f3f04..44864c1b7a 100644
--- a/elf/dl-iteratephdr.c
+++ b/elf/dl-iteratephdr.c
@@ -1,5 +1,5 @@
 /* Get loaded objects program headers.
-   Copyright (C) 2001-2004, 2006-2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
 
@@ -68,7 +68,6 @@ __dl_iterate_phdr (int (*callback) (struct dl_phdr_info *info,
       info.dlpi_phnum = l->l_phnum;
       info.dlpi_adds = GL(dl_load_adds);
       info.dlpi_subs = GL(dl_load_adds) - nloaded;
-      info.dlpi_tls_modid = 0;
       info.dlpi_tls_data = NULL;
       info.dlpi_tls_modid = l->l_tls_modid;
       if (info.dlpi_tls_modid != 0)