* readelf.c (process_version_sections, process_symbol_table):

Use symbolic constants.
This commit is contained in:
Nick Clifton
2009-09-14 12:29:50 +00:00
parent df58f7b0bf
commit c244d0505e
2 changed files with 12 additions and 7 deletions

@ -1,3 +1,8 @@
2009-09-11 Paul Pluzhnikov <ppluzhnikov@google.com>
* readelf.c (process_version_sections, process_symbol_table):
Use symbolic constants.
2009-09-11 Nick Clifton <nickc@redhat.com> 2009-09-11 Nick Clifton <nickc@redhat.com>
* po/binutils.pot: Updated by the Translation project. * po/binutils.pot: Updated by the Translation project.

@ -6852,8 +6852,8 @@ process_version_sections (FILE * file)
break; break;
default: default:
nn = printf ("%4x%c", data[cnt + j] & 0x7fff, nn = printf ("%4x%c", data[cnt + j] & VERSYM_VERSION,
data[cnt + j] & 0x8000 ? 'h' : ' '); data[cnt + j] & VERSYM_HIDDEN ? 'h' : ' ');
check_def = 1; check_def = 1;
check_need = 1; check_need = 1;
@ -6947,10 +6947,10 @@ process_version_sections (FILE * file)
offset += ivd.vd_next; offset += ivd.vd_next;
} }
while (ivd.vd_ndx != (data[cnt + j] & 0x7fff) while (ivd.vd_ndx != (data[cnt + j] & VERSYM_VERSION)
&& ivd.vd_next != 0); && ivd.vd_next != 0);
if (ivd.vd_ndx == (data[cnt + j] & 0x7fff)) if (ivd.vd_ndx == (data[cnt + j] & VERSYM_VERSION))
{ {
Elf_External_Verdaux evda; Elf_External_Verdaux evda;
Elf_Internal_Verdaux ivda; Elf_Internal_Verdaux ivda;
@ -7564,7 +7564,7 @@ process_symbol_table (FILE * file)
check_def = (psym->st_shndx != SHN_UNDEF); check_def = (psym->st_shndx != SHN_UNDEF);
if ((vers_data & 0x8000) || vers_data > 1) if ((vers_data & VERSYM_HIDDEN) || vers_data > 1)
{ {
if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)] if (version_info[DT_VERSIONTAGIDX (DT_VERNEED)]
&& (is_nobits || ! check_def)) && (is_nobits || ! check_def))
@ -7656,7 +7656,7 @@ process_symbol_table (FILE * file)
offset += ivd.vd_next; offset += ivd.vd_next;
} }
while (ivd.vd_ndx != (vers_data & 0x7fff) while (ivd.vd_ndx != (vers_data & VERSYM_VERSION)
&& ivd.vd_next != 0); && ivd.vd_next != 0);
offset -= ivd.vd_next; offset -= ivd.vd_next;
@ -7668,7 +7668,7 @@ process_symbol_table (FILE * file)
ivda.vda_name = BYTE_GET (evda.vda_name); ivda.vda_name = BYTE_GET (evda.vda_name);
if (psym->st_name != ivda.vda_name) if (psym->st_name != ivda.vda_name)
printf ((vers_data & 0x8000) printf ((vers_data & VERSYM_HIDDEN)
? "@%s" : "@@%s", ? "@%s" : "@@%s",
ivda.vda_name < strtab_size ivda.vda_name < strtab_size
? strtab + ivda.vda_name : "<corrupt>"); ? strtab + ivda.vda_name : "<corrupt>");