yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binutils/Dwarf: avoid "shadowing" of glibc function name

Browse Source 
As before: Old enough glibc has an (unguarded) declaration of index()
in string.h, which triggers a "shadows a global declaration" warning.
This commit is contained in:
Jan Beulich 2022-08-05 12:48:17 +02:00
parent 8005415fe9
commit 188bc85476
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
binutils/dwarf.c
View File

@ -2773,7 +2773,7 @@ read_and_display_attr_value (unsigned long attribute,
case DW_FORM_rnglistx:
if (!do_loc)
{
dwarf_vma base, index;
dwarf_vma base, idx;
const char *suffix = strrchr (section->name, '.');
bool dwo = suffix && strcmp (suffix, ".dwo") == 0;
@ -2781,29 +2781,29 @@ read_and_display_attr_value (unsigned long attribute,
{
if (dwo)
{
index = fetch_indexed_value (uvalue, loclists_dwo, 0);
index += (offset_size == 8) ? 20 : 12;
idx = fetch_indexed_value (uvalue, loclists_dwo, 0);
idx += (offset_size == 8) ? 20 : 12;
}
else if (debug_info_p == NULL)
{
index = fetch_indexed_value (uvalue, loclists, 0);
idx = fetch_indexed_value (uvalue, loclists, 0);
}
else
{
/* We want to compute:
index = fetch_indexed_value (uvalue, loclists, debug_info_p->loclists_base);
index += debug_info_p->loclists_base;
idx = fetch_indexed_value (uvalue, loclists, debug_info_p->loclists_base);
idx += debug_info_p->loclists_base;
Fortunately we already have that sum cached in the
loc_offsets array. */
index = debug_info_p->loc_offsets [uvalue];
idx = debug_info_p->loc_offsets [uvalue];
}
}
else if (form == DW_FORM_rnglistx)
{
if (dwo)
{
index = fetch_indexed_value (uvalue, rnglists_dwo, 0);
index += (offset_size == 8) ? 20 : 12;
idx = fetch_indexed_value (uvalue, rnglists_dwo, 0);
idx += (offset_size == 8) ? 20 : 12;
}
else
{
@ -2813,8 +2813,8 @@ read_and_display_attr_value (unsigned long attribute,
base = debug_info_p->rnglists_base;
/* We do not have a cached value this time, so we perform the
computation manually. */
index = fetch_indexed_value (uvalue, rnglists, base);
index += base;
idx = fetch_indexed_value (uvalue, rnglists, base);
idx += base;
}
}
else
@ -2827,13 +2827,13 @@ read_and_display_attr_value (unsigned long attribute,
base = debug_info_p->addr_base;
base += uvalue * pointer_size;
index = fetch_indexed_addr (base, pointer_size);
idx = fetch_indexed_addr (base, pointer_size);
}
/* We have already displayed the form name. */
printf (_("%c(index: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
dwarf_vmatoa ("x", index));
dwarf_vmatoa ("x", idx));
}
break;