This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-151-gdb07e96
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 Jan 2010 15:25:07 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-151-gdb07e96
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via db07e962b6ea963dbb345439f6ab9b0cf74d87c5 (commit)
via 7a033a828df19b4f3bfd7e4d66102f63d1167f08 (commit)
from 64f388285e11812f041d3aa8347f82efde4033c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=db07e962b6ea963dbb345439f6ab9b0cf74d87c5
commit db07e962b6ea963dbb345439f6ab9b0cf74d87c5
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Jan 18 07:24:09 2010 -0800
Use correct type when casting d_tag.
diff --git a/ChangeLog b/ChangeLog
index 011f445..edfa44d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2010-01-18 Andreas Schwab <schwab@redhat.com>
+ * elf/dynamic-link.h (elf_get_dynamic_info): Use correct type when
+ casting d_tag.
+
* elf/dynamic-link.h (elf_get_dynamic_info): Ignore negative
dynamic entry types.
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index dff0655..6d7e142 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -103,6 +103,11 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
{
ElfW(Dyn) *dyn = l->l_ld;
ElfW(Dyn) **info;
+#if __ELF_NATIVE_CLASS == 32
+ typedef Elf32_Word d_tag_utype;
+#elif __ELF_NATIVE_CLASS == 64
+ typedef Elf64_Xword d_tag_utype;
+#endif
#ifndef RTLD_BOOTSTRAP
if (dyn == NULL)
@@ -113,20 +118,20 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
while (dyn->d_tag != DT_NULL)
{
- if ((Elf32_Word) dyn->d_tag < DT_NUM)
+ if ((d_tag_utype) dyn->d_tag < DT_NUM)
info[dyn->d_tag] = dyn;
else if (dyn->d_tag >= DT_LOPROC &&
dyn->d_tag < DT_LOPROC + DT_THISPROCNUM)
info[dyn->d_tag - DT_LOPROC + DT_NUM] = dyn;
- else if ((Elf32_Word) DT_VERSIONTAGIDX (dyn->d_tag) < DT_VERSIONTAGNUM)
+ else if ((d_tag_utype) DT_VERSIONTAGIDX (dyn->d_tag) < DT_VERSIONTAGNUM)
info[VERSYMIDX (dyn->d_tag)] = dyn;
- else if ((Elf32_Word) DT_EXTRATAGIDX (dyn->d_tag) < DT_EXTRANUM)
+ else if ((d_tag_utype) DT_EXTRATAGIDX (dyn->d_tag) < DT_EXTRANUM)
info[DT_EXTRATAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ DT_VERSIONTAGNUM] = dyn;
- else if ((Elf32_Word) DT_VALTAGIDX (dyn->d_tag) < DT_VALNUM)
+ else if ((d_tag_utype) DT_VALTAGIDX (dyn->d_tag) < DT_VALNUM)
info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
- else if ((Elf32_Word) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
+ else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
+ DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
++dyn;
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7a033a828df19b4f3bfd7e4d66102f63d1167f08
commit 7a033a828df19b4f3bfd7e4d66102f63d1167f08
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Jan 18 07:23:23 2010 -0800
Ignore negative dynamic entry types.
diff --git a/ChangeLog b/ChangeLog
index d1dcbad..011f445 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18 Andreas Schwab <schwab@redhat.com>
+
+ * elf/dynamic-link.h (elf_get_dynamic_info): Ignore negative
+ dynamic entry types.
+
2010-01-16 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ieee754/ldbl-128/s_ceill.c (huge): Add L suffix to the
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index c34cbcd..dff0655 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -113,7 +113,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
while (dyn->d_tag != DT_NULL)
{
- if (dyn->d_tag < DT_NUM)
+ if ((Elf32_Word) dyn->d_tag < DT_NUM)
info[dyn->d_tag] = dyn;
else if (dyn->d_tag >= DT_LOPROC &&
dyn->d_tag < DT_LOPROC + DT_THISPROCNUM)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
elf/dynamic-link.h | 15 ++++++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources