espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-03 13:23:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

WebAssembly: Correct an `index' global shadowing error for pre-4.8 GCC

Browse Source 
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'.
This commit is contained in:
Maciej W. Rozycki
2018-02-13 12:56:29 +00:00
parent 30147392ca
commit 87993319a5
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -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> 2018-02-13 Alan Modra <amodra@gmail.com>
PR 22836 PR 22836

18
bfd/wasm-module.c
View File

@ -309,12 +309,12 @@ wasm_scan_name_function_section (bfd *abfd, sec_ptr asect)
for (symcount = 0; p < end && symcount < tdata->symcount; symcount++) for (symcount = 0; p < end && symcount < tdata->symcount; symcount++)
{ {
bfd_vma index; bfd_vma idx;
bfd_vma len; bfd_vma len;
char *name; char *name;
asymbol *sym; asymbol *sym;
READ_LEB128 (index, p, end); READ_LEB128 (idx, p, end);
READ_LEB128 (len, p, end); READ_LEB128 (len, p, end);
if (p + len < p || p + len > 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 = &symbols[symcount];
sym->the_bfd = abfd; sym->the_bfd = abfd;
sym->name = name; sym->name = name;
sym->value = index; sym->value = idx;
sym->flags = BSF_GLOBAL | BSF_FUNCTION; sym->flags = BSF_GLOBAL | BSF_FUNCTION;
sym->section = space_function_index; sym->section = space_function_index;
sym->udata.p = NULL; sym->udata.p = NULL;
@ -491,12 +491,12 @@ wasm_register_section (bfd *abfd ATTRIBUTE_UNUSED,
void *fsarg) void *fsarg)
{ {
sec_ptr *numbered_sections = 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; return;
numbered_sections[index] = asect; numbered_sections[idx] = asect;
} }
struct compute_section_arg struct compute_section_arg
@ -520,14 +520,14 @@ wasm_compute_custom_section_file_position (bfd *abfd,
void *fsarg) void *fsarg)
{ {
struct compute_section_arg *fs = fsarg; struct compute_section_arg *fs = fsarg;
int index; int idx;
if (fs->failed) if (fs->failed)
return; return;
index = wasm_section_name_to_code (asect->name); idx = wasm_section_name_to_code (asect->name);
if (index != 0) if (idx != 0)
return; return;
if (CONST_STRNEQ (asect->name, WASM_SECTION_PREFIX)) if (CONST_STRNEQ (asect->name, WASM_SECTION_PREFIX))

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2018-02-13 Maciej W. Rozycki <macro@mips.com>
* wasm32-dis.c (print_insn_wasm32): Rename `index' local
variable to `function_index'.
2018-02-12 Henry Wong <henry@stuffedcow.net> 2018-02-12 Henry Wong <henry@stuffedcow.net>
* mips-opc.c (mips_builtin_opcodes): Correct "sigrie" encoding. * mips-opc.c (mips_builtin_opcodes): Correct "sigrie" encoding.

6
opcodes/wasm32-dis.c
View File

@ -269,7 +269,7 @@ print_insn_wasm32 (bfd_vma pc, struct disassemble_info *info)
long flags = 0; long flags = 0;
long offset = 0; long offset = 0;
long depth = 0; long depth = 0;
long index = 0; long function_index = 0;
long target_count = 0; long target_count = 0;
long block_type = 0; long block_type = 0;
int len = 1; int len = 1;
@ -416,14 +416,14 @@ print_insn_wasm32 (bfd_vma pc, struct disassemble_info *info)
break; break;
case wasm_call: case wasm_call:
index = wasm_read_leb128 function_index = wasm_read_leb128
(pc + len, info, &error, &bytes_read, FALSE); (pc + len, info, &error, &bytes_read, FALSE);
if (error) if (error)
return -1; return -1;
len += bytes_read; len += bytes_read;
prin (stream, " "); prin (stream, " ");
private_data->section_prefix = ".space.function_index"; private_data->section_prefix = ".space.function_index";
(*info->print_address_func) ((bfd_vma) index, info); (*info->print_address_func) ((bfd_vma) function_index, info);
private_data->section_prefix = NULL; private_data->section_prefix = NULL;
break; break;