From 858b189f82ecc32ca7042e74ccb022f794a9f83b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 17 Jul 2006 08:41:15 +0000 Subject: [PATCH] 2006-07-17 Roland McGrath * elflint.c (struct version_namelist): Use GElf_Versym for `ndx' field. (add_version): Likewise for argument. (check_versym): Cast constant to GElf_Versym for comparison. --- src/ChangeLog | 6 ++++++ src/elflint.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 358de01f8..90fce1dcd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2006-07-17 Roland McGrath + + * elflint.c (struct version_namelist): Use GElf_Versym for `ndx' field. + (add_version): Likewise for argument. + (check_versym): Cast constant to GElf_Versym for comparison. + 2006-07-12 Roland McGrath * readelf.c (handle_gnu_hash): Add casts for machines where diff --git a/src/elflint.c b/src/elflint.c index 23dae4eb2..c3e08512f 100644 --- a/src/elflint.c +++ b/src/elflint.c @@ -2361,14 +2361,14 @@ static struct version_namelist { const char *objname; const char *name; - GElf_Word ndx; + GElf_Versym ndx; enum { ver_def, ver_need } type; struct version_namelist *next; } *version_namelist; static int -add_version (const char *objname, const char *name, GElf_Word ndx, int type) +add_version (const char *objname, const char *name, GElf_Versym ndx, int type) { /* Check that there are no duplications. */ struct version_namelist *nlp = version_namelist; @@ -2480,7 +2480,7 @@ section [%2d] '%s': symbol %d: local symbol with version\n"), index we need for this symbol. */ struct version_namelist *runp = version_namelist; while (runp != NULL) - if (runp->ndx == (*versym & 0x7fff)) + if (runp->ndx == (*versym & (GElf_Versym) 0x7fff)) break; else runp = runp->next; -- 2.47.2