aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@mips.com>2018-02-13 12:56:29 +0000
committerMaciej W. Rozycki <macro@mips.com>2018-02-13 12:56:29 +0000
commit87993319a56af838d3ab7e251fa4902476ca63c8 (patch)
tree5823b2b0d05f2a012923b8c693a850d3914eef7c /bfd
parent30147392ca2b686b17e022a9cf8bbbddae785ff1 (diff)
downloadgdb-87993319a56af838d3ab7e251fa4902476ca63c8.zip
gdb-87993319a56af838d3ab7e251fa4902476ca63c8.tar.gz
gdb-87993319a56af838d3ab7e251fa4902476ca63c8.tar.bz2
WebAssembly: Correct an `index' global shadowing error for pre-4.8 GCC
Remove `-Wshadow' compilation errors: cc1: warnings being treated as errors .../bfd/wasm-module.c: In function 'wasm_scan_name_function_section': .../bfd/wasm-module.c:312: error: declaration of 'index' shadows a global declaration /usr/include/string.h:303: error: shadowed declaration is here .../bfd/wasm-module.c: In function 'wasm_register_section': .../bfd/wasm-module.c:494: error: declaration of 'index' shadows a global declaration /usr/include/string.h:303: error: shadowed declaration is here .../bfd/wasm-module.c: In function 'wasm_compute_custom_section_file_position': .../bfd/wasm-module.c:523: error: declaration of 'index' shadows a global declaration /usr/include/string.h:303: error: shadowed declaration is here and: cc1: warnings being treated as errors .../opcodes/wasm32-dis.c: In function 'print_insn_wasm32': .../opcodes/wasm32-dis.c:272: error: declaration of 'index' shadows a global declaration /usr/include/string.h:303: error: shadowed declaration is here make[4]: *** [wasm32-dis.lo] Error 1 which for versions of GCC before 4.8 prevent support for the WebAssembly target from being built. See also GCC PR c/53066. bfd/ * wasm-module.c (wasm_scan_name_function_section): Rename `index' local variable to `idx'. opcodes/ * wasm32-dis.c (print_insn_wasm32): Rename `index' local variable to `function_index'.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/wasm-module.c18
2 files changed, 14 insertions, 9 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 35fc174..6b9e1d1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-13 Maciej W. Rozycki <macro@mips.com>
+
+ * wasm-module.c (wasm_scan_name_function_section): Rename
+ `index' local variable to `idx'.
+
2018-02-13 Alan Modra <amodra@gmail.com>
PR 22836
diff --git a/bfd/wasm-module.c b/bfd/wasm-module.c
index 7525e63..2d5822d 100644
--- a/bfd/wasm-module.c
+++ b/bfd/wasm-module.c
@@ -309,12 +309,12 @@ wasm_scan_name_function_section (bfd *abfd, sec_ptr asect)
for (symcount = 0; p < end && symcount < tdata->symcount; symcount++)
{
- bfd_vma index;
+ bfd_vma idx;
bfd_vma len;
char *name;
asymbol *sym;
- READ_LEB128 (index, p, end);
+ READ_LEB128 (idx, p, end);
READ_LEB128 (len, p, end);
if (p + len < p || p + len > end)
@@ -330,7 +330,7 @@ wasm_scan_name_function_section (bfd *abfd, sec_ptr asect)
sym = &symbols[symcount];
sym->the_bfd = abfd;
sym->name = name;
- sym->value = index;
+ sym->value = idx;
sym->flags = BSF_GLOBAL | BSF_FUNCTION;
sym->section = space_function_index;
sym->udata.p = NULL;
@@ -491,12 +491,12 @@ wasm_register_section (bfd *abfd ATTRIBUTE_UNUSED,
void *fsarg)
{
sec_ptr *numbered_sections = fsarg;
- int index = wasm_section_name_to_code (asect->name);
+ int idx = wasm_section_name_to_code (asect->name);
- if (index == 0)
+ if (idx == 0)
return;
- numbered_sections[index] = asect;
+ numbered_sections[idx] = asect;
}
struct compute_section_arg
@@ -520,14 +520,14 @@ wasm_compute_custom_section_file_position (bfd *abfd,
void *fsarg)
{
struct compute_section_arg *fs = fsarg;
- int index;
+ int idx;
if (fs->failed)
return;
- index = wasm_section_name_to_code (asect->name);
+ idx = wasm_section_name_to_code (asect->name);
- if (index != 0)
+ if (idx != 0)
return;
if (CONST_STRNEQ (asect->name, WASM_SECTION_PREFIX))