Skip to content

Commit

Permalink
bfd, binutils, gas: Remove/mark unused variables
Browse files Browse the repository at this point in the history
Clang generates a warning on unused (technically, written but not read
thereafter) variables.  By the default configuration (with "-Werror"), it
causes a build failure (unless "--disable-werror" is specified).

This commit adds ATTRIBUTE_UNUSED attribute to some of them, which means
they are *possibly* unused (can be used but no warnings occur when
unused) and removes others.

bfd/ChangeLog:

	* elf32-lm32.c (lm32_elf_size_dynamic_sections): Mark unused
	rgot_count variable.
	* elf32-nds32.c (elf32_nds32_unify_relax_group): Remove unused
	count variable.
	* mmo.c (mmo_scan): Mark unused lineno variable.

binutils/ChangeLog:

	* windmc.c (write_rc): Remove unused i variable.

gas/ChangeLog:

	* config/tc-riscv.c (riscv_ip): Remove unused argnum variable.

ld/ChangeLog:

	* pe-dll.c (generate_reloc): Remove unused bi and page_count
	variables.
  • Loading branch information
a4lg committed Sep 15, 2022
1 parent fe39ffd commit d0975d8
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 18 deletions.
2 changes: 1 addition & 1 deletion bfd/elf32-lm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -2067,7 +2067,7 @@ lm32_elf_size_dynamic_sections (bfd *output_bfd,
struct weak_symbol_list *list_start = NULL, *list_end = NULL;
int rgot_weak_count = 0;
int r32_count = 0;
int rgot_count = 0;
int rgot_count ATTRIBUTE_UNUSED = 0;
/* Look for deleted sections. */
for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
{
Expand Down
3 changes: 0 additions & 3 deletions bfd/elf32-nds32.c
Original file line number Diff line number Diff line change
Expand Up @@ -13460,7 +13460,6 @@ elf32_nds32_unify_relax_group (bfd *abfd, asection *asec)
Elf_Internal_Rela *relocs = NULL;
enum elf_nds32_reloc_type rtype;
struct section_id_list_t *node = NULL;
int count = 0;

do
{
Expand Down Expand Up @@ -13499,8 +13498,6 @@ elf32_nds32_unify_relax_group (bfd *abfd, asection *asec)

/* Change it. */
rel->r_addend += relax_group_ptr->bias;
/* Debugging count. */
count++;
}
}
while (false);
Expand Down
2 changes: 1 addition & 1 deletion bfd/mmo.c
Original file line number Diff line number Diff line change
Expand Up @@ -1602,7 +1602,7 @@ static bool
mmo_scan (bfd *abfd)
{
unsigned int i;
unsigned int lineno = 1;
unsigned int lineno ATTRIBUTE_UNUSED = 1;
bool error = false;
bfd_vma vma = 0;
asection *sec = NULL;
Expand Down
4 changes: 1 addition & 3 deletions binutils/windmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,20 +765,18 @@ static void
write_rc (FILE *fp)
{
mc_node_lang *n;
int i, l;
int l;

fprintf (fp,
"/* Do not edit this file manually.\n"
" This file is autogenerated by windmc. */\n\n");
if (! mc_nodes_lang_count)
return;
n = NULL;
i = 0;
for (l = 0; l < mc_nodes_lang_count; l++)
{
if (n && n->lang == mc_nodes_lang[l]->lang)
continue;
++i;
n = mc_nodes_lang[l];
fprintf (fp, "\n// Country: %s\n// Language: %s\n#pragma code_page(%u)\n",
n->lang->lang_info.country, n->lang->lang_info.name,
Expand Down
3 changes: 0 additions & 3 deletions gas/config/tc-riscv.c
Original file line number Diff line number Diff line change
Expand Up @@ -2303,7 +2303,6 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
char save_c = 0;
struct riscv_opcode *insn;
unsigned int regno;
int argnum;
const struct percent_op_match *p;
struct riscv_ip_error error;
error.msg = "unrecognized opcode";
Expand Down Expand Up @@ -2341,7 +2340,6 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
error.msg = _("illegal operands");
error.missing_ext = NULL;
create_insn (ip, insn);
argnum = 1;

imm_expr->X_op = O_absent;
*imm_reloc = BFD_RELOC_UNUSED;
Expand Down Expand Up @@ -2859,7 +2857,6 @@ riscv_ip (char *str, struct riscv_cl_insn *ip, expressionS *imm_expr,
break; /* end RVV */

case ',':
++argnum;
if (*asarg++ == *oparg)
continue;
asarg--;
Expand Down
9 changes: 2 additions & 7 deletions ld/pe-dll.c
Original file line number Diff line number Diff line change
Expand Up @@ -1510,8 +1510,7 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
int total_relocs = 0;
int i;
bfd_vma sec_page = (bfd_vma) -1;
bfd_vma page_ptr, page_count;
int bi;
bfd_vma page_ptr;
bfd *b;
struct bfd_section *s;

Expand All @@ -1525,8 +1524,7 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
reloc_data = xmalloc (total_relocs * sizeof (reloc_data_type));

total_relocs = 0;
bi = 0;
for (bi = 0, b = info->input_bfds; b; bi++, b = b->link.next)
for (b = info->input_bfds; b; b = b->link.next)
{
arelent **relocs;
int relsize, nrelocs;
Expand Down Expand Up @@ -1721,7 +1719,6 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
sec_page = (bfd_vma) -1;
reloc_sz = 0;
page_ptr = (bfd_vma) -1;
page_count = 0;

for (i = 0; i < total_relocs; i++)
{
Expand All @@ -1740,7 +1737,6 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
page_ptr = reloc_sz;
reloc_sz += 8;
sec_page = this_page;
page_count = 0;
}

bfd_put_16 (abfd, (rva & 0xfff) + (reloc_data[i].type << 12),
Expand All @@ -1753,7 +1749,6 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info)
reloc_sz += 2;
}

page_count++;
}

while (reloc_sz & 3)
Expand Down

0 comments on commit d0975d8

Please sign in to comment.