OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ld/plugins: avoid shadowing a C library symbol 

With my (oldish) gcc/glibc combination I'm seeing

.../ld/plugin.c: In function ‘get_lto_kind’:
.../ld/plugin.c:664: error: declaration of ‘index’ shadows a global declaration
/usr/include/string.h:487: error: shadowed declaration is here
.../ld/plugin.c: In function ‘get_lto_resolution’:
.../ld/plugin.c:685: error: declaration of ‘index’ shadows a global declaration
/usr/include/string.h:487: error: shadowed declaration is here
.../ld/plugin.c: In function ‘get_lto_visibility’:
.../ld/plugin.c:711: error: declaration of ‘index’ shadows a global declaration
/usr/include/string.h:487: error: shadowed declaration is here
This commit is contained in:
Jan Beulich 2019-06-25 12:02:23 +02:00 committed by Jan Beulich
parent ab9f654ca3
commit 8e5cb9a54e
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2019-06-25 Jan Beulich <jbeulich@suse.com>
* plugin.c (get_lto_kind, get_lto_resolution,
get_lto_visibility): Rename "index" to "idx".
2019-06-24 H.J. Lu <hongjiu.lu@intel.com>
PR ld/24721

30
ld/plugin.c
View File

@ -659,9 +659,9 @@ is_visible_from_outside (struct ld_plugin_symbol *lsym,
return FALSE;
}
/* Return LTO kind string name that corresponds to INDEX enum value. */
/* Return LTO kind string name that corresponds to IDX enum value. */
static const char *
get_lto_kind (unsigned int index)
get_lto_kind (unsigned int idx)
{
static char buffer[64];
const char *lto_kind_str[5] =
@ -673,16 +673,16 @@ get_lto_kind (unsigned int index)
"COMMON"
};
if (index < ARRAY_SIZE (lto_kind_str))
return lto_kind_str [index];
if (idx < ARRAY_SIZE (lto_kind_str))
return lto_kind_str [idx];
sprintf (buffer, _("unknown LTO kind value %x"), index);
sprintf (buffer, _("unknown LTO kind value %x"), idx);
return buffer;
}
/* Return LTO resolution string name that corresponds to INDEX enum value. */
/* Return LTO resolution string name that corresponds to IDX enum value. */
static const char *
get_lto_resolution (unsigned int index)
get_lto_resolution (unsigned int idx)
{
static char buffer[64];
static const char *lto_resolution_str[10] =
@ -699,16 +699,16 @@ get_lto_resolution (unsigned int index)
"PREVAILING_DEF_IRONLY_EXP",
};
if (index < ARRAY_SIZE (lto_resolution_str))
return lto_resolution_str [index];
if (idx < ARRAY_SIZE (lto_resolution_str))
return lto_resolution_str [idx];
sprintf (buffer, _("unknown LTO resolution value %x"), index);
sprintf (buffer, _("unknown LTO resolution value %x"), idx);
return buffer;
}
/* Return LTO visibility string name that corresponds to INDEX enum value. */
/* Return LTO visibility string name that corresponds to IDX enum value. */
static const char *
get_lto_visibility (unsigned int index)
get_lto_visibility (unsigned int idx)
{
static char buffer[64];
const char *lto_visibility_str[4] =
@ -719,10 +719,10 @@ get_lto_visibility (unsigned int index)
"HIDDEN"
};
if (index < ARRAY_SIZE (lto_visibility_str))
return lto_visibility_str [index];
if (idx < ARRAY_SIZE (lto_visibility_str))
return lto_visibility_str [idx];
sprintf (buffer, _("unknown LTO visibility value %x"), index);
sprintf (buffer, _("unknown LTO visibility value %x"), idx);
return buffer;
}